Feature/user not found error

internal/models/errors.go

@@ -0,0 +1,5 @@
+package models
+
+import "errors"
+
+var ErrUserNotFound = errors.New("user not found")

internal/repositories/user_repository.go

@@ -1,23 +1,31 @@
 package repositories
 
 import (
+	"context"
+	"errors"
+	"fmt"
+
 	"github.com/nix-united/golang-echo-boilerplate/internal/models"
 
 	"gorm.io/gorm"
 )
 
-type UserRepositoryQ interface {
-	GetUserByEmail(user *models.User, email string)
-}
-
 type UserRepository struct {
-	DB *gorm.DB
+	db *gorm.DB
 }
 
 func NewUserRepository(db *gorm.DB) *UserRepository {
-	return &UserRepository{DB: db}
+	return &UserRepository{db: db}
 }
 
-func (userRepository *UserRepository) GetUserByEmail(user *models.User, email string) {
-	userRepository.DB.Where("email = ?", email).Find(user)
+func (r *UserRepository) GetUserByEmail(ctx context.Context, email string) (models.User, error) {
+	var user models.User
+	err := r.db.WithContext(ctx).Where("email = ?", email).Take(&user).Error
+	if errors.Is(err, gorm.ErrRecordNotFound) {
+		return models.User{}, errors.Join(models.ErrUserNotFound, err)
+	} else if err != nil {
+		return models.User{}, fmt.Errorf("execute select user by email query: %w", err)
+	}
+
+	return user, nil
 }

internal/server/handlers/auth_handler.go

@@ -1,6 +1,7 @@
 package handlers
 
 import (
+	"errors"
 	"fmt"
 	"net/http"
 
@@ -47,11 +48,17 @@ func (authHandler *AuthHandler) Login(c echo.Context) error {
 		return responses.ErrorResponse(c, http.StatusBadRequest, "Required fields are empty or not valid")
 	}
 
-	user := models.User{}
 	userRepository := repositories.NewUserRepository(authHandler.server.DB)
-	userRepository.GetUserByEmail(&user, loginRequest.Email)
 
-	if user.ID == 0 || (bcrypt.CompareHashAndPassword([]byte(user.Password), []byte(loginRequest.Password)) != nil) {
+	user, err := userRepository.GetUserByEmail(c.Request().Context(), loginRequest.Email)
+	if errors.Is(err, models.ErrUserNotFound) {
+		return responses.ErrorResponse(c, http.StatusNotFound, "User with such email not found")
+	}
+	if err != nil {
+		return responses.ErrorResponse(c, http.StatusInternalServerError, "Failed to get user by email")
+	}
+
+	if err := bcrypt.CompareHashAndPassword([]byte(user.Password), []byte(loginRequest.Password)); err != nil {
 		return responses.ErrorResponse(c, http.StatusUnauthorized, "Invalid credentials")
 	}
 

internal/server/handlers/register_handler.go

@@ -1,6 +1,7 @@
 package handlers
 
 import (
+	"errors"
 	"net/http"
 
 	"github.com/nix-united/golang-echo-boilerplate/internal/models"
@@ -44,12 +45,14 @@ func (registerHandler *RegisterHandler) Register(c echo.Context) error {
 		return responses.ErrorResponse(c, http.StatusBadRequest, "Required fields are empty or not valid")
 	}
 
-	existUser := models.User{}
 	userRepository := repositories.NewUserRepository(registerHandler.server.DB)
-	userRepository.GetUserByEmail(&existUser, registerRequest.Email)
 
-	if existUser.ID != 0 {
-		return responses.ErrorResponse(c, http.StatusBadRequest, "User already exists")
+	_, err := userRepository.GetUserByEmail(c.Request().Context(), registerRequest.Email)
+	if err != nil && !errors.Is(err, models.ErrUserNotFound) {
+		return responses.ErrorResponse(c, http.StatusInternalServerError, "Failed to check if user with such email exists")
+	}
+	if err == nil {
+		return responses.ErrorResponse(c, http.StatusConflict, "User already exists")
 	}
 
 	userService := user.NewUserService(registerHandler.server.DB)

tests/auth_test.go

@@ -98,8 +98,8 @@ func TestWalkAuth(t *testing.T) {
 			handlerFunc,
 			[]*helpers.QueryMock{&helpers.SelectVersionMock, commonMock},
 			helpers.ExpectedResponse{
-				StatusCode: 401,
-				BodyPart:   "Invalid credentials",
+				StatusCode: 404,
+				BodyPart:   "User with such email not found",
 			},
 		},
 	}

tests/register_test.go

@@ -118,7 +118,7 @@ func TestWalkRegister(t *testing.T) {
 				},
 			},
 			helpers.ExpectedResponse{
-				StatusCode: 400,
+				StatusCode: 409,
 				BodyPart:   "User already exists",
 			},
 		},