Skip to content

Convert to time.Time before asserting in isNeField #1619

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

Open
youdie006 wants to merge 1 commit into
base: master
Choose a base branch
from
+22 −2
Open

Convert to time.Time before asserting in isNeField #1619

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
4 changes: 2 additions & 2 deletions baked_in.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1070,8 +1070,8 @@ func isNeField(fl FieldLevel) bool {
fieldType := field.Type()

if fieldType.ConvertibleTo(timeType) && currentField.Type().ConvertibleTo(timeType) {
t := getValue(currentField).(time.Time)
fieldTime := getValue(field).(time.Time)
t := getValue(currentField.Convert(timeType)).(time.Time)
fieldTime := getValue(field.Convert(timeType)).(time.Time)

return !fieldTime.Equal(t)
}
Expand Down
20 changes: 20 additions & 0 deletions validator_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1940,6 +1940,26 @@ func TestCrossStructNeFieldValidation(t *testing.T) {
Equal(t, errs, nil)
}

type namedTime time.Time

func TestNeFieldNamedTimeValidation(t *testing.T) {
// nefield accepts any type convertible to time.Time, per its own guard.
type Test struct {
Start namedTime
End namedTime `validate:"nefield=Start"`
}

validate := New()
now := namedTime(time.Now())

errs := validate.Struct(Test{Start: now, End: now})
NotEqual(t, errs, nil)
AssertError(t, errs.(ValidationErrors), "Test.End", "Test.End", "End", "End", "nefield")

errs = validate.Struct(Test{Start: now, End: namedTime(time.Now().Add(time.Hour))})
Equal(t, errs, nil)
}

func TestCrossStructEqFieldValidation(t *testing.T) {
var errs error
validate := New()
Expand Down