refactor: sort value is not set in search interceptor

woowabros · Jul 6, 2024 · 6d89869 · 6d89869
1 parent ef24fe6
commit 6d89869
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/src/lib/interceptor/read-many-request.interceptor.ts b/src/lib/interceptor/read-many-request.interceptor.ts
@@ -60,7 +60,6 @@ export function ReadManyRequestInterceptor(crudOptions: CrudOptions, factoryOpti
                 (pagination.type === 'cursor' ? readManyOptions.numberOfTake : pagination.limit ?? readManyOptions.numberOfTake) ??
                 CRUD_POLICY[method].default.numberOfTake;
             const sort = readManyOptions.sort ? Sort[readManyOptions.sort] : CRUD_POLICY[method].default.sort;
-            const order = paginationKeys.reduce((order, paginationKey) => ({ ...order, [paginationKey]: sort }), {});
 
             const crudReadManyRequest: CrudReadManyRequest<typeof crudOptions.entity> = new CrudReadManyRequest<typeof crudOptions.entity>()
                 .setPaginationKeys(paginationKeys)
@@ -70,7 +69,6 @@ export function ReadManyRequestInterceptor(crudOptions: CrudOptions, factoryOpti
                 .setWhere(query)
                 .setTake(numberOfTake)
                 .setSort(sort)
-                .setOrder(order)
                 .setRelations(this.getRelations(customReadManyRequestOptions))
                 .setDeserialize(this.deserialize)
                 .generate();

diff --git a/src/lib/interceptor/search-request.interceptor.ts b/src/lib/interceptor/search-request.interceptor.ts
@@ -82,8 +82,8 @@ export function SearchRequestInterceptor(crudOptions: CrudOptions, factoryOption
                 (pagination.type === 'cursor' ? requestSearchDto.take : pagination.limit) ??
                 searchOptions.numberOfTake ??
                 CRUD_POLICY[method].default.numberOfTake;
-            const sort = CRUD_POLICY[method].default.sort;
-            const order = requestSearchDto.order ?? paginationKeys.reduce((acc, key) => ({ ...acc, [key]: sort }), {});
+            const order =
+                requestSearchDto.order ?? paginationKeys.reduce((acc, key) => ({ ...acc, [key]: CRUD_POLICY[method].default.sort }), {});
 
             const withDeleted =
                 requestSearchDto.withDeleted ?? crudOptions.routes?.[method]?.softDelete ?? CRUD_POLICY[method].default.softDeleted;
@@ -95,7 +95,6 @@ export function SearchRequestInterceptor(crudOptions: CrudOptions, factoryOption
                 .setExcludeColumn(searchOptions.exclude)
                 .setWhere(where)
                 .setTake(numberOfTake)
-                .setSort(sort)
                 .setOrder(order)
                 .setWithDeleted(withDeleted)
                 .setRelations(this.getRelations(customSearchRequestOptions))
@@ -290,14 +289,15 @@ export function SearchRequestInterceptor(crudOptions: CrudOptions, factoryOption
             return factoryOption.relations;
         }
 
-        deserialize<T>({ pagination, findOptions, sort }: CrudReadManyRequest<T>): Array<FindOptionsWhere<T>> {
+        deserialize<T>({ pagination, findOptions }: CrudReadManyRequest<T>): Array<FindOptionsWhere<T>> {
             const where = findOptions.where as Array<FindOptionsWhere<EntityType>>;
             if (pagination.type === PaginationType.OFFSET) {
                 return where;
             }
             const lastObject: Record<string, unknown> = PaginationHelper.deserialize(pagination.nextCursor);
 
-            const operator = (key: keyof T) => ((findOptions.order?.[key] ?? sort) === Sort.DESC ? LessThan : MoreThan);
+            const operator = (key: keyof T) =>
+                (findOptions.order?.[key] ?? CRUD_POLICY[method].default.sort) === Sort.DESC ? LessThan : MoreThan;
 
             const cursorCondition: Record<string, FindOperator<T>> = Object.entries(lastObject).reduce(
                 (queryFilter, [key, operand]) => ({

diff --git a/src/lib/request/read-many.request.ts b/src/lib/request/read-many.request.ts
@@ -105,6 +105,7 @@ export class CrudReadManyRequest<T> {
 
     setSort(sort: Sort): this {
         this._sort = sort;
+        this._findOptions.order = this.paginationKeys.reduce((order, paginationKey) => ({ ...order, [paginationKey]: sort }), {});
         return this;
     }