lbsadmin/Beego
1
0
Fork 0
mirror of https://github.com/astaxie/beego.git synced 2024-11-22 13:00:54 +00:00
Code Issues Releases Activity

added CanSkipAlso

Browse Source
This commit is contained in:
Andrea Spacca 2018-02-02 10:22:43 +01:00
parent 453f112094
commit 5ed112e946
2 changed files with 59 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
validation/validation.go
View File

@ -245,14 +245,13 @@ func (v *Validation) ZipCode(obj interface{}, key string) *Result {
} }
func (v *Validation) apply(chk Validator, obj interface{}) *Result { func (v *Validation) apply(chk Validator, obj interface{}) *Result {
validatorName := reflect.TypeOf(chk).Name()
if nil == obj { if nil == obj {
if chk.IsSatisfied(obj) { if chk.IsSatisfied(obj) {
return &Result{Ok: true} return &Result{Ok: true}
} }
} else if reflect.TypeOf(obj).Kind() == reflect.Ptr { } else if reflect.TypeOf(obj).Kind() == reflect.Ptr {
if reflect.ValueOf(obj).IsNil() { if reflect.ValueOf(obj).IsNil() {
if "Required" != validatorName { if chk.IsSatisfied(nil) {
return &Result{Ok: true} return &Result{Ok: true}
} }
} else { } else {
@ -372,7 +371,18 @@ func (v *Validation) Valid(obj interface{}) (b bool, err error) {
hasReuired = true hasReuired = true
} }
if !hasReuired && v.RequiredFirst && len(objV.Field(i).String()) == 0 { currentField := objV.Field(i).Interface()
if objV.Field(i).Kind() == reflect.Ptr {
if objV.Field(i).IsNil() {
currentField = ""
} else {
currentField = objV.Field(i).Elem().Interface()
}
}
chk := Required{""}.IsSatisfied(currentField)
if !hasReuired && v.RequiredFirst && !chk {
if _, ok := CanSkipFuncs[vf.Name]; ok { if _, ok := CanSkipFuncs[vf.Name]; ok {
continue continue
} }
@ -429,3 +439,9 @@ func (v *Validation) RecursiveValid(objc interface{}) (bool, error) {
} }
return pass, err return pass, err
} }
func (v *Validation) CanSkipAlso(skipFunc string) {
if _, ok := CanSkipFuncs[skipFunc]; !ok {
CanSkipFuncs[skipFunc] = struct{}{}
}
}

42
validation/validation_test.go
View File

@ -490,8 +490,8 @@ func TestPointer(t *testing.T) {
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
if !b { if b {
t.Fatal("validation should be passed") t.Fatal("validation should not be passed")
} }
invalidEmail := "a@a" invalidEmail := "a@a"
@ -523,3 +523,41 @@ func TestPointer(t *testing.T) {
t.Fatal("validation should not be passed") t.Fatal("validation should not be passed")
} }
} }
func TestCanSkipAlso(t *testing.T) {
type User struct {
ID int
Email string `valid:"Email"`
ReqEmail string `valid:"Required;Email"`
MatchRange int `valid:"Range(10, 20)"`
}
u := User{
ReqEmail: "a@a.com",
Email: "",
MatchRange: 0,
}
valid := Validation{RequiredFirst: true}
b, err := valid.Valid(u)
if err != nil {
t.Fatal(err)
}
if b {
t.Fatal("validation should not be passed")
}
valid = Validation{RequiredFirst: true}
valid.CanSkipAlso("Range")
b, err = valid.Valid(u)
if err != nil {
t.Fatal(err)
}
if !b {
t.Fatal("validation should be passed")
}
}