feat:新增数组字段 --story=128495448 字段类型： 数组

Author: elizabevil

src/common/metadata/attribute.go

@@ -982,28 +982,24 @@ func validArrayItem[T any](ty string, data any) ([]T, error) {
 
 func (attribute *Attribute) validArray(ctx context.Context, val interface{}, key string) errors.RawErrorInfo {
 	rid := util.ExtractRequestUserFromContext(ctx)
-
+	errorInfo := errors.RawErrorInfo{
+		ErrCode: common.CCErrCommParamsInvalid,
+		Args:    []interface{}{key},
+	}
 	if val == nil {
 		if attribute.IsRequired {
 			blog.Error("params can not be null, array field key: %s, rid: %s", key, rid)
-			return errors.RawErrorInfo{
-				ErrCode: common.CCErrCommParamsNeedSet,
-				Args:    []interface{}{key},
-			}
+			errorInfo.ErrCode = common.CCErrCommParamsNeedSet
+			return errorInfo
 		}
 		return errors.RawErrorInfo{}
 	}
 	arrayOpt, err := ParseArrayOption(attribute.Option)
 	if err != nil {
-		return errors.RawErrorInfo{
-			ErrCode: common.CCErrCommParamsIsInvalid,
-			Args:    []interface{}{err},
-		}
-	}
-	errorInfo := errors.RawErrorInfo{
-		ErrCode: common.CCErrCommParamsInvalid,
-		Args:    nil,
+		errorInfo.Args = []interface{}{err}
+		return errorInfo
 	}
+
 	itemType, _ := common.IsFieldTypeArray(attribute.PropertyType)
 	switch itemType {
 	case common.FieldTypeBool, common.FieldTypeTime, common.FieldTypeDate:
@@ -1013,37 +1009,7 @@ func (attribute *Attribute) validArray(ctx context.Context, val interface{}, key
 			return errorInfo
 		}
 	case common.FieldTypeSingleChar:
-		value, err := validArrayItem[string](itemType, val)
-		if err != nil {
-			blog.Errorf("array params %s not valid,value: %v, option:%#v,err:%v,rid: %s", key, val, attribute.Option, err, rid)
-			errorInfo.Args = []any{attribute.Option, err}
-			return errorInfo
-		}
-		strReg, err := regexp.Compile(arrayOpt.CharOption)
-		if err != nil {
-			blog.Errorf(`regexp "%s" invalid, err: %v, rid: %s`, arrayOpt, err, rid)
-			return errors.RawErrorInfo{
-				ErrCode: common.CCErrCommParamsIsInvalid,
-				Args:    []interface{}{arrayOpt},
-			}
-		}
-		for _, v := range value {
-			if len(v) > common.FieldTypeSingleLenChar {
-				blog.Errorf("params over length %d, rid: %s", common.FieldTypeSingleLenChar, rid)
-				return errors.RawErrorInfo{
-					ErrCode: common.CCErrCommOverLimit,
-					Args:    []interface{}{key},
-				}
-			}
-			if !strReg.MatchString(v) {
-				blog.Errorf(`params "%s" not match regexp "%s", rid: %s`, val, arrayOpt, rid)
-				return errors.RawErrorInfo{
-					ErrCode: common.CCErrFieldRegValidFailed,
-					Args:    []interface{}{key},
-				}
-			}
-		}
-
+		return attribute.validArrayString(itemType, val, key, rid, arrayOpt)
 	case common.FieldTypeInt:
 		result, err := validArrayItem[int64](itemType, val)
 		if err != nil {
@@ -1061,7 +1027,8 @@ func (attribute *Attribute) validArray(ctx context.Context, val interface{}, key
 	case common.FieldTypeFloat:
 		result, err := validArrayItem[float64](itemType, val)
 		if err != nil {
-			blog.Errorf("array params %s not valid,value:%v,option:%#v,err:%v, rid: %s", key, val, arrayOpt.FloatOption, err, rid)
+			blog.Errorf("array params %s not valid,value:%v,option:%#v,err:%v, rid: %s", key, val,
+				arrayOpt.FloatOption, err, rid)
 			errorInfo.Args = []any{arrayOpt.FloatOption, err}
 			return errorInfo
 		}
@@ -1080,6 +1047,40 @@ func (attribute *Attribute) validArray(ctx context.Context, val interface{}, key
 	return errors.RawErrorInfo{}
 }
 
+func (attribute *Attribute) validArrayString(itemType string, val interface{}, key string,
+	rid string, arrayOpt ArrayOption) errors.RawErrorInfo {
+
+	errorInfo := errors.RawErrorInfo{
+		ErrCode: common.CCErrCommParamsInvalid,
+		Args:    []interface{}{key},
+	}
+	value, err := validArrayItem[string](itemType, val)
+	if err != nil {
+		blog.Errorf("array params %s not valid,value: %v, option:%#v,err:%v,rid: %s", key, val, attribute.Option, err, rid)
+		errorInfo.Args = []any{attribute.Option, err}
+		return errorInfo
+	}
+	strReg, err := regexp.Compile(arrayOpt.CharOption)
+	if err != nil {
+		blog.Errorf(`regexp "%s" invalid, err: %v, rid: %s`, arrayOpt, err, rid)
+		errorInfo.Args = []interface{}{arrayOpt}
+		return errorInfo
+	}
+	for _, v := range value {
+		if len(v) > common.FieldTypeSingleLenChar {
+			blog.Errorf("params over length %d, rid: %s", common.FieldTypeSingleLenChar, rid)
+			errorInfo.ErrCode = common.CCErrCommOverLimit
+			return errorInfo
+		}
+		if !strReg.MatchString(v) {
+			blog.Errorf(`params "%s" not match regexp "%s", rid: %s`, val, arrayOpt, rid)
+			errorInfo.ErrCode = common.CCErrFieldRegValidFailed
+			return errorInfo
+		}
+	}
+	return errors.RawErrorInfo{}
+}
+
 // validOrganization valid object attribute that is organization type
 func (attribute *Attribute) validOrganization(ctx context.Context, val interface{}, key string) errors.RawErrorInfo {
 	rid := util.ExtractRequestIDFromContext(ctx)