refactor: removed unreachable code

nestjsx · Jul 7, 2020 · b260e84 · b260e84
1 parent 48d457d
commit b260e84
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 13 deletions.
diff --git a/packages/crud-request/src/request-query.builder.ts b/packages/crud-request/src/request-query.builder.ts
@@ -185,11 +185,7 @@ export class RequestQueryBuilder {
     customOperators?: CustomOperators,
   ): string {
     const filter = Array.isArray(f) ? { field: f[0], operator: f[1], value: f[2] } : f;
-    validateCondition(
-      filter,
-      cond,
-      this ? (this.options ? customOperators : undefined) : undefined,
-    );
+    validateCondition(filter, cond, customOperators);
     const d = this.options.delim;
 
     return (

diff --git a/packages/crud/src/interceptors/crud-request.interceptor.ts b/packages/crud/src/interceptors/crud-request.interceptor.ts
@@ -31,14 +31,7 @@ export class CrudRequestInterceptor extends CrudBaseInterceptor
         const { ctrlOptions, crudOptions, action } = this.getCrudInfo(context);
         const parser = RequestQueryParser.create();
 
-        parser.parseQuery(
-          req.query,
-          crudOptions
-            ? crudOptions.operators
-              ? crudOptions.operators.custom
-              : undefined
-            : undefined,
-        );
+        parser.parseQuery(req.query, crudOptions.operators.custom);
 
         if (!isNil(ctrlOptions)) {
           const search = this.getSearch(parser, crudOptions, action, req.params);

diff --git a/packages/crud/test/crud-config.service.spec.ts b/packages/crud/test/crud-config.service.spec.ts
@@ -43,6 +43,9 @@ describe('#crud', () => {
         query: {
           limit: 10,
         },
+        operators: {
+          custom: {},
+        },
         params: {
           id: {
             field: 'id',
@@ -70,6 +73,9 @@ describe('#crud', () => {
         query: {
           limit: 10,
         },
+        operators: {
+          custom: {},
+        },
         params: {
           id: {
             field: 'id',
@@ -107,6 +113,9 @@ describe('#crud', () => {
       expect(CrudConfigService.config.query).toEqual(
         expect.objectContaining(expected.query),
       );
+      expect(CrudConfigService.config.operators).toEqual(
+        expect.objectContaining(expected.operators),
+      );
       expect(JSON.stringify(CrudConfigService.config.routes)).toEqual(
         JSON.stringify(expected.routes),
       );