fix: validateMap invalid err msgs

pull/962/head
Kaustubh Babar 2 years ago
parent 9e2ea40380
commit b0bea5b009
  1. 1
      _examples/map-validation/main.go
  2. 8
      errors.go
  3. 8
      validator_instance.go
  4. 46
      validator_test.go

@ -2,6 +2,7 @@ package main
import ( import (
"fmt" "fmt"
"github.com/go-playground/validator/v10" "github.com/go-playground/validator/v10"
) )

@ -208,7 +208,13 @@ func (fe *fieldError) StructNamespace() string {
// field's actual name. // field's actual name.
func (fe *fieldError) Field() string { func (fe *fieldError) Field() string {
return fe.ns[len(fe.ns)-int(fe.fieldLen):] nsLength, fieldLength := len(fe.ns), int(fe.fieldLen)
if fieldLength == 0 {
return fe.ns
}
return fe.ns[nsLength-fieldLength:]
// // return fe.field // // return fe.field
// fld := fe.ns[len(fe.ns)-int(fe.fieldLen):] // fld := fe.ns[len(fe.ns)-int(fe.fieldLen):]

@ -172,7 +172,7 @@ func (v Validate) ValidateMapCtx(ctx context.Context, data map[string]interface{
errs[field] = errors.New("The field: '" + field + "' is not a map to dive") errs[field] = errors.New("The field: '" + field + "' is not a map to dive")
} }
} else if ruleStr, ok := rule.(string); ok { } else if ruleStr, ok := rule.(string); ok {
err := v.VarCtx(ctx, data[field], ruleStr) err := v.VarCtx(ctx, data[field], ruleStr, field)
if err != nil { if err != nil {
errs[field] = err errs[field] = err
} }
@ -609,7 +609,7 @@ func (v *Validate) StructExceptCtx(ctx context.Context, s interface{}, fields ..
// You will need to assert the error if it's not nil eg. err.(validator.ValidationErrors) to access the array of errors. // You will need to assert the error if it's not nil eg. err.(validator.ValidationErrors) to access the array of errors.
// validate Array, Slice and maps fields which may contain more than one error // validate Array, Slice and maps fields which may contain more than one error
func (v *Validate) Var(field interface{}, tag string) error { func (v *Validate) Var(field interface{}, tag string) error {
return v.VarCtx(context.Background(), field, tag) return v.VarCtx(context.Background(), field, tag, "")
} }
// VarCtx validates a single variable using tag style validation and allows passing of contextual // VarCtx validates a single variable using tag style validation and allows passing of contextual
@ -626,7 +626,7 @@ func (v *Validate) Var(field interface{}, tag string) error {
// It returns InvalidValidationError for bad values passed in and nil or ValidationErrors as error otherwise. // It returns InvalidValidationError for bad values passed in and nil or ValidationErrors as error otherwise.
// You will need to assert the error if it's not nil eg. err.(validator.ValidationErrors) to access the array of errors. // You will need to assert the error if it's not nil eg. err.(validator.ValidationErrors) to access the array of errors.
// validate Array, Slice and maps fields which may contain more than one error // validate Array, Slice and maps fields which may contain more than one error
func (v *Validate) VarCtx(ctx context.Context, field interface{}, tag string) (err error) { func (v *Validate) VarCtx(ctx context.Context, field interface{}, tag, keyName string) (err error) {
if len(tag) == 0 || tag == skipValidationTag { if len(tag) == 0 || tag == skipValidationTag {
return nil return nil
} }
@ -636,7 +636,7 @@ func (v *Validate) VarCtx(ctx context.Context, field interface{}, tag string) (e
vd := v.pool.Get().(*validate) vd := v.pool.Get().(*validate)
vd.top = val vd.top = val
vd.isPartial = false vd.isPartial = false
vd.traverseField(ctx, val, val, vd.ns[0:0], vd.actualNs[0:0], defaultCField, ctag) vd.traverseField(ctx, val, val, []byte(keyName), vd.actualNs[0:0], defaultCField, ctag)
if len(vd.errs) > 0 { if len(vd.errs) > 0 {
err = vd.errs err = vd.errs

@ -2230,7 +2230,7 @@ func TestSQLValue2Validation(t *testing.T) {
AssertError(t, errs, "", "", "", "", "required") AssertError(t, errs, "", "", "", "", "required")
val.Name = "Valid Name" val.Name = "Valid Name"
errs = validate.VarCtx(context.Background(), val, "required") errs = validate.Var(val, "required")
Equal(t, errs, nil) Equal(t, errs, nil)
val.Name = "errorme" val.Name = "errorme"
@ -12286,3 +12286,47 @@ func TestMultiOrOperatorGroup(t *testing.T) {
} }
} }
} }
func TestValidate_ValidateMapCtxErrorMessage(t *testing.T) {
type args struct {
data map[string]interface{}
rules map[string]interface{}
errors map[string]interface{}
}
tests := []struct {
name string
args args
}{
{
name: "invalid_email",
args: args{
data: map[string]interface{}{
"email_address": "example.",
},
rules: map[string]interface{}{
"email_address": "omitempty,required,email",
},
errors: map[string]interface{}{
"email_address": "Key: 'email_address' Error:Field validation for 'email_address' failed on the 'email' tag",
},
},
},
}
for _, test := range tests {
t.Run(test.name, func(t *testing.T) {
validate := New()
got := validate.ValidateMapCtx(context.Background(), test.args.data, test.args.rules)
for key, err := range got {
fieldErrors, ok := err.(ValidationErrors)
if !ok {
t.Errorf("failed to get underlying value of interface")
}
if test.args.errors[key] != fieldErrors[0].Error() {
t.Errorf("\nwanted: '%v' \ngot: '%v' \n", test.args.errors[key], err)
}
}
})
}
}

Loading…
Cancel
Save