fix: required fields in embedded documents became optional for filter args and became optional for update(ById|One|Many) resolvers. All such embedded types are clonned and have its own unique names.

Author: nodkz

.eslintignore

@@ -2,4 +2,4 @@ lib/*
 es/*
 mjs/*
 node8/*
-flow-typed
+jest.config.js

jest.config.js

@@ -8,6 +8,9 @@ module.exports = {
       diagnostics: false,
     },
   },
+  moduleNameMapper: {
+    '^src/(.*)$': '<rootDir>/src/$1',
+  },
   moduleFileExtensions: ['ts', 'js'],
   transform: {
     '^.+\\.ts$': 'ts-jest',

src/__mocks__/contactsSchema.ts

@@ -3,7 +3,10 @@ import { Schema } from './mongooseCommon';
 
 const ContactsSchema: SchemaType<any> = new Schema({
   phones: [String],
-  email: String,
+  email: {
+    type: String,
+    required: true,
+  },
   skype: String,
   locationId: Schema.Types.ObjectId,
 });

src/__mocks__/userModel.ts

@@ -136,6 +136,9 @@ export interface IUser extends Document {
   someDynamic?: any;
   skills?: string[];
   relocation?: boolean;
+  contacts: {
+    email: string;
+  };
 }
 
 const UserModel = mongoose.model<IUser>('User', UserSchema);

src/__tests__/github_issues/219-test.ts

@@ -9,10 +9,12 @@ beforeAll(async () => {
   await UserModel.create({
     name: 'AAAAA',
     age: 10,
+    contacts: { email: '1@1.com' },
   });
   await UserModel.create({
     name: 'BBBBB',
     age: 20,
+    contacts: { email: '2@2.com' },
   });
 });
 afterAll(() => UserModel.base.disconnect());

src/__tests__/github_issues/92-test.ts

@@ -30,7 +30,7 @@ describe('issue #92 - How to verify the fields?', () => {
       schema,
       `
           mutation {
-            addUser(record: { name: "User1", age: 30 }) {
+            addUser(record: { name: "User1", age: 30, contacts: { email: "1@1.com" } }) {
               record {
                 name
                 age
@@ -47,7 +47,7 @@ describe('issue #92 - How to verify the fields?', () => {
       schema,
       `
           mutation {
-            addUser(record: { name: "User1", age: 10 }) {
+            addUser(record: { name: "User1", age: 10, contacts: { email: "1@1.com" } }) {
               record {
                 name
                 age

src/__tests__/github_issues/93-test.ts

@@ -23,18 +23,21 @@ describe('issue #93', () => {
       _id: '100000000000000000000301',
       name: 'User301',
       age: 301,
+      contacts: { email: '1@1.com' },
     });
     await UserModel.create({
       _id: '100000000000000000000302',
       name: 'User302',
       age: 302,
       gender: 'male',
+      contacts: { email: '2@2.com' },
     });
     await UserModel.create({
       _id: '100000000000000000000303',
       name: 'User303',
       age: 302,
       gender: 'female',
+      contacts: { email: '3@3.com' },
     });
 
     const res = await graphql.graphql(

src/__tests__/integration-test.ts

@@ -21,6 +21,7 @@ describe('integration tests', () => {
 
       const user = new UserModel({
         name: 'Test empty subDoc',
+        contacts: { email: 'mail' },
       });
       await user.save();
       const result: any = await graphql(
@@ -59,6 +60,7 @@ describe('integration tests', () => {
 
       const user2 = new UserModel({
         name: 'Test non empty subDoc',
+        contacts: { email: 'mail' },
         subDoc: { field2: { field21: 'ok' } },
       });
       await user2.save();
@@ -92,6 +94,7 @@ describe('integration tests', () => {
       const UserTC = composeWithMongoose(UserModel, { schemaComposer });
       const user = new UserModel({
         name: 'nodkz',
+        contacts: { email: 'mail' },
         someDynamic: {
           a: 123,
           b: [1, 2, true, false, 'ok'],
@@ -145,6 +148,7 @@ describe('integration tests', () => {
         gender: 'male',
         skills: ['a', 'b', 'c'],
         relocation: true,
+        contacts: { email: 'mail' },
       });
     });
 

src/resolvers/__tests__/connection-test.ts

@@ -126,13 +126,15 @@ describe('connection() resolver', () => {
         skills: ['js', 'ruby', 'php', 'python'],
         gender: 'male',
         relocation: true,
+        contacts: { email: 'mail' },
       });
 
       user2 = new UserModel({
         name: 'userName2',
         skills: ['go', 'erlang'],
         gender: 'female',
         relocation: false,
+        contacts: { email: 'mail' },
       });
 
       await user1.save();

src/resolvers/__tests__/count-test.ts

@@ -27,13 +27,19 @@ describe('count() ->', () => {
       skills: ['js', 'ruby', 'php', 'python'],
       gender: 'male',
       relocation: true,
+      contacts: {
+        email: '`1@1.com',
+      },
     });
 
     user2 = new UserModel({
       name: 'userName2',
       skills: ['go', 'erlang'],
       gender: 'female',
       relocation: false,
+      contacts: {
+        email: '`2@2.com',
+      },
     });
 
     await user1.save();
@@ -50,6 +56,20 @@ describe('count() ->', () => {
       const resolver = count(UserModel, UserTC);
       expect(resolver.hasArg('filter')).toBe(true);
     });
+
+    it('required model fields (filter.contacts.email) should be optional in filter arg', () => {
+      const resolver = count(UserModel, UserTC);
+      expect(resolver.getArgITC('filter').getFieldITC('contacts').toSDL({ omitDescriptions: true }))
+        .toMatchInlineSnapshot(`
+        "input FilterUserContactsInput {
+          phones: [String]
+          email: String
+          skype: String
+          locationId: MongoID
+          _id: MongoID
+        }"
+      `);
+    });
   });
 
   describe('Resolver.resolve():Promise', () => {