Alex/GoMembership
1
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases Wiki Activity

add: UserRole for privelige handling

Browse Source
This commit is contained in:
Alex
2024-09-29 21:03:32 +02:00
parent 1ded8bee33
commit 72017c97ff
2 changed files with 20 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
internal/controllers/user_controller.go
View File

@@ -72,7 +72,8 @@ func (uc *UserController) UpdateHandler(c *gin.Context) {
// user.RoleID = existingUser.RoleID
// }
updatedUser, err := uc.Service.UpdateUser(&user)
updatedUser, err := uc.Service.UpdateUser(&user, userRole)
if err != nil {
switch err {
case errors.ErrUserNotFound:

28
internal/services/user_service.go
View File

@@ -31,9 +31,10 @@ type UserService struct {
Repo repositories.UserRepositoryInterface
}
func (service *UserService) UpdateUser(user *models.User) (*models.User, error) {
func (service *UserService) UpdateUser(user *models.User, userRole int8) (*models.User, error) {
if err := validateUserData(user); err != nil {
if err := validateUserData(user, userRole); err != nil {
logger.Error.Printf("Failed to validate user data: %v", err)
return nil, errors.ErrInvalidUserData
}
@@ -58,8 +59,8 @@ func (service *UserService) UpdateUser(user *models.User) (*models.User, error)
return updatedUser, nil
}
if err := validateUserData(user); err != nil {
func (service *UserService) RegisterUser(user *models.User) (uint, string, error) {
if err := validateUserData(user, user.RoleID); err != nil {
return http.StatusNotAcceptable, "", err
}
@@ -68,7 +69,6 @@ func (service *UserService) RegisterUser(user *models.User) (uint, string, error
user.Status = constants.UnverifiedStatus
user.CreatedAt = time.Now()
user.UpdatedAt = time.Now()
id, err := service.Repo.CreateUser(user)
if err != nil && strings.Contains(err.Error(), "UNIQUE constraint failed") {
@@ -150,15 +150,23 @@ func (service *UserService) VerifyUser(token *string) (*models.User, error) {
return user, nil
}
func validateUserData(user *models.User) error {
func validateUserData(user *models.User, userRole int8) error {
validate := validator.New()
validate.RegisterValidation("age", utils.AgeValidator)
validate.RegisterValidation("bic", utils.BICValidator)
validate.RegisterValidation("iban", utils.IBANValidator)
validate.RegisterValidation("subscriptionModel", utils.SubscriptionModelValidator)
validate.RegisterValidation("safe_content", utils.ValidateSafeContent)
validate.RegisterValidation("membershipField", utils.ValidateRequiredMembershipField)
if userRole == constants.Roles.Admin {
validate.RegisterValidation("membershipField", utils.ValidateToTrue)
validate.RegisterValidation("age", utils.ValidateToTrue)
validate.RegisterValidation("bic", utils.ValidateToTrue)
validate.RegisterValidation("subscriptionModel", utils.ValidateToTrue)
validate.RegisterValidation("iban", utils.ValidateToTrue)
} else {
validate.RegisterValidation("membershipField", utils.ValidateRequiredMembershipField)
validate.RegisterValidation("age", utils.AgeValidator)
validate.RegisterValidation("bic", utils.BICValidator)
validate.RegisterValidation("subscriptionModel", utils.SubscriptionModelValidator)
validate.RegisterValidation("iban", utils.IBANValidator)
}
return validate.Struct(user)
}