Merge pull request #14 from DoWithLogic/fix/fix-endpoint-and-unit-test

martinyonatann · web-flow · commit 4282e86d75fa · 2023-10-17T22:19:28.000+07:00
fix: fix endpoint and unit test
diff --git a/config/config-local.yaml.example b/config/config-local.yaml.example
@@ -17,4 +17,5 @@ database:
 
 authentication:
   key: DoWithLogic!@#
-  secret_key: s3cr#tK3y!@#
+  secret_key: s3cr#tK3y!@#v001
+  salt_key: s4ltK3y!@#ddv001
diff --git a/internal/users/delivery/http/v1/handler.go b/internal/users/delivery/http/v1/handler.go
@@ -2,13 +2,10 @@ package v1
 
 import (
 	"context"
-	"errors"
 	"net/http"
-	"strconv"
 	"time"
 
 	"github.com/DoWithLogic/golang-clean-architecture/internal/users/dtos"
-	"github.com/DoWithLogic/golang-clean-architecture/internal/users/entities"
 	usecases "github.com/DoWithLogic/golang-clean-architecture/internal/users/usecase"
 	"github.com/DoWithLogic/golang-clean-architecture/pkg/middleware"
 	"github.com/DoWithLogic/golang-clean-architecture/pkg/otel/zerolog"
@@ -36,10 +33,6 @@ const (
 	BooleanTextFalse = "false"
 )
 
-var (
-	ErrInvalidIsActive = errors.New("invalid is_active")
-)
-
 func NewHandlers(uc usecases.Usecase, log *zerolog.Logger) Handlers {
 	return &handlers{uc, log}
 }
@@ -121,18 +114,20 @@ func (h *handlers) UserDetail(c echo.Context) error {
 func (h *handlers) UpdateUser(c echo.Context) error {
 	var (
 		ctx, cancel = context.WithTimeout(c.Request().Context(), time.Duration(30*time.Second))
+		identity    = c.Get("identity").(*middleware.CustomClaims)
 		request     dtos.UpdateUserRequest
 	)
 	defer cancel()
 
-	request.UserID = c.Get("identity").(entities.Identity).UserID
-
 	if err := c.Bind(&request); err != nil {
 		h.log.Z().Err(err).Msg("[handlers]UpdateUser.Bind")
 
 		return c.JSON(http.StatusBadRequest, response.NewResponseError(http.StatusBadRequest, response.MsgFailed, err.Error()))
 	}
 
+	request.UserID = identity.UserID
+	request.UpdateBy = identity.Email
+
 	if err := request.Validate(); err != nil {
 		h.log.Z().Err(err).Msg("[handlers]UpdateUser.Validate")
 
@@ -149,38 +144,21 @@ func (h *handlers) UpdateUser(c echo.Context) error {
 func (h *handlers) UpdateUserStatus(c echo.Context) error {
 	var (
 		ctx, cancel = context.WithTimeout(c.Request().Context(), time.Duration(30*time.Second))
-		payload     dtos.UpdateUserStatusPayload
+		identity    = c.Get("identity").(*middleware.CustomClaims)
+		request     = dtos.UpdateUserStatusRequest{UserID: identity.UserID, UpdateBy: identity.Email}
 	)
 	defer cancel()
 
-	userID, err := strconv.ParseInt(c.Param("id"), 10, 64)
-	if err != nil {
-		h.log.Z().Err(err).Msg("[handlers]UpdateUser.ParseParam")
-
-		return c.JSON(http.StatusBadRequest, response.NewResponseError(
-			http.StatusBadRequest,
-			response.MsgFailed,
-			err.Error()),
-		)
-	}
-
-	switch c.QueryParam("is_active") {
-	case BooleanTextFalse:
-		payload.IsActive = false
-	case BooleanTextTrue:
-		payload.IsActive = true
-	default:
-		return c.JSON(http.StatusBadRequest, response.NewResponseError(http.StatusBadRequest, response.MsgFailed, ErrInvalidIsActive.Error()))
+	if err := c.Bind(&request); err != nil {
+		return c.JSON(http.StatusBadRequest, response.NewResponseError(http.StatusBadRequest, response.MsgFailed, err.Error()))
 	}
 
-	argsUpdateUserStatus := entities.UpdateUserStatus{
-		UserID:   userID,
-		IsActive: payload.IsActive,
+	if err := request.Validate(); err != nil {
+		return c.JSON(http.StatusBadRequest, response.NewResponseError(http.StatusBadRequest, response.MsgFailed, err.Error()))
 	}
 
-	err = h.uc.UpdateStatus(ctx, argsUpdateUserStatus)
-	if err != nil {
-		return c.JSON(http.StatusBadRequest, response.NewResponseError(http.StatusInternalServerError, response.MsgFailed, err.Error()))
+	if err := h.uc.UpdateStatus(ctx, request); err != nil {
+		return c.JSON(http.StatusInternalServerError, response.NewResponseError(http.StatusInternalServerError, response.MsgFailed, err.Error()))
 	}
 
 	return c.JSON(http.StatusOK, response.NewResponse(http.StatusOK, response.MsgSuccess, nil))
diff --git a/internal/users/delivery/http/v1/route.go b/internal/users/delivery/http/v1/route.go
@@ -11,6 +11,6 @@ func UserPrivateRoute(version *echo.Group, h Handlers, cfg config.Config) {
 	users.POST("", h.CreateUser)
 	users.POST("/login", h.Login)
 	users.GET("/detail", h.UserDetail, middleware.AuthorizeJWT(cfg))
-	users.PATCH("/:id", h.UpdateUser, middleware.AuthorizeJWT(cfg))
-	users.PUT("/:id", h.UpdateUserStatus, middleware.AuthorizeJWT(cfg))
+	users.PATCH("/update", h.UpdateUser, middleware.AuthorizeJWT(cfg))
+	users.PUT("/update/status", h.UpdateUserStatus, middleware.AuthorizeJWT(cfg))
 }
diff --git a/internal/users/dtos/user_update.go b/internal/users/dtos/user_update.go
@@ -3,6 +3,7 @@ package dtos
 import (
 	"github.com/DoWithLogic/golang-clean-architecture/pkg/apperror"
 	"github.com/DoWithLogic/golang-clean-architecture/pkg/constant"
+	"github.com/invopop/validation"
 )
 
 type UpdateUserRequest struct {
@@ -12,6 +13,7 @@ type UpdateUserRequest struct {
 	UserType    string `json:"user_type"`
 	Email       string `json:"email"`
 	Password    string `json:"password"`
+	UpdateBy    string `json:"-"`
 }
 
 var ()
@@ -21,5 +23,8 @@ func (cup UpdateUserRequest) Validate() error {
 		return apperror.ErrInvalidUserType
 	}
 
-	return nil
+	return validation.ValidateStruct(&cup,
+		validation.Field(&cup.UserID, validation.NotNil),
+		validation.Field(&cup.UpdateBy, validation.NotNil),
+	)
 }
diff --git a/internal/users/dtos/user_update_status.go b/internal/users/dtos/user_update_status.go
@@ -1,6 +1,17 @@
 package dtos
 
-type UpdateUserStatusPayload struct {
-	UserID   int64
-	IsActive bool
+import "github.com/invopop/validation"
+
+type UpdateUserStatusRequest struct {
+	UserID   int64  `json:"-"`
+	Status   int    `json:"status"`
+	UpdateBy string `json:"-"`
+}
+
+func (ussp UpdateUserStatusRequest) Validate() error {
+	return validation.ValidateStruct(&ussp,
+		validation.Field(&ussp.UserID, validation.NotNil),
+		validation.Field(&ussp.UpdateBy, validation.NotNil),
+		validation.Field(&ussp.Status, validation.Required),
+	)
 }
diff --git a/internal/users/entities/user_update.go b/internal/users/entities/user_update.go
@@ -8,8 +8,8 @@ import (
 
 type UpdateUsers struct {
 	UserID      int64
-	Fullname    string
 	Email       string
+	Fullname    string
 	Password    string
 	PhoneNumber string
 	UserType    string
@@ -24,6 +24,6 @@ func NewUpdateUsers(data dtos.UpdateUserRequest) UpdateUsers {
 		PhoneNumber: data.PhoneNumber,
 		UserType:    data.UserType,
 		UpdatedAt:   time.Now(),
-		UpdatedBy:   "martin",
+		UpdatedBy:   data.UpdateBy,
 	}
 }
diff --git a/internal/users/entities/user_update_status.go b/internal/users/entities/user_update_status.go
@@ -1,6 +1,11 @@
 package entities
 
-import "time"
+import (
+	"time"
+
+	"github.com/DoWithLogic/golang-clean-architecture/internal/users/dtos"
+	"github.com/DoWithLogic/golang-clean-architecture/pkg/constant"
+)
 
 type UpdateUserStatus struct {
 	UserID    int64
@@ -9,11 +14,11 @@ type UpdateUserStatus struct {
 	UpdatedBy string
 }
 
-func NewUpdateUserStatus(payload UpdateUserStatus) UpdateUserStatus {
+func NewUpdateUserStatus(req dtos.UpdateUserStatusRequest) UpdateUserStatus {
 	return UpdateUserStatus{
-		UserID:    payload.UserID,
-		IsActive:  payload.IsActive,
+		UserID:    req.UserID,
+		IsActive:  constant.MapStatus[req.Status],
 		UpdatedAt: time.Now(),
-		UpdatedBy: "martin",
+		UpdatedBy: req.UpdateBy,
 	}
 }
diff --git a/internal/users/entities/users.go b/internal/users/entities/users.go
@@ -38,6 +38,6 @@ func NewCreateUser(data dtos.CreateUserRequest, cfg config.Config) Users {
 		UserType:    constant.UserTypeRegular,
 		IsActive:    true,
 		CreatedAt:   time.Now(),
-		CreatedBy:   constant.UserSystem,
+		CreatedBy:   "SYSTEM",
 	}
 }
diff --git a/internal/users/repository/repository.go b/internal/users/repository/repository.go
@@ -79,6 +79,7 @@ func (repo *repository) SaveNewUser(ctx context.Context, user entities.Users) (u
 
 func (repo *repository) UpdateUserByID(ctx context.Context, user entities.UpdateUsers) error {
 	args := utils.Array{
+		user.Email, user.Email,
 		user.Fullname, user.Fullname,
 		user.PhoneNumber, user.PhoneNumber,
 		user.UserType, user.UserType,
diff --git a/internal/users/repository/repository_query/users/update.sql b/internal/users/repository/repository_query/users/update.sql
@@ -1,4 +1,5 @@
 UPDATE users SET 
+    email = CASE WHEN ? != '' THEN ? ELSE email END,
     fullname = CASE WHEN ? != '' THEN ? ELSE fullname END,
     phone_number = CASE WHEN ? != '' THEN ? ELSE phone_number END,
     user_type = CASE WHEN ? != '' THEN ? ELSE user_type END,
diff --git a/internal/users/usecase/usecase.go b/internal/users/usecase/usecase.go
@@ -23,7 +23,7 @@ type (
 		Login(ctx context.Context, request dtos.UserLoginRequest) (response dtos.UserLoginResponse, httpCode int, err error)
 		Create(ctx context.Context, payload dtos.CreateUserRequest) (userID int64, httpCode int, err error)
 		PartialUpdate(ctx context.Context, data dtos.UpdateUserRequest) error
-		UpdateStatus(ctx context.Context, req entities.UpdateUserStatus) error
+		UpdateStatus(ctx context.Context, req dtos.UpdateUserStatusRequest) error
 		Detail(ctx context.Context, id int64) (detail dtos.UserDetailResponse, httpCode int, err error)
 	}
 
@@ -44,19 +44,15 @@ func (uc *usecase) Login(ctx context.Context, request dtos.UserLoginRequest) (re
 		return response, http.StatusInternalServerError, err
 	}
 
-	uc.log.Z().Err(nil).Str("decrypted_password", dataLogin.Password).Str("password", request.Password).Msg("[Login]")
-
 	if !strings.EqualFold(utils.Decrypt(dataLogin.Password, uc.cfg), request.Password) {
 		return response, http.StatusUnauthorized, apperror.ErrInvalidPassword
 	}
 
-	expiredAt := time.Now().Add(time.Minute * 15).Unix()
-
 	identityData := middleware.CustomClaims{
 		UserID: dataLogin.UserID,
 		Email:  dataLogin.Email,
 		StandardClaims: jwt.StandardClaims{
-			ExpiresAt: expiredAt,
+			ExpiresAt: time.Now().Add(time.Minute * 15).Unix(),
 		},
 	}
 
@@ -67,7 +63,7 @@ func (uc *usecase) Login(ctx context.Context, request dtos.UserLoginRequest) (re
 
 	response = dtos.UserLoginResponse{
 		AccessToken: token,
-		ExpiredAt:   expiredAt,
+		ExpiredAt:   utils.UnixToDuration(identityData.ExpiresAt),
 	}
 
 	return response, http.StatusOK, nil
@@ -111,7 +107,7 @@ func (uc *usecase) PartialUpdate(ctx context.Context, data dtos.UpdateUserReques
 	})
 }
 
-func (uc *usecase) UpdateStatus(ctx context.Context, req entities.UpdateUserStatus) error {
+func (uc *usecase) UpdateStatus(ctx context.Context, req dtos.UpdateUserStatusRequest) error {
 	_, err := uc.repo.GetUserByID(ctx, req.UserID, entities.LockingOpt{})
 	if err != nil {
 		uc.log.Z().Err(err).Msg("[usecase]UpdateUserStatus.GetUserByID")
diff --git a/internal/users/usecase/usecase_test.go b/internal/users/usecase/usecase_test.go
diff --git a/pkg/apperror/errors.go b/pkg/apperror/errors.go
diff --git a/pkg/constant/constant.go b/pkg/constant/constant.go
diff --git a/pkg/utils/utils.go b/pkg/utils/utils.go

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,6 @@ func UserPrivateRoute(version *echo.Group, h Handlers, cfg config.Config) {`
`11`	`11`	`users.POST("", h.CreateUser)`
`12`	`12`	`users.POST("/login", h.Login)`
`13`	`13`	`users.GET("/detail", h.UserDetail, middleware.AuthorizeJWT(cfg))`
`14`		`- users.PATCH("/:id", h.UpdateUser, middleware.AuthorizeJWT(cfg))`
`15`		`- users.PUT("/:id", h.UpdateUserStatus, middleware.AuthorizeJWT(cfg))`
	`14`	`+ users.PATCH("/update", h.UpdateUser, middleware.AuthorizeJWT(cfg))`
	`15`	`+ users.PUT("/update/status", h.UpdateUserStatus, middleware.AuthorizeJWT(cfg))`
`16`	`16`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@ package dtos`
`3`	`3`	`import (`
`4`	`4`	`"github.com/DoWithLogic/golang-clean-architecture/pkg/apperror"`
`5`	`5`	`"github.com/DoWithLogic/golang-clean-architecture/pkg/constant"`
	`6`	`+ "github.com/invopop/validation"`
`6`	`7`	`)`
`7`	`8`
`8`	`9`	`type UpdateUserRequest struct {`
`@@ -12,6 +13,7 @@ type UpdateUserRequest struct {`
`12`	`13`	UserType string `json:"user_type"`
`13`	`14`	Email string `json:"email"`
`14`	`15`	Password string `json:"password"`
	`16`	+ UpdateBy string `json:"-"`
`15`	`17`	`}`
`16`	`18`
`17`	`19`	`var ()`
`@@ -21,5 +23,8 @@ func (cup UpdateUserRequest) Validate() error {`
`21`	`23`	`return apperror.ErrInvalidUserType`
`22`	`24`	`}`
`23`	`25`
`24`		`- return nil`
	`26`	`+ return validation.ValidateStruct(&cup,`
	`27`	`+ validation.Field(&cup.UserID, validation.NotNil),`
	`28`	`+ validation.Field(&cup.UpdateBy, validation.NotNil),`
	`29`	`+ )`
`25`	`30`	`}`
Original file line number	Diff line number	Diff line change
`@@ -38,6 +38,6 @@ func NewCreateUser(data dtos.CreateUserRequest, cfg config.Config) Users {`
`38`	`38`	`UserType: constant.UserTypeRegular,`
`39`	`39`	`IsActive: true,`
`40`	`40`	`CreatedAt: time.Now(),`
`41`		`- CreatedBy: constant.UserSystem,`
	`41`	`+ CreatedBy: "SYSTEM",`
`42`	`42`	`}`
`43`	`43`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`UPDATE users SET`
	`2`	`+ email = CASE WHEN ? != '' THEN ? ELSE email END,`
`2`	`3`	`fullname = CASE WHEN ? != '' THEN ? ELSE fullname END,`
`3`	`4`	`phone_number = CASE WHEN ? != '' THEN ? ELSE phone_number END,`
`4`	`5`	`user_type = CASE WHEN ? != '' THEN ? ELSE user_type END,`