Fixed issue where composite schema validation mismatch for oneOf were not ignored corectly

Author: VShingala

lib/ajValidation/ajvValidation.js

@@ -58,39 +58,39 @@ function getDraftToUse(localDraft, jsonSchemaDialect) {
  * @returns {Array} Filtered mismatches after removing composite schema mismatches for valid data
  */
 function filterCompositeSchemaErrors (schema, validationMismatches) {
-  const compositeSchemaKeywords = ['anyOf', 'oneOf'],
-    compositeSchemaKeyword = compositeSchemaKeywords[0],
-    compositeSchemaMismatches = _.filter(validationMismatches, (validationMismatch) => {
+  _.forEach(['anyOf', 'oneOf'], (compositeSchemaKeyword) => {
+    const compositeSchemaMismatches = _.filter(validationMismatches, (validationMismatch) => {
       return validationMismatch.keyword === compositeSchemaKeyword &&
         _.endsWith(validationMismatch.schemaPath, compositeSchemaKeyword);
     });
 
-  _.forEach(compositeSchemaMismatches, (compositeSchemaMismatch) => {
-    let compositeSchemaMismatchPath = compositeSchemaMismatch.schemaPath,
-      schemaDataPath = formatDataPath(formatSchemaPathFromAJVErrorToConvertToDataPath(compositeSchemaMismatchPath)),
-      schemaToUse = schemaDataPath ? _.get(schema, schemaDataPath) : schema,
-      isCompositeSchemaValid = false;
+    _.forEach(compositeSchemaMismatches, (compositeSchemaMismatch) => {
+      let compositeSchemaMismatchPath = compositeSchemaMismatch.schemaPath,
+        schemaDataPath = formatDataPath(formatSchemaPathFromAJVErrorToConvertToDataPath(compositeSchemaMismatchPath)),
+        schemaToUse = schemaDataPath ? _.get(schema, schemaDataPath) : schema,
+        isCompositeSchemaValid = false;
 
-    if (!_.isArray(schemaToUse)) {
-      return false;
-    }
+      if (!_.isArray(schemaToUse)) {
+        return false;
+      }
 
-    for (let index = 0; index < schemaToUse.length; index++) {
-      const isCurrentElementInvalid = _.some(validationMismatches, (mismatch) => {
-        return _.startsWith(mismatch.schemaPath, compositeSchemaMismatchPath + `/${index}`);
-      });
+      for (let index = 0; index < schemaToUse.length; index++) {
+        const isCurrentElementInvalid = _.some(validationMismatches, (mismatch) => {
+          return _.startsWith(mismatch.schemaPath, compositeSchemaMismatchPath + `/${index}`);
+        });
 
-      if (!isCurrentElementInvalid) {
-        isCompositeSchemaValid = true;
-        break;
+        if (!isCurrentElementInvalid) {
+          isCompositeSchemaValid = true;
+          break;
+        }
       }
-    }
 
-    if (isCompositeSchemaValid) {
-      validationMismatches = _.reject(validationMismatches, (mismatch) => {
-        return _.startsWith(mismatch.schemaPath, compositeSchemaMismatchPath);
-      });
-    }
+      if (isCompositeSchemaValid) {
+        validationMismatches = _.reject(validationMismatches, (mismatch) => {
+          return _.startsWith(mismatch.schemaPath, compositeSchemaMismatchPath);
+        });
+      }
+    });
   });
 
   return validationMismatches;