allows multiple values of same field on excluded_uunless to have opposite equivilant result to required_unless

Author: chargraves85

baked_in.go

@@ -1989,11 +1989,12 @@ func excludedUnless(fl FieldLevel) bool {
 		panic(fmt.Sprintf("Bad param number for excluded_unless %s", fl.FieldName()))
 	}
 	for i := 0; i < len(params); i += 2 {
-		if !requireCheckFieldValue(fl, params[i], params[i+1], false) {
-			return !hasValue(fl)
+		if requireCheckFieldValue(fl, params[i], params[i+1], false) {
+			return true
 		}
 	}
-	return true
+
+	return !hasValue(fl)
 }
 
 // excludedWith is the validation function

validator_test.go

@@ -11443,6 +11443,21 @@ func TestRequiredUnless(t *testing.T) {
 	}
 	errs = validate.Struct(test6)
 	NotEqual(t, errs, nil)
+
+	test7 := struct {
+		Field1 int
+		Field2 string `validate:"required_unless=Field1 1 Field1 2"`
+		Field3 int
+		Field4 string `validate:"required_unless=Field3 1 Field3 2"`
+	}{
+		Field1: 1,
+		Field3: 3,
+	}
+
+	errs = validate.Struct(test7)
+	NotEqual(t, errs, nil)
+
+	AssertError(t, errs, "Field4", "Field4", "Field4", "Field4", "required_unless")
 }
 
 func TestSkipUnless(t *testing.T) {
@@ -12474,6 +12489,26 @@ func TestExcludedUnless(t *testing.T) {
 		Inner: &Inner{Field: &fieldVal},
 	}
 	_ = validate.Struct(panicTest)
+
+	test9 := struct {
+		Field1 int
+		Field2 string `validate:"excluded_unless: Field1 1 Field1 2"`
+		Field3 int
+		Field4 string `validate:"excluded_unless: Field3 1 Field3 2"`
+	}{
+		Field1: 1,
+		Field2: "foo",
+		Field3: 3,
+		Field4: "foo",
+	}
+
+	errs = validate.Struct(test9)
+	NotEqual(t, errs, nil)
+
+	ve = errs.(ValidationErrors)
+	Equal(t, len(ve), 1)
+
+	AssertError(t, errs, "Field2", "Field2", "Field2", "Field2", "required_unless")
 }
 
 func TestLookup(t *testing.T) {
@@ -13374,39 +13409,39 @@ func TestBicIso2022FormatValidation(t *testing.T) {
 		{"SBICKENXX9", "bic", false},
 		{"SBICKEN13458", "bic", false},
 		{"SBICKEN", "bic", false},
-		{"DEUTDEFF", "bic", true},         // 8-char classic (Germany)
-		{"DEUTDEFF500", "bic", true},      // 11-char with numeric branch
-		{"A1B2US33", "bic", true},         // digits allowed in 4!c (bank code)
-		{"1234US33", "bic", true},         // all digits in 4!c (2022)
-		{"ZZZ1USAA", "bic", true},         // mixed alnum bank + alnum location
-		{"AB12AE00", "bic", true},         // UAE 8-char
-		{"AB12AE009Z9", "bic", true},      // UAE 11-char with mixed branch
-		{"WG11US335AB", "bic", true},      // example-style with digits in branch
-		{"BNPAFRPP", "bic", true},         // France (BNP Paribas style)
-		{"BOFAUS3NXXX", "bic", true},      // US with default XXX branch
-		{"HSBCHKHHXXX", "bic", true},      // Hong Kong, default branch
-		{"NEDSZAJJ", "bic", true},         // South Africa 8-char
-		{"BARCGB22", "bic", true},         // GB 8-char
-		{"BARCGB22XXX", "bic", true},      // GB 11-char with XXX branch
-		{"0000GB00", "bic", true},         // 4!c all digits + 2!c all digits (allowed)
-		{"A1B2GB00XXX", "bic", true},      // valid 11-char with numeric location and XXX
-		{"TATRAEBX", "bic", true},         // UAE 8-char
-		{"TATRSABX", "bic", true},         // Saudi 8-char
-		{"TATREGBX", "bic", true},         // Egypt 8-char
-		{"TATRBHBX", "bic", true},         // Bahrain 8-char
-		
-		{"DEUTDEFFF", "bic", false},       // 9-char (invalid length)
-		{"DEUTDEFF5", "bic", false},       // 9-char (invalid length)
-		{"DEUTDE", "bic", false},          // 6-char (invalid length)
-		{"DEUTDEFF50", "bic", false},      // 10-char (invalid length)
-		{"DEUTDEFF5000", "bic", false},    // 12-char (invalid length)
-		{"deUTDEFF", "bic", false},        // lowercase not allowed
-		{"DEUTDEfF", "bic", false},        // lowercase in location
-		{"DEU@DEFF", "bic", false},        // special char in bank
-		{"ABCD12FF", "bic", false},        // digits in 2!a country (invalid)
-		{"ABCDDE1-", "bic", false},        // hyphen in location
-		{"ABCDDE1_", "bic", false},        // underscore in location
-		{"ABCDDE١٢", "bic", false},        // non-ASCII digits in location
+		{"DEUTDEFF", "bic", true},    // 8-char classic (Germany)
+		{"DEUTDEFF500", "bic", true}, // 11-char with numeric branch
+		{"A1B2US33", "bic", true},    // digits allowed in 4!c (bank code)
+		{"1234US33", "bic", true},    // all digits in 4!c (2022)
+		{"ZZZ1USAA", "bic", true},    // mixed alnum bank + alnum location
+		{"AB12AE00", "bic", true},    // UAE 8-char
+		{"AB12AE009Z9", "bic", true}, // UAE 11-char with mixed branch
+		{"WG11US335AB", "bic", true}, // example-style with digits in branch
+		{"BNPAFRPP", "bic", true},    // France (BNP Paribas style)
+		{"BOFAUS3NXXX", "bic", true}, // US with default XXX branch
+		{"HSBCHKHHXXX", "bic", true}, // Hong Kong, default branch
+		{"NEDSZAJJ", "bic", true},    // South Africa 8-char
+		{"BARCGB22", "bic", true},    // GB 8-char
+		{"BARCGB22XXX", "bic", true}, // GB 11-char with XXX branch
+		{"0000GB00", "bic", true},    // 4!c all digits + 2!c all digits (allowed)
+		{"A1B2GB00XXX", "bic", true}, // valid 11-char with numeric location and XXX
+		{"TATRAEBX", "bic", true},    // UAE 8-char
+		{"TATRSABX", "bic", true},    // Saudi 8-char
+		{"TATREGBX", "bic", true},    // Egypt 8-char
+		{"TATRBHBX", "bic", true},    // Bahrain 8-char
+
+		{"DEUTDEFFF", "bic", false},    // 9-char (invalid length)
+		{"DEUTDEFF5", "bic", false},    // 9-char (invalid length)
+		{"DEUTDE", "bic", false},       // 6-char (invalid length)
+		{"DEUTDEFF50", "bic", false},   // 10-char (invalid length)
+		{"DEUTDEFF5000", "bic", false}, // 12-char (invalid length)
+		{"deUTDEFF", "bic", false},     // lowercase not allowed
+		{"DEUTDEfF", "bic", false},     // lowercase in location
+		{"DEU@DEFF", "bic", false},     // special char in bank
+		{"ABCD12FF", "bic", false},     // digits in 2!a country (invalid)
+		{"ABCDDE1-", "bic", false},     // hyphen in location
+		{"ABCDDE1_", "bic", false},     // underscore in location
+		{"ABCDDE١٢", "bic", false},     // non-ASCII digits in location
 	}
 
 	validate := New()