Cleanup

Author: nodkz

src/__mocks__/userModel.js

@@ -86,7 +86,7 @@ const UserSchema = new Schema(
 );
 
 UserSchema.set('autoIndex', false);
-UserSchema.index({ name: 1, totalExperience: -1 });
+UserSchema.index({ name: 1, age: -1 });
 
 UserSchema.virtual('nameVirtual').get(function () { // eslint-disable-line
   return `VirtualFieldValue${this._id}`;

src/definition.js

@@ -109,8 +109,8 @@ export type sortHelperArgsOpts = {
 
 export type inputHelperArgsOpts = {
   inputTypeName?: string,
-  removeFields?: string | string[],
-  requiredFields?: string | string[],
+  removeFields?: string[],
+  requiredFields?: string[],
   isRequired?: boolean,
 };
 

src/resolvers/__tests__/findById-test.js

@@ -6,6 +6,9 @@ import findById from '../findById';
 import Resolver from '../../../../graphql-compose/src/resolver/resolver';
 import { GraphQLNonNull } from 'graphql';
 import GraphQLMongoID from '../../types/mongoid';
+import { convertModelToGraphQL } from '../../fieldsConverter';
+
+const UserType = convertModelToGraphQL(UserModel, 'User');
 
 describe('findById() ->', () => {
   let user;
@@ -22,13 +25,13 @@ describe('findById() ->', () => {
   });
 
   it('should return Resolver object', () => {
-    const resolver = findById(UserModel);
+    const resolver = findById(UserModel, UserType);
     expect(resolver).to.be.instanceof(Resolver);
   });
 
   describe('Resolver.args', () => {
     it('should have non-null `_id` arg', () => {
-      const resolver = findById(UserModel);
+      const resolver = findById(UserModel, UserType);
       expect(resolver.hasArg('_id')).to.be.true;
       const argConfig = resolver.getArg('_id');
       expect(argConfig).property('type').that.instanceof(GraphQLNonNull);
@@ -38,22 +41,22 @@ describe('findById() ->', () => {
 
   describe('Resolver.resolve():Promise', () => {
     it('should be fulfilled promise', async () => {
-      const result = findById(UserModel).resolve({});
+      const result = findById(UserModel, UserType).resolve({});
       await expect(result).be.fulfilled;
     });
 
     it('should be rejected if args.id is not objectId', async () => {
-      const result = findById(UserModel).resolve({ args: { _id: 1 } });
+      const result = findById(UserModel, UserType).resolve({ args: { _id: 1 } });
       await expect(result).be.rejected;
     });
 
     it('should return null if args.id is empty', async () => {
-      const result = await findById(UserModel).resolve({});
+      const result = await findById(UserModel, UserType).resolve({});
       expect(result).equal(null);
     });
 
     it('should return document if provided existed id', async () => {
-      const result = await findById(UserModel).resolve({ args: { _id: user._id } });
+      const result = await findById(UserModel, UserType).resolve({ args: { _id: user._id } });
       expect(result).have.property('name').that.equal(user.name);
     });
   });

src/resolvers/__tests__/findByIds-test.js

@@ -4,12 +4,11 @@ import { expect } from 'chai';
 import { UserModel } from '../../__mocks__/userModel.js';
 import findByIds from '../findByIds';
 import Resolver from '../../../../graphql-compose/src/resolver/resolver';
-import { GraphQLNonNull, GraphQLList, GraphQLObjectType } from 'graphql';
+import { GraphQLNonNull, GraphQLList } from 'graphql';
 import GraphQLMongoID from '../../types/mongoid';
+import { convertModelToGraphQL } from '../../fieldsConverter';
 
-const UserType = new GraphQLObjectType({
-  name: 'MockUserType',
-});
+const UserType = convertModelToGraphQL(UserModel, 'User');
 
 describe('findByIds() ->', () => {
   let user1;

src/resolvers/__tests__/findMany-test.js

@@ -4,11 +4,9 @@ import { expect } from 'chai';
 import { UserModel } from '../../__mocks__/userModel.js';
 import findMany from '../findMany';
 import Resolver from '../../../../graphql-compose/src/resolver/resolver';
-import { GraphQLObjectType } from 'graphql';
+import { convertModelToGraphQL } from '../../fieldsConverter';
 
-const UserType = new GraphQLObjectType({
-  name: 'MockUserType',
-});
+const UserType = convertModelToGraphQL(UserModel, 'User');
 
 
 describe('findMany() ->', () => {

src/resolvers/__tests__/updateById-test.js

@@ -5,7 +5,7 @@ import { UserModel } from '../../__mocks__/userModel.js';
 import updateById from '../updateById';
 import Resolver from '../../../../graphql-compose/src/resolver/resolver';
 import TypeComposer from '../../../../graphql-compose/src/typeComposer';
-import InputTypeComposer from '../../../../graphql-compose/src/typeInputComposer';
+import InputTypeComposer from '../../../../graphql-compose/src/inputTypeComposer';
 import { convertModelToGraphQL } from '../../fieldsConverter';
 import {
   GraphQLNonNull,