diff --git a/internal/app/api/handler/request.go b/internal/app/api/handler/request.go index f73d901..7bfc875 100644 --- a/internal/app/api/handler/request.go +++ b/internal/app/api/handler/request.go @@ -10,7 +10,7 @@ type ( Username string `json:"username"` Password string `json:"password"` Name string `json:"name"` - ConfirmPassword string `json:"confirmPassword"` + ConfirmPassword string `json:"confirm_password"` Email string `json:"email"` } ) diff --git a/internal/app/api/handler/user_handler.go b/internal/app/api/handler/user_handler.go index 2c02e6e..e702856 100644 --- a/internal/app/api/handler/user_handler.go +++ b/internal/app/api/handler/user_handler.go @@ -62,7 +62,7 @@ func (h *UserHandler) Register(c fiber.Ctx) error { return sendErrorResp(c, fiber.StatusBadRequest, "Password Mismatch") } - userData := &entity.User{ + userData := &entity.UserORM{ Email: req.Email, Password: req.Password, Name: req.Name, @@ -70,9 +70,8 @@ func (h *UserHandler) Register(c fiber.Ctx) error { } result, err := h.userService.Register(ctx, *userData) - if result != -1 { - return sendSuccessResp(c, fiber.StatusOK, "Account Added Succesfully.", result) - } else { + if err != nil { return sendErrorResp(c, fiber.StatusBadRequest, err.Error()) } + return sendSuccessResp(c, fiber.StatusOK, "Account Added Succesfully.", result) } diff --git a/internal/app/ports/user_ports.go b/internal/app/ports/user_ports.go index c712789..a7be016 100644 --- a/internal/app/ports/user_ports.go +++ b/internal/app/ports/user_ports.go @@ -9,12 +9,12 @@ import ( type IUserRepository interface { GetUserByUsernameAndPassword(ctx context.Context, username string, hashPassword string) (*entity.UserORM, error) - RegisterUser(ctx context.Context, userData entity.User) (int64, error) + RegisterUser(ctx context.Context, userData entity.UserORM) (int64, error) } type IUserService interface { Login(ctx context.Context, username string, password string) (*entity.LoginResponse, error) - Register(ctx context.Context, userData entity.User) (int64, error) + Register(ctx context.Context, userData entity.UserORM) (int64, error) } type IUserHandler interface { diff --git a/internal/app/repository/user_repository.go b/internal/app/repository/user_repository.go index 756332a..e9b1ce7 100644 --- a/internal/app/repository/user_repository.go +++ b/internal/app/repository/user_repository.go @@ -42,7 +42,7 @@ func (r *UserRepository) GetUserByUsernameAndPassword(ctx context.Context, usern return &user, nil } -func (r *UserRepository) RegisterUser(ctx context.Context, userData entity.User) (int64, error) { +func (r *UserRepository) RegisterUser(ctx context.Context, userData entity.UserORM) (int64, error) { span, ctx := opentracing.StartSpanFromContext(ctx, "repo.UserRepository.RegisterUser") defer span.Finish() @@ -59,7 +59,7 @@ func (r *UserRepository) RegisterUser(ctx context.Context, userData entity.User) "email": userData.Email, "error": err, }).Error("[UserRepository(RegisterUser)] " + err.Error()) - return -1, err + return 0, err } } @@ -69,7 +69,7 @@ func (r *UserRepository) RegisterUser(ctx context.Context, userData entity.User) "email": userData.Email, "error": err, }).Error("[UserRepository(RegisterUser)] " + err.Error()) - return -1, err + return 0, err } return lastid, nil diff --git a/internal/app/service/user_service.go b/internal/app/service/user_service.go index fb2f639..88642e7 100644 --- a/internal/app/service/user_service.go +++ b/internal/app/service/user_service.go @@ -69,22 +69,22 @@ func (s *UserService) Login(ctx context.Context, username string, password strin return resp, nil } -func (s *UserService) Register(ctx context.Context, userData entity.User) (int64, error) { +func (s *UserService) Register(ctx context.Context, userData entity.UserORM) (int64, error) { span, ctx := opentracing.StartSpanFromContext(ctx, "service.UserService.Register") defer span.Finish() passwordhasing, err := utils.HashPassword(userData.Password) if err != nil { logger.LogStdErr.WithFields(logrus.Fields{ - "email": userData.Email, - "error": err, + "username": userData.Username, + "error": err, }).Error("[UserService] error on UserService Register") } userData.Password = passwordhasing result, err := s.userRepository.RegisterUser(ctx, userData) - if result == -1 { - return -1, err + if err != nil { + return 0, err } return result, nil