tune args generator for filter helper

Author: nodkz

src/resolvers/findMany.js

@@ -19,14 +19,14 @@ import { sortHelperArgsGen, sortHelper } from './helpers/sort';
 import { projectionHelper } from './helpers/projection';
 
 export default function findMany(model: MongooseModelT, gqType: GraphQLObjectType): Resolver {
-  const filterHelperArgs = filterHelperArgsGen();
-
   return new Resolver({
     outputType: new GraphQLList(gqType),
     name: 'findMany',
     kind: 'query',
     args: {
-      ...filterHelperArgs,
+      ...filterHelperArgsGen(model, {
+        filterTypeName: `Filter${gqType.name}Input`,
+      }),
       ...skipHelperArgs,
       ...limitHelperArgs,
       ...sortHelperArgsGen(model, {

src/resolvers/findOne.js

@@ -23,7 +23,9 @@ export default function findOne(
     name: 'findOne',
     kind: 'query',
     args: {
-      ...filterHelperArgsGen(),
+      ...filterHelperArgsGen(model, {
+        filterTypeName: `Filter${gqType.name}Input`,
+      }),
       ...skipHelperArgs,
       ...sortHelperArgsGen(model, {
         sortTypeName: `Sort${gqType.name}Input`,

src/resolvers/helpers/filter.js

@@ -1,25 +1,39 @@
 /* @flow */
 
-import { GraphQLInt, GraphQLInputObjectType } from 'graphql/type';
+import { GraphQLInt, GraphQLInputObjectType, GraphQLNonNull } from 'graphql/type';
 import { toDottedObject } from '../../utils';
 import type {
   GraphQLFieldConfigArgumentMap,
   ExtendedResolveParams,
 } from '../../definition';
 
-export const filterHelperArgsGen = (): GraphQLFieldConfigArgumentMap => {
+export type filterHelperArgsGenOpts = {
+  filterTypeName: string,
+  isRequired?: boolean,
+};
+
+export const filterHelperArgsGen = (
+  model: MongooseModelT,
+  opts: filterHelperArgsGenOpts,
+): GraphQLFieldConfigArgumentMap => {
+  if (!opts.filterTypeName) {
+    throw new Error('You should provide `filterTypeName` in options.');
+  }
+
+  const filterType = new GraphQLInputObjectType({
+    name: opts.filterTypeName,
+    fields: {
+      age: {
+        name: 'age',
+        type: GraphQLInt, // TODO just mock, should be changed in future
+      },
+    },
+  });
+
   return {
     filter: {
       name: 'filter',
-      type: new GraphQLInputObjectType({
-        name: 'InputFilterSomeName',
-        fields: {
-          age: {
-            name: 'age',
-            type: GraphQLInt, // TODO just mock, should be changed in future
-          },
-        },
-      }),
+      type: opts.isRequired ? new GraphQLNonNull(filterType): filterType,
       description: 'Filter by indexed fields',
     },
   };

src/resolvers/removeOne.js

@@ -1,7 +1,7 @@
 /* @flow */
 /* eslint-disable no-param-reassign */
 
-import { GraphQLObjectType } from 'graphql';
+import { GraphQLObjectType, GraphQLNonNull } from 'graphql';
 import GraphQLMongoID from '../types/mongoid';
 
 import { skipHelperArgs, skipHelper } from './helpers/skip';
@@ -39,7 +39,9 @@ export default function removeOne(
       },
     }),
     args: {
-      ...filterHelperArgsGen(),
+      ...filterHelperArgsGen(model, {
+        filterTypeName: `Filter${gqType.name}Input`,
+      }),
       ...sortHelperArgsGen(model, {
         sortTypeName: `Sort${gqType.name}Input`,
       }),

src/resolvers/updateMany.js

@@ -38,7 +38,9 @@ export default function updateMany(
         inputTypeName: `UpdateMany${gqType.name}Input`,
         removeFields: ['id', '_id'],
       }),
-      ...filterHelperArgsGen(),
+      ...filterHelperArgsGen(model, {
+        filterTypeName: `Filter${gqType.name}Input`,
+      }),
       ...sortHelperArgsGen(model, {
         sortTypeName: `Sort${gqType.name}Input`,
       }),
@@ -63,7 +65,7 @@ export default function updateMany(
       limitHelper(resolveParams);
 
       resolveParams.query = resolveParams.query.setOptions({ multi: true }); // eslint-disable-line
-      resolveParams.query.update({ $set: inputData });
+      resolveParams.query.update({ $set: toDottedObject(inputData) });
 
       return resolveParams.query
         .exec()

src/resolvers/updateOne.js

@@ -46,7 +46,9 @@ export default function updateOne(
         inputTypeName: `UpdateOne${gqType.name}Input`,
         removeFields: ['id', '_id'],
       }),
-      ...filterHelperArgsGen(),
+      ...filterHelperArgsGen(model, {
+        filterTypeName: `Filter${gqType.name}Input`,
+      }),
       ...sortHelperArgsGen(model, {
         sortTypeName: `Sort${gqType.name}Input`,
       }),