Skip to content

Commit

Permalink
fix edge case (#1163)
Browse files Browse the repository at this point in the history
## Fixes Or Enhances

Fixes #1162 by not skipping the `required` for non nested structs
accidentally introduced in last release.
  • Loading branch information
deankarn authored Sep 13, 2023
1 parent d57b3a8 commit 619321c
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 1 deletion.
2 changes: 1 addition & 1 deletion validator.go
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ func (v *validate) traverseField(ctx context.Context, parent reflect.Value, curr
// structs. Since it's basically nonsensical to use `required` with a non-pointer struct
// are explicitly skipping the required validation for it. This WILL be removed in the
// next major version.
if !v.v.requiredStructEnabled && ct != nil && ct.tag == requiredTag {
if isNestedStruct && !v.v.requiredStructEnabled && ct != nil && ct.tag == requiredTag {
ct = ct.next
}
}
Expand Down
23 changes: 23 additions & 0 deletions validator_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -13534,3 +13534,26 @@ func TestNestedStructValidation(t *testing.T) {
})
}
}

func TestTimeRequired(t *testing.T) {
validate := New()
validate.RegisterTagNameFunc(func(fld reflect.StructField) string {
name := strings.SplitN(fld.Tag.Get("json"), ",", 2)[0]

if name == "-" {
return ""
}

return name
})

type TestTime struct {
Time time.Time `validate:"required"`
}

var testTime TestTime

err := validate.Struct(&testTime)
NotEqual(t, err, nil)
AssertError(t, err.(ValidationErrors), "TestTime.Time", "TestTime.Time", "Time", "Time", "required")
}

0 comments on commit 619321c

Please sign in to comment.