fix: check empty params

woowabros · Aug 29, 2024 · 7c096dc · 7c096dc
1 parent 23e8058
commit 7c096dc
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/src/lib/interceptor/create-request.interceptor.ts b/src/lib/interceptor/create-request.interceptor.ts
@@ -27,7 +27,7 @@ export function CreateRequestInterceptor(crudOptions: CrudOptions, factoryOption
             const req = context.switchToHttp().getRequest<Request>();
             const createOptions = crudOptions.routes?.[method] ?? {};
 
-            if (req.params) {
+            if (Object.keys(req.params ?? {}).length > 0) {
                 Object.assign(req.body, req.params);
             }
             const body = await this.validateBody(req.body);

diff --git a/src/lib/interceptor/read-many-request.interceptor.ts b/src/lib/interceptor/read-many-request.interceptor.ts
@@ -34,7 +34,7 @@ export function ReadManyRequestInterceptor(crudOptions: CrudOptions, factoryOpti
             const customReadManyRequestOptions: CustomReadManyRequestOptions = req[CUSTOM_REQUEST_OPTIONS];
             const paginationType = (readManyOptions.paginationType ?? CRUD_POLICY[method].default.paginationType) as PaginationType;
 
-            if (req.params) {
+            if (Object.keys(req.params ?? {}).length > 0) {
                 Object.assign(req.query, req.params);
             }
 

diff --git a/src/lib/interceptor/search-request.interceptor.ts b/src/lib/interceptor/search-request.interceptor.ts
@@ -35,8 +35,11 @@ export function SearchRequestInterceptor(crudOptions: CrudOptions, factoryOption
             const req: Record<string, any> = context.switchToHttp().getRequest<Request>();
             const searchOptions = crudOptions.routes?.[method] ?? {};
             const customSearchRequestOptions: CustomSearchRequestOptions = req[CUSTOM_REQUEST_OPTIONS];
+            const paginationType = (searchOptions.paginationType ?? CRUD_POLICY[method].default.paginationType) as PaginationType;
+            const pagination = PaginationHelper.getPaginationRequest(paginationType, req.body);
+            const isNextPage = PaginationHelper.isNextPage(pagination);
 
-            if (req.params) {
+            if (Object.keys(req.params ?? {}).length > 0 && !isNextPage) {
                 const paramsCondition = Object.entries(req.params).reduce(
                     (queryFilter, [key, operand]) => ({ ...queryFilter, [key]: { operator: '=', operand } }),
                     {},
@@ -51,10 +54,6 @@ export function SearchRequestInterceptor(crudOptions: CrudOptions, factoryOption
                 }
             }
 
-            const paginationType = (searchOptions.paginationType ?? CRUD_POLICY[method].default.paginationType) as PaginationType;
-            const pagination = PaginationHelper.getPaginationRequest(paginationType, req.body);
-            const isNextPage = PaginationHelper.isNextPage(pagination);
-
             const requestSearchDto = await (async () => {
                 if (isNextPage) {
                     const isQueryValid = pagination.setQuery(pagination.query);