add: update handling

internal/services/user_service.go

@@ -8,10 +8,12 @@ import (
 	"GoMembership/internal/models"
 	"GoMembership/internal/repositories"
 	"GoMembership/internal/utils"
+	"GoMembership/pkg/errors"
 	"GoMembership/pkg/logger"
 
 	"github.com/alexedwards/argon2id"
 	"github.com/go-playground/validator/v10"
+	"gorm.io/gorm"
 
 	"time"
 )
@@ -22,50 +24,42 @@ type UserServiceInterface interface {
 	GetUserByID(id int64) (*models.User, error)
 	GetUsers(where map[string]interface{}) (*[]models.User, error)
 	VerifyUser(token *string) (*models.User, error)
+	UpdateUser(user *models.User) (*models.User, error)
 }
 
 type UserService struct {
 	Repo repositories.UserRepositoryInterface
 }
 
-func (service *UserService) RegisterUser(user *models.User) (int64, string, error) {
-	if err := validateRegistrationData(user); err != nil {
-		return http.StatusNotAcceptable, "", err
+func (service *UserService) UpdateUser(user *models.User) (*models.User, error) {
+
+	if err := validateUserData(user); err != nil {
+		return nil, errors.ErrInvalidUserData
 	}
 
-	setPassword(user.Password, user)
+	if user.Password != "" {
+		setPassword(user.Password, user)
+	}
 
-	user.Status = constants.UnverifiedStatus
-	user.CreatedAt = time.Now()
 	user.UpdatedAt = time.Now()
 
-	id, err := service.Repo.CreateUser(user)
+	updatedUser, err := service.Repo.UpdateUser(user)
 
-	if err != nil && strings.Contains(err.Error(), "UNIQUE constraint failed") {
-		return http.StatusConflict, "", err
-	} else if err != nil {
-		return http.StatusInternalServerError, "", err
-	}
-
-	user.ID = id
-
-	token, err := utils.GenerateVerificationToken()
 	if err != nil {
-		return http.StatusInternalServerError, "", err
+		if err == gorm.ErrRecordNotFound {
+			return nil, errors.ErrUserNotFound
+		}
+		if strings.Contains(err.Error(), "UNIQUE constraint failed") {
+			return nil, errors.ErrDuplicateEntry
+		}
+		return nil, err
 	}
 
-	logger.Info.Printf("TOKEN: %v", token)
-
-	_, err = service.Repo.SetVerificationToken(user, &token)
-	if err != nil {
-		return http.StatusInternalServerError, "", err
-	}
-
-	return id, token, nil
+	return updatedUser, nil
 }
 
-func (service *UserService) Update(user *models.User) (int64, string, error) {
-	if err := validateRegistrationData(user); err != nil {
+func (service *UserService) RegisterUser(user *models.User) (int64, string, error) {
+	if err := validateUserData(user); err != nil {
 		return http.StatusNotAcceptable, "", err
 	}
 
@@ -92,17 +86,31 @@ func (service *UserService) Update(user *models.User) (int64, string, error) {
 
 	logger.Info.Printf("TOKEN: %v", token)
 
-	_, err = service.Repo.SetVerificationToken(user, &token)
+	// Check if user is already verified
+	verified, err := service.Repo.IsVerified(&user.ID)
 	if err != nil {
 		return http.StatusInternalServerError, "", err
 	}
+	if verified {
+		return http.StatusAlreadyReported, "", errors.ErrAlreadyVerified
+	}
+
+	// Prepare the Verification record
+	verification := models.Verification{
+		UserID:            user.ID,
+		VerificationToken: token,
+	}
+
+	if _, err = service.Repo.SetVerificationToken(&verification); err != nil {
+		return http.StatusInternalServerError, "", err
+	}
 
 	return id, token, nil
 }
 
 func (service *UserService) GetUserByID(id int64) (*models.User, error) {
 
-	return service.Repo.GetUserByID(id)
+	return service.Repo.GetUserByID(&id)
 }
 
 func (service *UserService) GetUserByEmail(email string) (*models.User, error) {
@@ -114,19 +122,41 @@ func (service *UserService) GetUsers(where map[string]interface{}) (*[]models.Us
 }
 
 func (service *UserService) VerifyUser(token *string) (*models.User, error) {
-	user, err := service.Repo.VerifyUserOfToken(token)
+	verification, err := service.Repo.GetVerificationOfToken(token)
 	if err != nil {
 		return nil, err
 	}
+	// Check if the user is already verified
+	verified, err := service.Repo.IsVerified(&verification.UserID)
+	if err != nil {
+		return nil, err
+	}
+	user, err := service.Repo.GetUserByID(&verification.UserID)
+	if err != nil {
+		return nil, err
+	}
+	if verified {
+		return user, errors.ErrAlreadyVerified
+	}
+	// Update user status to active
+	t := time.Now()
+	verification.EmailVerifiedAt = &t
+
+	user.Status = constants.VerifiedStatus
+	user.Verification = *verification
+	user.ID = verification.UserID
+	service.Repo.UpdateUser(user)
+
 	return user, nil
 }
 
-func validateRegistrationData(user *models.User) error {
+func validateUserData(user *models.User) 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)
 
 	return validate.Struct(user)