opensource/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2026-09-24 16:05:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor: Move validateCustomProfileAttributesField to Validate method on CPAField struct

Browse Source
This commit is contained in:
Julien Tant (aider)
2025-02-25 10:52:47 -07:00
parent 783e64472c
commit 988177024c
2 changed files with 39 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/channels/app/custom_profile_attributes.go
+7 -31
View File
@@ -92,11 +92,16 @@ func (a *App) CreateCPAField(field *model.CPAField) (*model.PropertyField, *mode
return nil, model.NewAppError("CreateCPAField", "app.custom_profile_attributes.limit_reached.app_error", nil, "", http.StatusUnprocessableEntity).Wrap(err)
}
if appErr := validateCustomProfileAttributesField(field); appErr != nil {
if appErr := field.Validate(); appErr != nil {
return nil, appErr
}
field.GroupID = groupID
if appErr := field.Validate(); appErr != nil {
return nil, appErr
}
newField, err := a.Srv().propertyService.CreatePropertyField(field.ToPropertyField())
if err != nil {
var appErr *model.AppError
@@ -131,7 +136,7 @@ func (a *App) PatchCPAField(fieldID string, patch *model.PropertyFieldPatch) (*m
return nil, model.NewAppError("UpdateCPAField", "app.custom_profile_attributes.property_field_conversion.app_error", nil, "", http.StatusInternalServerError).Wrap(err)
}
if appErr := validateCustomProfileAttributesField(cpaField); appErr != nil {
if appErr := cpaField.Validate(); appErr != nil {
return nil, appErr
}
@@ -274,32 +279,3 @@ func (a *App) PatchCPAValues(userID string, fieldValueMap map[string]json.RawMes
return updatedValues, nil
}
func validateCustomProfileAttributesField(field *model.CPAField) *model.AppError {
switch field.Type {
case model.PropertyFieldTypeText:
if valueType := strings.TrimSpace(field.Attrs.ValueType); valueType != "" {
if !model.IsKnownCustomProfilteAttributesValueType(valueType) {
return model.NewAppError("ValidateCPAField", "app.custom_profile_attributes.unknown_value_type.app_error", map[string]any{"ValueType": valueType}, "", http.StatusUnprocessableEntity)
}
field.Attrs.ValueType = valueType
}
case model.PropertyFieldTypeSelect, model.PropertyFieldTypeMultiselect:
options := field.Attrs.Options
if err := options.IsValid(); err != nil {
return model.NewAppError("ValidateCPAField", "app.custom_profile_attributes.invalid_options.app_error", nil, "", http.StatusUnprocessableEntity).Wrap(err)
}
field.Attrs.Options = options
}
visibility := model.CustomProfileAttributesVisibilityDefault
if visibilityAttr := strings.TrimSpace(field.Attrs.Visibility); visibilityAttr != "" {
if !model.IsKnownCustomProfilteAttributesVisibility(visibilityAttr) {
return model.NewAppError("ValidateCPAField", "app.custom_profile_attributes.unknown_visibility.app_error", map[string]any{"Visibility": visibilityAttr}, "", http.StatusUnprocessableEntity)
}
visibility = visibilityAttr
}
field.Attrs.Visibility = visibility
return nil
}
server/public/model/custom_profile_attributes.go
+32
View File
@@ -6,6 +6,8 @@ package model
import (
"encoding/json"
"errors"
"net/http"
"strings"
)
const CustomProfileAttributesPropertyGroupName = "custom_profile_attributes"
@@ -126,6 +128,36 @@ func (c *CPAField) ToPropertyField() *PropertyField {
return &pf
}
func (c *CPAField) Validate() *AppError {
switch c.Type {
case PropertyFieldTypeText:
if valueType := strings.TrimSpace(c.Attrs.ValueType); valueType != "" {
if !IsKnownCustomProfilteAttributesValueType(valueType) {
return NewAppError("ValidateCPAField", "app.custom_profile_attributes.unknown_value_type.app_error", map[string]any{"ValueType": valueType}, "", http.StatusUnprocessableEntity)
}
c.Attrs.ValueType = valueType
}
case PropertyFieldTypeSelect, PropertyFieldTypeMultiselect:
options := c.Attrs.Options
if err := options.IsValid(); err != nil {
return NewAppError("ValidateCPAField", "app.custom_profile_attributes.invalid_options.app_error", nil, "", http.StatusUnprocessableEntity).Wrap(err)
}
c.Attrs.Options = options
}
visibility := CustomProfileAttributesVisibilityDefault
if visibilityAttr := strings.TrimSpace(c.Attrs.Visibility); visibilityAttr != "" {
if !IsKnownCustomProfilteAttributesVisibility(visibilityAttr) {
return NewAppError("ValidateCPAField", "app.custom_profile_attributes.unknown_visibility.app_error", map[string]any{"Visibility": visibilityAttr}, "", http.StatusUnprocessableEntity)
}
visibility = visibilityAttr
}
c.Attrs.Visibility = visibility
return nil
}
func NewCPAFieldFromPropertyField(pf *PropertyField) (*CPAField, error) {
attrsJSON, err := json.Marshal(pf.Attrs)
if err != nil {