[users] rename get method

Author: capcom6

internal/sms-gateway/handlers/middlewares/jwtauth/jwtauth.go

@@ -26,7 +26,7 @@ func NewJWT(jwtSvc jwt.Service, usersSvc *users.Service) fiber.Handler {
 			return fiber.ErrUnauthorized
 		}
 
-		user, err := usersSvc.GetByUsername(claims.UserID)
+		user, err := usersSvc.GetByID(claims.UserID)
 		if err != nil {
 			if !errors.Is(err, users.ErrNotFound) {
 				return fiber.ErrInternalServerError

internal/sms-gateway/modules/auth/service.go

@@ -129,7 +129,7 @@ func (s *Service) AuthorizeUserByCode(code string) (*users.User, error) {
 		return nil, err
 	}
 
-	user, err := s.usersSvc.GetByUsername(userID)
+	user, err := s.usersSvc.GetByID(userID)
 	if err != nil {
 		return nil, fmt.Errorf("failed to get user: %w", err)
 	}

internal/sms-gateway/users/repository.go

@@ -4,6 +4,7 @@ import (
 	"errors"
 	"fmt"
 
+	"github.com/android-sms-gateway/server/pkg/mysql"
 	"gorm.io/gorm"
 )
 
@@ -45,6 +46,10 @@ func (r *repository) GetByID(id string) (*userModel, error) {
 
 func (r *repository) Insert(user *userModel) error {
 	if err := r.db.Create(user).Error; err != nil {
+		if mysql.IsDuplicateKeyViolation(err) {
+			return fmt.Errorf("%w: %w", ErrExists, err)
+		}
+
 		return fmt.Errorf("can't create user: %w", err)
 	}
 

internal/sms-gateway/users/service.go

@@ -33,15 +33,6 @@ func NewService(
 }
 
 func (s *Service) Create(username, password string) (*User, error) {
-	exists, err := s.users.Exists(username)
-	if err != nil {
-		return nil, err
-	}
-
-	if exists {
-		return nil, fmt.Errorf("%w: %s", ErrExists, username)
-	}
-
 	passwordHash, err := crypto.MakeBCryptHash(password)
 	if err != nil {
 		return nil, fmt.Errorf("failed to hash password: %w", err)
@@ -59,8 +50,8 @@ func (s *Service) Create(username, password string) (*User, error) {
 	return newUser(user), nil
 }
 
-func (s *Service) GetByUsername(username string) (*User, error) {
-	user, err := s.users.GetByID(username)
+func (s *Service) GetByID(id string) (*User, error) {
+	user, err := s.users.GetByID(id)
 	if err != nil {
 		return nil, err
 	}