eduvia/workavia-drive
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

🐛Fixed pagination for PostgreSQL connector

Browse Source
This commit is contained in:
Anton SHEPILOV
2024-07-12 00:22:33 +02:00
committed by Anton Shepilov
parent 845781642f
commit 585da88b0d
4 changed files with 34 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tdrive/backend/node/src/core/platform/services/database/services/orm/connectors/postgres/postgres-query-builder.ts
+1 -1
View File
@@ -103,7 +103,7 @@ export class PostgresQueryBuilder {
limit = Number.parseInt(options.pagination.limitStr);
}
if (options.pagination.page_token) {
offset = (Number.parseInt(options.pagination.page_token) - 1) * limit;
offset = Number.parseInt(options.pagination.page_token) * limit;
}
}
return [query(whereClause, orderByClause, limit, offset), values];
tdrive/backend/node/src/core/platform/services/database/services/orm/connectors/postgres/postgres.ts
+9 -4
View File
@@ -230,10 +230,7 @@ export class PostgresConnector extends AbstractConnector<PostgresConnectionOptio
entities.push(entity);
});
const nextPageToken = options?.pagination?.page_token || "0";
const limit = parseInt(options?.pagination?.limitStr);
const nextToken = entities.length === limit && (parseInt(nextPageToken) + limit).toString(10);
const nextPage: Paginable = new Pagination(nextToken, options?.pagination?.limitStr || "100");
const nextPage = this.nextPage(options.pagination, entities.length);
logger.debug(
`services.database.orm.postgres.find - Query Result (items=${entities.length}): ${query}`,
);
@@ -241,6 +238,14 @@ export class PostgresConnector extends AbstractConnector<PostgresConnectionOptio
return new ListResult<EntityType>(entityDefinition.type, entities, nextPage);
}
nextPage(pagination: Pagination, entitiesLength: number) {
const nextPageToken = pagination?.page_token || "0";
const limit = parseInt(pagination?.limitStr);
const nextToken = entitiesLength === limit && (parseInt(nextPageToken) + 1).toString(10);
const nextPage: Paginable = new Pagination(nextToken, pagination?.limitStr || "100");
return nextPage;
}
// eslint-disable-next-line @typescript-eslint/no-unused-vars
remove<Entity>(entities: Entity[]): Promise<boolean[]> {
return Promise.all(entities.map(entity => this.removeOne(entity)));