struct can be null flag

local
hzy 1 year ago
parent 3cac6d154d
commit e3e24a10a9
  1. 19
      validator_instance.go

@ -150,14 +150,14 @@ func (v *Validate) SetTagName(name string) {
v.tagName = name
}
const omitemptyStructPrefix = "__omitempty_struct__"
const omitemptyPrefix = "__omitempty__"
// ValidateMapCtx validates a map using a map of validation rules and allows passing of contextual
// validation validation information via context.Context.
func (v Validate) ValidateMapCtx(ctx context.Context, data map[string]interface{}, rules map[string]interface{}) map[string]interface{} {
errs := make(map[string]interface{})
for field, rule := range rules {
if strings.HasPrefix(field, omitemptyStructPrefix) == true {
if strings.HasPrefix(field, omitemptyPrefix) == true {
continue
}
if ruleObj, ok := rule.(map[string]interface{}); ok {
@ -170,15 +170,16 @@ func (v Validate) ValidateMapCtx(ctx context.Context, data map[string]interface{
} else {
errs[field] = errors.New("The field: '" + field + "' is not a map to dive")
}
} else if _, ok := rules[fmt.Sprintf("%s%s", omitemptyStructPrefix, field)].(string); ok {
// struct can be null
} else if _, ok := rules[fmt.Sprintf("%s%s", omitemptyPrefix, field)].(string); ok {
// can be null
continue
} else {
errs[field] = errors.New("The field: '" + field + "' is not a map to dive")
}
} else if arrRuleObj, ok := rule.([]map[string]interface{}); ok {
if dataObjs, ok := data[field].([]map[string]interface{}); ok && len(arrRuleObj) > 0 {
for _, obj := range dataObjs {
if dataObjs, ok := data[field]; ok {
if do, ok := dataObjs.([]map[string]interface{}); ok && len(arrRuleObj) > 0 {
for _, obj := range do {
err := v.ValidateMapCtx(ctx, obj, arrRuleObj[0])
if len(err) > 0 {
errs[field] = err
@ -187,6 +188,12 @@ func (v Validate) ValidateMapCtx(ctx context.Context, data map[string]interface{
} else {
errs[field] = errors.New("The field: '" + field + "' is not a map array")
}
} else if _, ok := rules[fmt.Sprintf("%s%s", omitemptyPrefix, field)].(string); ok {
// can be null
continue
} else {
errs[field] = errors.New("The field: '" + field + "' is not a map array")
}
} else if ruleStr, ok := rule.(string); ok {
err := v.VarCtx(ctx, data[field], ruleStr)
if err != nil {

Loading…
Cancel
Save