fix: required fields only apply to Create resolvers

* Fix: required fields only apply to Create resolvers

* Fix: type error

Author: israelglar

src/__mocks__/userModel.js

@@ -111,15 +111,3 @@ UserSchema.virtual('nameVirtual').get(function() {
 const UserModel = mongoose.model('User', UserSchema);
 
 export { UserSchema, UserModel };
-
-const UserRequiredSchema: SchemaType<any> = new Schema({
-  name: {
-    type: String,
-    description: 'Person name',
-    required: true,
-  },
-});
-
-const UserRequiredModel = mongoose.model('UserRequired', UserRequiredSchema);
-
-export { UserRequiredSchema, UserRequiredModel };

src/__tests__/fieldConverter-test.js

@@ -2,7 +2,7 @@
 /* eslint-disable no-unused-expressions, no-template-curly-in-string */
 
 import { EnumTypeComposer, schemaComposer } from 'graphql-compose';
-import { UserModel, UserRequiredModel } from '../__mocks__/userModel';
+import { UserModel } from '../__mocks__/userModel';
 import {
   deriveComplexType,
   getFieldsFromModel,
@@ -14,7 +14,6 @@ import {
   enumToGraphQL,
   documentArrayToGraphQL,
   referenceToGraphQL,
-  convertModelToGraphQL,
 } from '../fieldsConverter';
 import GraphQLMongoID from '../types/mongoid';
 
@@ -109,13 +108,6 @@ describe('fieldConverter', () => {
     });
   });
 
-  describe('convertFieldToGraphQL()', () => {
-    it('should set required field', () => {
-      const tc = convertModelToGraphQL(UserRequiredModel, 'UserRequired', schemaComposer);
-      expect(tc.isFieldNonNull('name')).toBeTruthy();
-    });
-  });
-
   describe('convertFieldToGraphQL()', () => {
     it('should convert any mongoose field to graphQL type', () => {
       const mongooseField = {

src/fieldsConverter.js

@@ -127,7 +127,6 @@ export function convertModelToGraphQL(
     return schemaComposer.getTC(model.schema);
   }
 
-  const requiredFields = [];
   const typeComposer = schemaComposer.getOrCreateTC(typeName);
   // $FlowFixMe await landing [email protected] or above
   schemaComposer.set(model.schema, typeComposer);
@@ -139,10 +138,6 @@ export function convertModelToGraphQL(
   Object.keys(mongooseFields).forEach(fieldName => {
     const mongooseField: MongooseFieldT = mongooseFields[fieldName];
 
-    if (mongooseField.isRequired) {
-      requiredFields.push(fieldName);
-    }
-
     graphqlFields[fieldName] = {
       type: convertFieldToGraphQL(mongooseField, typeName, schemaComposer),
       description: _getFieldDescription(mongooseField),
@@ -164,7 +159,6 @@ export function convertModelToGraphQL(
   });
 
   typeComposer.addFields(graphqlFields);
-  requiredFields.map(f => typeComposer.makeFieldNonNull(f));
   return typeComposer;
 }
 

src/resolvers/createMany.js

@@ -35,6 +35,17 @@ export default function createMany(
     throw new Error('Second arg for Resolver createMany() should be instance of TypeComposer.');
   }
 
+  const tree = model.schema.obj;
+  const requiredFields = [];
+  for (const field in tree) {
+    if (tree.hasOwnProperty(field)) {
+      const fieldOptions = tree[field];
+      if (fieldOptions.required) {
+        requiredFields.push(field);
+      }
+    }
+  }
+
   const outputTypeName = `CreateMany${tc.getTypeName()}Payload`;
   const outputType = tc.constructor.schemaComposer.getOrCreateTC(outputTypeName, t => {
     t.addFields({
@@ -66,6 +77,7 @@ export default function createMany(
               recordTypeName: `CreateMany${tc.getTypeName()}Input`,
               removeFields: ['id', '_id'],
               isRequired: true,
+              requiredFields,
               ...(opts && opts.records),
             }).record: any).type
           )

src/resolvers/createOne.js

@@ -19,6 +19,17 @@ export default function createOne(
     throw new Error('Second arg for Resolver createOne() should be instance of TypeComposer.');
   }
 
+  const tree = model.schema.obj;
+  const requiredFields = [];
+  for (const field in tree) {
+    if (tree.hasOwnProperty(field)) {
+      const fieldOptions = tree[field];
+      if (fieldOptions.required) {
+        requiredFields.push(field);
+      }
+    }
+  }
+
   const outputTypeName = `CreateOne${tc.getTypeName()}Payload`;
   const outputType = tc.constructor.schemaComposer.getOrCreateTC(outputTypeName, t => {
     t.addFields({
@@ -43,6 +54,7 @@ export default function createOne(
         recordTypeName: `CreateOne${tc.getTypeName()}Input`,
         removeFields: ['id', '_id'],
         isRequired: true,
+        requiredFields,
         ...(opts && opts.record),
       }),
     },