fix(FilterHelper): Pass only that filter args which exist in model to mongoose.query.where(...)

Author: nodkz

src/__mocks__/mongooseCommon.js

@@ -23,6 +23,10 @@ function dropDBs(done) {
   });
 }
 
+process.on('exit', () => { dropDBs(); });
+process.on('uncaughtException', () => { dropDBs(); });
+process.on('SIGINT', () => { dropDBs(); });
+
 export {
   mongoose,
   Schema,

src/definition.js

@@ -74,6 +74,7 @@ export type MongooseQuery = {
   update(data: ObjectMap): MongooseQuery,
   remove(conditions: ?Object, options?: Object): MongooseQuery,
   count(conditions: ?Object): MongooseQuery,
+  schema: MongooseModelSchemaT,
 };
 
 export type MongoseDocument = {

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

@@ -174,12 +174,16 @@ describe('Resolver helper `filter` ->', () => {
     beforeEach(() => {
       spyWhereFn = spy((queryObj) => {
         spyWhere2Fn = spy();
-        return { where: spyWhere2Fn };
+        return {
+          ...UserModel.find(),
+          where: spyWhere2Fn,
+        };
       });
 
       spyFindFn = spy();
       resolveParams = {
         query: {
+          ...UserModel.find(),
           where: spyWhereFn,
           find: spyFindFn,
         },

src/resolvers/helpers/filter.js

@@ -97,18 +97,22 @@ export const filterHelperArgs = (
 };
 
 export function filterHelper(resolveParams: ExtendedResolveParams): void {
+  // $FlowFixMe
   const filter = resolveParams.args && resolveParams.args.filter;
   if (filter && typeof filter === 'object' && Object.keys(filter).length > 0) {
-    if (!filter[OPERATORS_FIELDNAME]) {
-      resolveParams.query = resolveParams.query.where(toDottedObject(filter)); // eslint-disable-line
-    } else {
-      const operatorFields = Object.assign({}, filter[OPERATORS_FIELDNAME]);
-      const simpleFields = Object.assign({}, filter);
-      delete simpleFields[OPERATORS_FIELDNAME];
-
-      if (Object.keys(simpleFields).length > 0) {
-        resolveParams.query = resolveParams.query.where(toDottedObject(simpleFields)); // eslint-disable-line
+    const modelFields = resolveParams.query.schema.paths;
+    const clearedFilter = {};
+    Object.keys(filter).forEach((key) => {
+      if (modelFields[key]) {
+        clearedFilter[key] = filter[key];
       }
+    })
+    if (Object.keys(clearedFilter).length > 0) {
+      resolveParams.query = resolveParams.query.where(toDottedObject(clearedFilter)); // eslint-disable-line
+    }
+
+    if (filter[OPERATORS_FIELDNAME]) {
+      const operatorFields = filter[OPERATORS_FIELDNAME];
       Object.keys(operatorFields).forEach(fieldName => {
         const fieldOperators = Object.assign({}, operatorFields[fieldName]);
         const criteria = {};