Merge pull request #101 from slimmy/validate
return messages for required bindings
This commit is contained in:
commit
28b9ff9e34
@ -155,7 +155,7 @@ func ensureNotPointer(obj interface{}) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func Validate(obj interface{}) error {
|
func Validate(obj interface{}, parents ...string) error {
|
||||||
typ := reflect.TypeOf(obj)
|
typ := reflect.TypeOf(obj)
|
||||||
val := reflect.ValueOf(obj)
|
val := reflect.ValueOf(obj)
|
||||||
|
|
||||||
@ -180,12 +180,19 @@ func Validate(obj interface{}) error {
|
|||||||
if strings.Index(field.Tag.Get("binding"), "required") > -1 {
|
if strings.Index(field.Tag.Get("binding"), "required") > -1 {
|
||||||
fieldType := field.Type.Kind()
|
fieldType := field.Type.Kind()
|
||||||
if fieldType == reflect.Struct {
|
if fieldType == reflect.Struct {
|
||||||
err := Validate(fieldValue)
|
if reflect.DeepEqual(zero, fieldValue) {
|
||||||
|
return errors.New("Required " + field.Name)
|
||||||
|
}
|
||||||
|
err := Validate(fieldValue, field.Name)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
} else if reflect.DeepEqual(zero, fieldValue) {
|
} else if reflect.DeepEqual(zero, fieldValue) {
|
||||||
|
if len(parents) > 0 {
|
||||||
|
return errors.New("Required " + field.Name + " on " + parents[0])
|
||||||
|
} else {
|
||||||
return errors.New("Required " + field.Name)
|
return errors.New("Required " + field.Name)
|
||||||
|
}
|
||||||
} else if fieldType == reflect.Slice && field.Type.Elem().Kind() == reflect.Struct {
|
} else if fieldType == reflect.Slice && field.Type.Elem().Kind() == reflect.Struct {
|
||||||
err := Validate(fieldValue)
|
err := Validate(fieldValue)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
Loading…
Reference in New Issue
Block a user