Merge pull request #340 from jiho-kr/feature/search-bug

fix: next page bug on search
woowabros · Oct 26, 2023 · 6f71931 · 6f71931
2 parents dc13aa2 + c3a5841
commit 6f71931
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/src/lib/interceptor/search-request.interceptor.ts b/src/lib/interceptor/search-request.interceptor.ts
@@ -276,8 +276,11 @@ export function SearchRequestInterceptor(crudOptions: CrudOptions, factoryOption
                 }),
                 {},
             );
+
+            let mergedKeySet: Set<string> = new Set();
             for (const queryFilter of where) {
                 for (const [key, operation] of Object.entries(cursorCondition)) {
+                    mergedKeySet.add(key);
                     _.merge(
                         queryFilter,
                         key in queryFilter
@@ -286,7 +289,13 @@ export function SearchRequestInterceptor(crudOptions: CrudOptions, factoryOption
                     );
                 }
             }
-            where.push(cursorCondition);
+            for (const [key, operation] of Object.entries(cursorCondition)) {
+                if (mergedKeySet.has(key)) {
+                    continue;
+                }
+                where.push({ [key]: operation });
+            }
+
             return where;
         }
     }