-
This commit is contained in:
@ -32,8 +32,8 @@ type User struct {
|
||||
Email string `json:"email" validate:"required,email,max=255" db:"email"`
|
||||
FirstName string `json:"first_name" validate:"required,min=1,max=100" db:"first_name"`
|
||||
LastName string `json:"last_name" validate:"required,min=1,max=100" db:"last_name"`
|
||||
DisplayName string `json:"display_name" validate:"omitempty,max=200" db:"display_name"`
|
||||
Avatar string `json:"avatar,omitempty" validate:"omitempty,url,max=500" db:"avatar"`
|
||||
DisplayName *string `json:"display_name,omitempty" validate:"omitempty,max=200" db:"display_name"`
|
||||
Avatar *string `json:"avatar,omitempty" validate:"omitempty,url,max=500" db:"avatar"`
|
||||
Role UserRole `json:"role" validate:"required,oneof=admin user moderator viewer" db:"role"`
|
||||
Status UserStatus `json:"status" validate:"required,oneof=active inactive suspended pending" db:"status"`
|
||||
LastLoginAt *time.Time `json:"last_login_at,omitempty" db:"last_login_at"`
|
||||
@ -73,8 +73,8 @@ type CreateUserRequest struct {
|
||||
Email string `json:"email" validate:"required,email,max=255"`
|
||||
FirstName string `json:"first_name" validate:"required,min=1,max=100"`
|
||||
LastName string `json:"last_name" validate:"required,min=1,max=100"`
|
||||
DisplayName string `json:"display_name,omitempty" validate:"omitempty,max=200"`
|
||||
Avatar string `json:"avatar,omitempty" validate:"omitempty,url,max=500"`
|
||||
DisplayName *string `json:"display_name,omitempty" validate:"omitempty,max=200"`
|
||||
Avatar *string `json:"avatar,omitempty" validate:"omitempty,url,max=500"`
|
||||
Role UserRole `json:"role" validate:"required,oneof=admin user moderator viewer"`
|
||||
Status UserStatus `json:"status" validate:"omitempty,oneof=active inactive suspended pending"`
|
||||
}
|
||||
|
||||
@ -196,10 +196,10 @@ func (s *userService) Update(ctx context.Context, id uuid.UUID, req *domain.Upda
|
||||
existingUser.LastName = *req.LastName
|
||||
}
|
||||
if req.DisplayName != nil {
|
||||
existingUser.DisplayName = *req.DisplayName
|
||||
existingUser.DisplayName = req.DisplayName
|
||||
}
|
||||
if req.Avatar != nil {
|
||||
existingUser.Avatar = *req.Avatar
|
||||
existingUser.Avatar = req.Avatar
|
||||
}
|
||||
if req.Role != nil {
|
||||
existingUser.Role = *req.Role
|
||||
|
||||
Reference in New Issue
Block a user