Patch validator must keep required with discriminator

Author: kapouer

lib/model/AjvValidator.js

@@ -253,8 +253,12 @@ function objectHasDefaults(obj) {
 
 function jsonSchemaWithoutRequired(jsonSchema) {
   const subSchemaProps = ['anyOf', 'oneOf', 'allOf', 'not', 'then', 'else'];
+  const omitProps = subSchemaProps.slice();
+  if (!jsonSchema.discriminator) {
+    omitProps.push('required');
+  }
   return Object.assign(
-    omit(jsonSchema, ['required', ...subSchemaProps]),
+    omit(jsonSchema, omitProps),
     ...subSchemaProps.map((prop) => subSchemaWithoutRequired(jsonSchema, prop)),
     jsonSchema && jsonSchema.definitions
       ? {

tests/unit/model/AjvValidator.js

@@ -34,6 +34,28 @@ describe('AjvValidator', () => {
       anyOf: [{ $ref: '#/definitions/TestRef1' }, { $ref: '#/definitions/TestRef2' }],
     };
 
+    const schema2 = {
+      type: 'object',
+      discriminator: { propertyName: 'foo' },
+      required: ['foo'],
+      oneOf: [
+        {
+          properties: {
+            foo: { const: 'x' },
+            a: { type: 'string' },
+          },
+          required: ['a'],
+        },
+        {
+          properties: {
+            foo: { enum: ['y', 'z'] },
+            b: { type: 'string' },
+          },
+          required: ['b'],
+        },
+      ],
+    };
+
     it('should remove required fields from definitions', () => {
       const validator = new AjvValidator({ onCreateAjv: () => {} });
       const validators = validator.getValidator(modelClass('test', schema), schema, true);
@@ -42,5 +64,16 @@ describe('AjvValidator', () => {
       expect(definitions.length).to.be(2);
       definitions.forEach((d) => expect(d.required).to.be(undefined));
     });
+
+    it('should not remove required fields if there is a discriminator', () => {
+      const validator = new AjvValidator({
+        onCreateAjv: () => {},
+        options: {
+          discriminator: true,
+        },
+      });
+      const validators = validator.getValidator(modelClass('test', schema2), schema2, true);
+      expect(validators.schema.required).to.be(schema2.required);
+    });
   });
 });