#908|Add Support of SkipUnless

baked_in.go

@@ -71,6 +71,7 @@ var (
 		"required":                      hasValue,
 		"required_if":                   requiredIf,
 		"required_unless":               requiredUnless,
+		"skip_unless":                   skipUnless,
 		"required_with":                 requiredWith,
 		"required_with_all":             requiredWithAll,
 		"required_without":              requiredWithout,
@@ -1609,6 +1610,22 @@ func requiredUnless(fl FieldLevel) bool {
 	return hasValue(fl)
 }
 
+// skipUnless is the validation function
+// The field under validation must be present and not empty only unless all the other specified fields are equal to the value following with the specified field.
+func skipUnless(fl FieldLevel) bool {
+	params := parseOneOfParam2(fl.Param())
+	if len(params)%2 != 0 {
+		panic(fmt.Sprintf("Bad param number for skip_unless %s", fl.FieldName()))
+	}
+
+	for i := 0; i < len(params); i += 2 {
+		if requireCheckFieldValue(fl, params[i], params[i+1], false) {
+			return true
+		}
+	}
+	return hasValue(fl)
+}
+
 // excludedUnless is the validation function
 // The field under validation must not be present or is empty unless all the other specified fields are equal to the value following with the specified field.
 func excludedUnless(fl FieldLevel) bool {

cache.go

@@ -120,7 +120,7 @@ func (v *Validate) extractStructCache(current reflect.Value, sName string) *cStr
 	var fld reflect.StructField
 	var tag string
 	var customName string
-	
+
 	for i := 0; i < numFields; i++ {
 
 		fld = typ.Field(i)

validator_instance.go

@@ -29,6 +29,7 @@ const (
 	requiredWithAllTag    = "required_with_all"
 	requiredIfTag         = "required_if"
 	requiredUnlessTag     = "required_unless"
+	skipUnlessTag         = "skip_unless"
 	excludedWithoutAllTag = "excluded_without_all"
 	excludedWithoutTag    = "excluded_without"
 	excludedWithTag       = "excluded_with"
@@ -123,7 +124,8 @@ func New() *Validate {
 		switch k {
 		// these require that even if the value is nil that the validation should run, omitempty still overrides this behaviour
 		case requiredIfTag, requiredUnlessTag, requiredWithTag, requiredWithAllTag, requiredWithoutTag, requiredWithoutAllTag,
-			excludedIfTag, excludedUnlessTag, excludedWithTag, excludedWithAllTag, excludedWithoutTag, excludedWithoutAllTag:
+			excludedIfTag, excludedUnlessTag, excludedWithTag, excludedWithAllTag, excludedWithoutTag, excludedWithoutAllTag,
+			skipUnlessTag:
 			_ = v.registerValidation(k, wrapFunc(val), true, true)
 		default:
 			// no need to error check here, baked in will always be valid

validator_test.go

@@ -12264,25 +12264,25 @@ func TestCreditCardFormatValidation(t *testing.T) {
 }
 
 func TestMultiOrOperatorGroup(t *testing.T) {
- 	tests := []struct {
+	tests := []struct {
- 		Value    int `validate:"eq=1|gte=5,eq=1|lt=7"`
+		Value    int `validate:"eq=1|gte=5,eq=1|lt=7"`
- 		expected bool
+		expected bool
- 	}{
+	}{
- 		{1, true}, {2, false}, {5, true}, {6, true}, {8, false},
+		{1, true}, {2, false}, {5, true}, {6, true}, {8, false},
- 	}
+	}
-
+
- 	validate := New()
+	validate := New()
-
+
- 	for i, test := range tests {
+	for i, test := range tests {
- 		errs := validate.Struct(test)
+		errs := validate.Struct(test)
- 		if test.expected {
+		if test.expected {
- 			if !IsEqual(errs, nil) {
+			if !IsEqual(errs, nil) {
- 				t.Fatalf("Index: %d multi_group_of_OR_operators failed Error: %s", i, errs)
+				t.Fatalf("Index: %d multi_group_of_OR_operators failed Error: %s", i, errs)
- 			}
+			}
- 		} else {
+		} else {
- 			if IsEqual(errs, nil) {
+			if IsEqual(errs, nil) {
- 				t.Fatalf("Index: %d multi_group_of_OR_operators should have errs", i)
+				t.Fatalf("Index: %d multi_group_of_OR_operators should have errs", i)
- 			}
+			}
- 		}
+		}
- 	}
+	}
- }
+}