Skip to content

Omitzero does not work with slice and map bug #1436

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.

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

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 4 additions & 1 deletion baked_in.go
Original file line number Diff line number Diff line change
Expand Up @@ -1794,7 +1794,10 @@ func hasValue(fl FieldLevel) bool {
func hasNotZeroValue(fl FieldLevel) bool {
field := fl.Field()
switch field.Kind() {
case reflect.Slice, reflect.Map, reflect.Ptr, reflect.Interface, reflect.Chan, reflect.Func:
case reflect.Slice, reflect.Map:
// For slices and maps, consider them "not zero" only if they're both non-nil AND have elements
return !field.IsNil() && field.Len() > 0
case reflect.Ptr, reflect.Interface, reflect.Chan, reflect.Func:
return !field.IsNil()
default:
if fl.(*validate).fldIsPointer && getValue(field) != nil {
Expand Down
120 changes: 120 additions & 0 deletions validator_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -14633,3 +14633,123 @@ func TestMapEmptyPointerStructValueNoError(t *testing.T) {
errs = validate.Struct(obj2)
Equal(t, errs, nil)
}
func TestOmitZeroWithSlices(t *testing.T) {
// Tests the behavior of omitempty and omitzero with slices
type OmitEmptyExample struct {
Data []string `validate:"omitempty,min=2"`
}

type OmitZeroExample struct {
Data []string `validate:"omitzero,min=2"`
}

validate := New()

t.Run("nil slices", func(t *testing.T) {
// Test 1: nil slices
test1Empty := OmitEmptyExample{Data: nil}
test1Zero := OmitZeroExample{Data: nil}

err1 := validate.Struct(test1Empty)
err2 := validate.Struct(test1Zero)

Equal(t, err1, nil) // No error (skipped)
Equal(t, err2, nil) // No error (skipped)
})

t.Run("empty but non-nil slices", func(t *testing.T) {
// Test 2: empty but non-nil slices
test2Empty := OmitEmptyExample{Data: []string{}}
test2Zero := OmitZeroExample{Data: []string{}}

err1 := validate.Struct(test2Empty)
err2 := validate.Struct(test2Zero)

NotEqual(t, err1, nil) // Error (min=2)
Equal(t, err2, nil) // No error (should be skipped)
})

t.Run("single item slices", func(t *testing.T) {
// Test 3: single item slices (still not meeting min=2)
test3Empty := OmitEmptyExample{Data: []string{"one"}}
test3Zero := OmitZeroExample{Data: []string{"one"}}

err1 := validate.Struct(test3Empty)
err2 := validate.Struct(test3Zero)

NotEqual(t, err1, nil) // Error (min=2)
NotEqual(t, err2, nil) // Error (min=2)
})

t.Run("valid slices", func(t *testing.T) {
// Test 4: valid slices (min=2 satisfied)
test4Empty := OmitEmptyExample{Data: []string{"one", "two"}}
test4Zero := OmitZeroExample{Data: []string{"one", "two"}}

err1 := validate.Struct(test4Empty)
err2 := validate.Struct(test4Zero)

Equal(t, err1, nil) // No error
Equal(t, err2, nil) // No error
})
}
func TestOmitZeroWithMaps(t *testing.T) {
// Tests the behavior of omitempty and omitzero with maps
type OmitEmptyExample struct {
Data map[string]string `validate:"omitempty,min=2"`
}

type OmitZeroExample struct {
Data map[string]string `validate:"omitzero,min=2"`
}

validate := New()

t.Run("nil maps", func(t *testing.T) {
// Test 1: nil maps
test1Empty := OmitEmptyExample{Data: nil}
test1Zero := OmitZeroExample{Data: nil}

err1 := validate.Struct(test1Empty)
err2 := validate.Struct(test1Zero)

Equal(t, err1, nil) // No error (skipped)
Equal(t, err2, nil) // No error (skipped)
})

t.Run("empty but non-nil maps", func(t *testing.T) {
// Test 2: empty but non-nil maps
test2Empty := OmitEmptyExample{Data: map[string]string{}}
test2Zero := OmitZeroExample{Data: map[string]string{}}

err1 := validate.Struct(test2Empty)
err2 := validate.Struct(test2Zero)

NotEqual(t, err1, nil) // Error (min=2)
Equal(t, err2, nil) // No error (should be skipped)
})

t.Run("single item maps", func(t *testing.T) {
// Test 3: single item maps (still not meeting min=2)
test3Empty := OmitEmptyExample{Data: map[string]string{"key1": "value1"}}
test3Zero := OmitZeroExample{Data: map[string]string{"key1": "value1"}}

err1 := validate.Struct(test3Empty)
err2 := validate.Struct(test3Zero)

NotEqual(t, err1, nil) // Error (min=2)
NotEqual(t, err2, nil) // Error (min=2)
})

t.Run("valid maps", func(t *testing.T) {
// Test 4: valid maps (min=2 satisfied)
test4Empty := OmitEmptyExample{Data: map[string]string{"key1": "value1", "key2": "value2"}}
test4Zero := OmitZeroExample{Data: map[string]string{"key1": "value1", "key2": "value2"}}

err1 := validate.Struct(test4Empty)
err2 := validate.Struct(test4Zero)

Equal(t, err1, nil) // No error
Equal(t, err2, nil) // No error
})
}