Skip to content

Commit

Permalink
validation: fix ErrorMap, added func AddError(key, message)
Browse files Browse the repository at this point in the history
  • Loading branch information
Radar8 committed Sep 6, 2017
1 parent d96289a commit 6641a43
Showing 1 changed file with 25 additions and 4 deletions.
29 changes: 25 additions & 4 deletions validation/validation.go
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ type Validation struct {
RequiredFirst bool

Errors []*Error
ErrorsMap map[string]*Error
ErrorsMap map[string][]*Error
}

// Clear Clean all ValidationError.
Expand All @@ -129,7 +129,7 @@ func (v *Validation) HasErrors() bool {
// ErrorMap Return the errors mapped by key.
// If there are multiple validation errors associated with a single key, the
// first one "wins". (Typically the first validation will be the more basic).
func (v *Validation) ErrorMap() map[string]*Error {
func (v *Validation) ErrorMap() map[string][]*Error {
return v.ErrorsMap
}

Expand Down Expand Up @@ -278,14 +278,35 @@ func (v *Validation) apply(chk Validator, obj interface{}) *Result {
}
}

// Add independent error message for key
func (v *Validation) AddError(key, message string) {
Name := key
Field := ""

parts := strings.Split(key, ".")
if len(parts) == 2 {
Field = parts[0]
Name = parts[1]
}

err := &Error{
Message: message,
Key: key,
Name: Name,
Field: Field,
}
v.setError(err)
}

func (v *Validation) setError(err *Error) {
v.Errors = append(v.Errors, err)
if v.ErrorsMap == nil {
v.ErrorsMap = make(map[string]*Error)
v.ErrorsMap = make(map[string][]*Error)
}
if _, ok := v.ErrorsMap[err.Field]; !ok {
v.ErrorsMap[err.Field] = err
v.ErrorsMap[err.Field] = []*Error{}
}
v.ErrorsMap[err.Field] = append(v.ErrorsMap[err.Field], err)
}

// SetError Set error message for one field in ValidationError
Expand Down

0 comments on commit 6641a43

Please sign in to comment.