fix: remove paginationUniqueKey option

Author: benjamin658

src/Paginator.ts

@@ -53,7 +53,6 @@ export default class Paginator<Entity> {
   public constructor(
     private entity: ObjectType<Entity>,
     private paginationKeys: Extract<keyof Entity, string>[],
-    private paginationUniqueKey: Extract<keyof Entity, string>,
   ) {}
 
   public setAlias(alias: string): void {
@@ -116,7 +115,7 @@ export default class Paginator<Entity> {
     builder: SelectQueryBuilder<Entity>,
   ): SelectQueryBuilder<Entity> {
     const cursors: CursorParam = {};
-    const clonedBuilder = new SelectQueryBuilder<Entity>(builder)
+    const clonedBuilder = new SelectQueryBuilder<Entity>(builder);
 
     if (this.hasAfterCursor()) {
       Object.assign(cursors, this.decode(this.afterCursor as string));
@@ -136,26 +135,14 @@ export default class Paginator<Entity> {
     return clonedBuilder;
   }
 
-  private buildCursorQuery(
-    where: WhereExpressionBuilder,
-    cursors: CursorParam,
-  ): void {
+  private buildCursorQuery(where: WhereExpressionBuilder, cursors: CursorParam): void {
     const operator = this.getOperator();
     const params: CursorParam = {};
+    let query = '';
     this.paginationKeys.forEach((key) => {
       params[key] = cursors[key];
-      where.andWhere(
-        new Brackets((qb) => {
-          const paramsHolder = {
-            [`${key}_1`]: params[key],
-            [`${key}_2`]: params[key],
-          };
-          qb.where(`${this.alias}.${key} ${operator} :${key}_1`, paramsHolder);
-          if (this.paginationUniqueKey !== key) {
-            qb.orWhere(`${this.alias}.${key} = :${key}_2`, paramsHolder);
-          }
-        }),
-      );
+      where.orWhere(`${query}${this.alias}.${key} ${operator} :${key}`, params);
+      query = `${query}${this.alias}.${key} = :${key} AND `;
     });
   }
 

src/buildPaginator.ts

@@ -14,7 +14,6 @@ export interface PaginationOptions<Entity> {
   alias?: string;
   query?: PagingQuery;
   paginationKeys?: Extract<keyof Entity, string>[];
-  paginationUniqueKey?: Extract<keyof Entity, string>;
 }
 
 export function buildPaginator<Entity>(options: PaginationOptions<Entity>): Paginator<Entity> {
@@ -23,10 +22,9 @@ export function buildPaginator<Entity>(options: PaginationOptions<Entity>): Pagi
     query = {},
     alias = entity.name.toLowerCase(),
     paginationKeys = ['id' as any],
-    paginationUniqueKey = 'id' as any,
   } = options;
 
-  const paginator = new Paginator(entity, paginationKeys, paginationUniqueKey);
+  const paginator = new Paginator(entity, paginationKeys);
 
   paginator.setAlias(alias);
 

src/utils.ts

@@ -69,20 +69,6 @@ export function decodeByType(type: string, value: string): string | number | Dat
   }
 }
 
-export function stringToBool(value: string): boolean {
-  return value === 'true';
-}
-
-export function stringToNumber(value: string): number {
-  const result = parseInt(value, 10);
-
-  if (Number.isNaN(result)) {
-    return 0;
-  }
-
-  return result;
-}
-
 export function camelOrPascalToUnderscore(str: string): string {
   return str.split(/(?=[A-Z])/).join('_').toLowerCase();
 }

test/utils/prepareData.ts

@@ -9,12 +9,10 @@ function setTimestamp(i: number): Date {
   return now;
 }
 
-const balances = [1.1, 1.2, 1.3, 1.4, 1.5, 1.6, 1.7, 1.8, 1.9, 2];
-
 export async function prepareData(): Promise<void> {
   const data = [...Array(10).keys()].map((i) => ({
     name: `user${i}`,
-    balance: balances[i],
+    balance: i + 0.1,
     camelCaseColumn: setTimestamp(i),
     photos: [
       {