Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Align required_without with usage shown in the docs #1324

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Align required_without with usage shown in the docs #1324

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions baked_in.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1979,8 +1979,11 @@ func excludedWithout(fl FieldLevel) bool {
// requiredWithout is the validation function
// The field under validation must be present and not empty only when any of the other specified fields are not present.
func requiredWithout(fl FieldLevel) bool {
if requireCheckFieldKind(fl, strings.TrimSpace(fl.Param()), true) {
return hasValue(fl)
params := parseOneOfParam2(fl.Param())
for _, param := range params {
if requireCheckFieldKind(fl, param, true) {
return hasValue(fl)
}
}
return true
}
Expand Down
26 changes: 26 additions & 0 deletions validator_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11825,6 +11825,32 @@ func TestRequiredWithout(t *testing.T) {

errs = validate.Struct(&test3)
Equal(t, errs, nil)

test4 := struct {
Field1 string `validate:"required_without=Field2 Field3,omitempty,min=1" json:"field_1"`
Field2 string `json:"field_2"`
Field3 string `json:"field_3"`
}{
Field1: "test",
}

errs = validate.Struct(&test4)
Equal(t, errs, nil)

test5 := struct {
Field1 string `validate:"required_without=Field2 Field3,omitempty,min=1" json:"field_1"`
Field2 string `json:"field_2"`
Field3 string `json:"field_3"`
}{
Field3: "test",
}

errs = validate.Struct(&test5)
NotEqual(t, errs, nil)

ve = errs.(ValidationErrors)
Equal(t, len(ve), 1)
AssertError(t, errs, "Field1", "Field1", "Field1", "Field1", "required_without")
}

func TestRequiredWithoutAll(t *testing.T) {
Expand Down