Merge pull request #30 from voltgizerz/felix_11_improvement_refactor_…

…code_core

Refactor core code for auth

cmd/main.go

@@ -53,8 +53,8 @@ func main() {
 	menuRepo := repository.NewMenuRepository(repoOpts)
 
 	// Initialize Services
-	userService := service.NewUserService(interactor.UserService{
-		AuthService:    authJWT,
+	authService := service.NewAuthService(interactor.AuthService{
+		JWTService:     authJWT,
 		UserRepository: userRepo,
 	})
 
@@ -63,8 +63,8 @@ func main() {
 	})
 
 	// Initialize Handlers
-	authHandler := handler.NewAuthHandler(interactor.UserHandler{
-		UserService: userService,
+	authHandler := handler.NewAuthHandler(interactor.AuthHandler{
+		AuthService: authService,
 	})
 
 	menuHandler := handler.NewMenuHandler(interactor.MenuHandler{

internal/app/api/handler/auth_handler.go

@@ -15,12 +15,12 @@ import (
 )
 
 type AuthHandler struct {
-	userService ports.IUserService
+	authService ports.IAuthService
 }
 
-func NewAuthHandler(i interactor.UserHandler) *AuthHandler {
+func NewAuthHandler(i interactor.AuthHandler) *AuthHandler {
 	return &AuthHandler{
-		userService: i.UserService,
+		authService: i.AuthService,
 	}
 }
 
@@ -42,7 +42,7 @@ func (h *AuthHandler) Login(c fiber.Ctx) error {
 		return SendErrorResp(c, fiber.StatusBadRequest, err.Error())
 	}
 
-	userLoginData, err := h.userService.Login(ctx, req.Username, req.Password)
+	dataLogin, err := h.authService.Login(ctx, req.Username, req.Password)
 	if err != nil {
 		if err == sql.ErrNoRows {
 			return SendErrorResp(c, fiber.StatusUnauthorized, constants.ErrMsgUsernameNotFound)
@@ -51,7 +51,7 @@ func (h *AuthHandler) Login(c fiber.Ctx) error {
 		return SendErrorResp(c, fiber.StatusUnauthorized, constants.ErrMsgInvalidUsernameOrPassword)
 	}
 
-	return SendSuccessResp(c, fiber.StatusOK, "Success", userLoginData)
+	return SendSuccessResp(c, fiber.StatusOK, "Success", dataLogin)
 }
 
 func (h *AuthHandler) Register(c fiber.Ctx) error {
@@ -64,6 +64,7 @@ func (h *AuthHandler) Register(c fiber.Ctx) error {
 	if err != nil {
 		return SendErrorResp(c, fiber.StatusBadRequest, "Invalid request body.")
 	}
+
 
 	err = validator.New().StructCtx(ctx, req)
 	if err != nil {
@@ -83,7 +84,7 @@ func (h *AuthHandler) Register(c fiber.Ctx) error {
 		Username: req.Username,
 	}
 
-	result, err := h.userService.Register(ctx, *userData)
+	result, err := h.authService.Register(ctx, *userData)
 	if err != nil {
 		return SendErrorResp(c, fiber.StatusBadRequest, err.Error())
 	}

internal/app/api/handler/auth_handler_test.go

@@ -3,71 +3,54 @@ package handler
 import (
 	"testing"
 
+	"github.com/bytedance/sonic"
 	"github.com/gofiber/fiber/v3"
-)
-
-// func TestUserHandler_Login(t *testing.T) {
-// 	app := fiber.New()
-// 	mockCtx := app.AcquireCtx(&fasthttp.RequestCtx{})
-// 	mockCtx.Request().SetBodyString(`{"username":"user","password":"password"}`)
-
-// 	type args struct {
-// 		c fiber.Ctx
-// 	}
-// 	tests := []struct {
-// 		name     string
-// 		args     args
-// 		wantErr  bool
-// 		wantCode int
-// 		setup    func(mockObj *MockObject)
-// 	}{{
-// 		name: "SUCCESS - Login",
-// 		args: args{c: mockCtx},
-// 		setup: func(mockObj *MockObject) {
-// 		},
-// 		wantCode: fiber.StatusOK,
-// 	}}
-// 	for _, tt := range tests {
-// 		ctrl, mockObj := NewMock(t)
-// 		if tt.setup != nil {
-// 			tt.setup(mockObj)
-// 		}
-// 		defer ctrl.Finish()
+	"github.com/valyala/fasthttp"
 
-// 		authHandler := &AuthHandler{
-// 			userService: mockObj.MockUserService,
-// 		}
-
-// 		t.Run(tt.name, func(t *testing.T) {
-// 			if err := authHandler.Login(tt.args.c); (err != nil) != tt.wantErr {
-// 				t.Errorf("AuthHandler.Login() error = %v, wantErr %v", err, tt.wantErr)
-// 			}
-
-// 			var responseBody successResponse
-// 			err := json.Unmarshal(tt.args.c.Response().Body(), &responseBody)
-// 			require.NoError(t, err)
-// 			logger.Log.Println(responseBody)
-// 			assert.Equal(t, responseBody.Code, tt.wantCode)
-// 			assert.True(t, gock.IsDone())
-// 		})
-// 	}
-// }
+	"github.com/voltgizerz/POS-restaurant/internal/app/constants"
+	"github.com/voltgizerz/POS-restaurant/internal/app/entity"
+)
 
 func TestAuthHandler_Login(t *testing.T) {
-	type args struct {
-		c fiber.Ctx
-	}
+	app := fiber.New()
+
 	tests := []struct {
 		name    string
 		h       *AuthHandler
-		args    args
 		wantErr bool
+		setup   func(mockObj *MockObject) fiber.Ctx
 	}{
-		// TODO: Add test cases.
+		{
+			name:    "SUCCESS - Login",
+			wantErr: false,
+			setup: func(mockObj *MockObject) fiber.Ctx {
+				mockCtx := app.AcquireCtx(&fasthttp.RequestCtx{})
+				mockCtx.Locals(constants.CTXKeyRequestID, "mock-req-id")
+
+				data, _ := sonic.Marshal(entity.LoginRequest{
+					Username: "fELIX",
+					Password: "fELIX",
+				})
+				mockCtx.Request().SetBodyString(string(data))
+
+				// mockObj.MockAuthService.EXPECT().Login(gomock.Any(), gomock.Any(), gomock.Any()).
+				// 	Return(&entity.LoginResponse{}, nil).Times(1)
+				return mockCtx
+			},
+		},
 	}
 	for _, tt := range tests {
+		ctrl, mockObj := NewMock(t)
+		defer ctrl.Finish()
+
+		authHandler := &AuthHandler{
+			authService: mockObj.MockAuthService,
+		}
+
+		c := tt.setup(mockObj)
+
 		t.Run(tt.name, func(t *testing.T) {
-			if err := tt.h.Login(tt.args.c); (err != nil) != tt.wantErr {
+			if err := authHandler.Login(c); (err != nil) != tt.wantErr {
 				t.Errorf("AuthHandler.Login() error = %v, wantErr %v", err, tt.wantErr)
 			}
 		})

internal/app/api/handler/init_test.go

@@ -20,21 +20,21 @@ func TestMain(m *testing.M) {
 
 type MockObject struct {
 	MockUserRepo    *mocks.MockIUserRepository
-	MockAuthService *mocks.MockIAuth
-	MockUserService *mocks.MockIUserService
+	MockJWTService  *mocks.MockIJWTAuth
+	MockAuthService *mocks.MockIAuthService
 }
 
 func NewMock(t *testing.T) (*gomock.Controller, *MockObject) {
 	setTestENV()
 	ctrl := gomock.NewController(t)
 	mockUserRepo := mocks.NewMockIUserRepository(ctrl)
-	mockAuthService := mocks.NewMockIAuth(ctrl)
-	mockUserService := mocks.NewMockIUserService(ctrl)
+	mockJWTService := mocks.NewMockIJWTAuth(ctrl)
+	mockAuthService := mocks.NewMockIAuthService(ctrl)
 
 	mockObj := &MockObject{
 		MockUserRepo:    mockUserRepo,
+		MockJWTService:  mockJWTService,
 		MockAuthService: mockAuthService,
-		MockUserService: mockUserService,
 	}
 
 	return ctrl, mockObj

internal/app/api/middleware/jwt_auth.go

@@ -18,10 +18,10 @@ const (
 )
 
 type JWTAuth struct {
-	AuthService ports.IAuth
+	AuthService ports.IJWTAuth
 }
 
-func NewJWTAuthMiddleware(authService ports.IAuth) JWTAuth {
+func NewJWTAuthMiddleware(authService ports.IJWTAuth) JWTAuth {
 	return JWTAuth{
 		AuthService: authService,
 	}

internal/app/auth/jwt.go

@@ -21,7 +21,7 @@ type AuthJWT struct {
 	ExpireDuration int
 }
 
-func NewAuthJWT(secretKey string) ports.IAuth {
+func NewAuthJWT(secretKey string) ports.IJWTAuth {
 	return &AuthJWT{
 		SecretKey:      secretKey,
 		ExpireDuration: expireDurationJWT,

internal/app/interactor/interactor.go

@@ -11,17 +11,17 @@ type APInteractor struct {
 	MenuHandler ports.IMenuHandler
 }
 
-type UserHandler struct {
-	UserService ports.IUserService
+type AuthHandler struct {
+	AuthService ports.IAuthService
 }
 
-type MenuHandler struct {
-	MenuService ports.IMenuService
+type AuthService struct {
+	JWTService     ports.IJWTAuth
+	UserRepository ports.IUserRepository
 }
 
-type UserService struct {
-	AuthService    ports.IAuth
-	UserRepository ports.IUserRepository
+type MenuHandler struct {
+	MenuService ports.IMenuService
 }
 
 type MenuService struct {