feat(FilterHelper): Add resolveParams.rawQuery to mongoose.where() if provided

rawQuery allows you pass additional query params to mongoose.where clause. rawQuery can be created

manually or via graphql-compose Resolver.addFilterArg(). More details here

graphql-compose/graphql-compose#22

Author: nodkz

src/resolvers/helpers/__tests__/filter-test.js

@@ -167,11 +167,16 @@ describe('Resolver helper `filter` ->', () => {
 
   describe('filterHelper()', () => {
     let spyWhereFn;
+    let spyWhere2Fn;
     let spyFindFn;
     let resolveParams;
 
     beforeEach(() => {
-      spyWhereFn = spy();
+      spyWhereFn = spy((queryObj) => {
+        spyWhere2Fn = spy();
+        return { where: spyWhere2Fn };
+      });
+
       spyFindFn = spy();
       resolveParams = {
         query: {
@@ -217,9 +222,29 @@ describe('Resolver helper `filter` ->', () => {
         },
       };
       filterHelper(resolveParams);
-      expect(spyFindFn).to.have.been.called.with(
+      expect(spyWhereFn).to.have.been.called.with(
         { age: { $gt: 10, $lt: 20 } }
       );
     });
+
+    it('should add rawQuery to query', () => {
+      resolveParams.args = {
+        filter: {
+          [OPERATORS_FIELDNAME]: { age: { gt: 10, lt: 20 } },
+        },
+      };
+      resolveParams.rawQuery = {
+        age: { max: 30 },
+        active: true,
+      };
+
+      filterHelper(resolveParams);
+      expect(spyWhereFn).to.have.been.called.with(
+        { age: { $gt: 10, $lt: 20 } }
+      );
+      expect(spyWhere2Fn).to.have.been.called.with(
+        { age: { max: 30 }, active: true }
+      );
+    });
   });
 });

src/resolvers/helpers/filter.js

@@ -9,6 +9,7 @@ import {
 } from 'graphql';
 import { TypeComposer, InputTypeComposer } from 'graphql-compose';
 import getIndexesFromModel from '../../utils/getIndexesFromModel';
+import { isObject } from '../../utils/is';
 import { toDottedObject, upperFirst } from '../../utils';
 import typeStorage from '../../typeStorage';
 import type {
@@ -115,14 +116,20 @@ export function filterHelper(resolveParams: ExtendedResolveParams): void {
           criteria[`$${operatorName}`] = fieldOperators[operatorName];
         });
         if (Object.keys(criteria).length > 0) {
-          // $FlowFixMe
-          resolveParams.query = resolveParams.query.find({ // eslint-disable-line
+          resolveParams.query = resolveParams.query.where({ // eslint-disable-line
             [fieldName]: criteria,
           });
         }
       });
     }
   }
+
+  if (isObject(resolveParams.rawQuery)) {
+    resolveParams.query = resolveParams.query.where( // eslint-disable-line
+      // $FlowFixMe
+      resolveParams.rawQuery
+    );
+  }
 }
 
 export function getIndexedFieldNames(model: MongooseModelT): string[] {