Merge pull request #44 from voltgizerz/develop

MASTER 12/07/2024

.github/labeler.yml

@@ -22,7 +22,7 @@ pkg:
 - pkg/**/*
 
 mocks:
-- internal/app/mocks/*
+- internal/mocks/*
 
 changelog:
 - CHANGELOG.md

Makefile

@@ -20,19 +20,19 @@ decrypt-gpg:
 	@gpg -d .env.gpg
 
 mock-gen:
-	@mockgen -source=./internal/app/ports/auth_ports.go -destination=./internal/app/mocks/mocks_auth.go -package=mocks
-	@mockgen -source=./internal/app/ports/user_ports.go -destination=./internal/app/mocks/mocks_user.go -package=mocks
+	@mockgen -source=./internal/core/ports/auth_ports.go -destination=./internal/mocks/mocks_auth.go -package=mocks
+	@mockgen -source=./internal/core/ports/user_ports.go -destination=./internal/mocks/mocks_user.go -package=mocks
 
 changelog-gen:
 	@auto-changelog
 
 # Target to apply migrations
 up:
-	@goose -dir=./database/migrations mysql "root@tcp(localhost:3306)/db_pos?parseTime=true" up
+	@goose -dir=./internal/database/migrations mysql "root@tcp(localhost:3306)/db_pos?parseTime=true" up
 
 # Target to reset migrations (if needed)
 down:
-	@goose -dir=./database/migrations mysql "root@tcp(localhost:3306)/db_pos?parseTime=true" reset
+	@goose -dir=./internal/database/migrations mysql "root@tcp(localhost:3306)/db_pos?parseTime=true" reset
 
 status:
-	@goose -dir=./database/migrations mysql "root@tcp(localhost:3306)/db_pos?parseTime=true" status
+	@goose -dir=./internal/database/migrations mysql "root@tcp(localhost:3306)/db_pos?parseTime=true" status

README.md

@@ -4,9 +4,17 @@ This project provides simple REST APIs for Point of Sale (POS) software.
 ## Built With
 - Go 1.21.3
 - MySQL
-- Fiber
 - JWT Authentication
-- DB Migration Goose
+
+## Frameworks and Library
+- Fiber: HTTP Framework
+- Goose: Database Migrations
+- SQLX: Database ORM
+- Validator V10: Struct Validation
+- Logrus: Application Logging
+- Jaeger: Opentracing
+- Cleanenv: Environment Configuration
+- Mockgen: Mock Generation
 
 ## How to Run the Project
 

cmd/main.go

@@ -4,24 +4,21 @@ import (
 	"context"
 	"os"
 	"os/signal"
-	"sync"
 	"syscall"
 
 	"github.com/voltgizerz/POS-restaurant/config"
-	"github.com/voltgizerz/POS-restaurant/database"
-	"github.com/voltgizerz/POS-restaurant/internal/app/api"
-	"github.com/voltgizerz/POS-restaurant/internal/app/api/handler"
-	"github.com/voltgizerz/POS-restaurant/internal/app/api/middleware"
-	"github.com/voltgizerz/POS-restaurant/internal/app/auth"
-	"github.com/voltgizerz/POS-restaurant/internal/app/interactor"
-	"github.com/voltgizerz/POS-restaurant/internal/app/repository"
-	"github.com/voltgizerz/POS-restaurant/internal/app/service"
+	"github.com/voltgizerz/POS-restaurant/internal/adapters/api"
+	"github.com/voltgizerz/POS-restaurant/internal/adapters/api/handler"
+	"github.com/voltgizerz/POS-restaurant/internal/adapters/api/middleware"
+	"github.com/voltgizerz/POS-restaurant/internal/adapters/auth"
+	"github.com/voltgizerz/POS-restaurant/internal/adapters/repository"
+	"github.com/voltgizerz/POS-restaurant/internal/core/interactor"
+	"github.com/voltgizerz/POS-restaurant/internal/core/service"
+	"github.com/voltgizerz/POS-restaurant/internal/database"
 	"github.com/voltgizerz/POS-restaurant/pkg/jeager"
 	"github.com/voltgizerz/POS-restaurant/pkg/logger"
 )
 
-var wg sync.WaitGroup
-
 func main() {
 	logger.Init()
 
@@ -48,8 +45,8 @@ func main() {
 	}
 
 	// Initialize Repositories
+	txRepo := repository.NewTxRepository(repoOpts)
 	userRepo := repository.NewUserRepository(repoOpts)
-
 	menuRepo := repository.NewMenuRepository(repoOpts)
 
 	// Initialize Services
@@ -59,6 +56,7 @@ func main() {
 	})
 
 	menuService := service.NewMenuService(interactor.MenuService{
+		TxRepository:   txRepo,
 		MenuRepository: menuRepo,
 	})
 

internal/app/api/handler/response.go → internal/adapters/api/common/response.go

@@ -1,18 +1,18 @@
-package handler
+package common
 
 import (
 	"github.com/gofiber/fiber/v3"
-	"github.com/voltgizerz/POS-restaurant/internal/app/constants"
+	"github.com/voltgizerz/POS-restaurant/internal/constants"
 )
 
 type (
-	errorResponse struct {
+	ErrorResponse struct {
 		Success   bool   `json:"success"`
 		Message   string `json:"message"`
 		RequestID string `json:"request_id"`
 	}
 
-	successResponse struct {
+	SuccessResponse struct {
 		Success   bool        `json:"success"`
 		Message   string      `json:"message"`
 		Data      interface{} `json:"data"`
@@ -22,7 +22,7 @@ type (
 
 // SendErrorResp generates and sends error response
 func SendErrorResp(c fiber.Ctx, statusCode int, errorMessage string) error {
-	response := errorResponse{
+	response := ErrorResponse{
 		Success:   false,
 		Message:   errorMessage,
 		RequestID: c.Locals(constants.CTXKeyRequestID).(string),
@@ -33,7 +33,7 @@ func SendErrorResp(c fiber.Ctx, statusCode int, errorMessage string) error {
 
 // SendSuccessResp generates and sends success response with dynamic data
 func SendSuccessResp(c fiber.Ctx, statusCode int, message string, data interface{}) error {
-	response := successResponse{
+	response := SuccessResponse{
 		Success:   true,
 		Message:   message,
 		Data:      data,

internal/app/api/handler/auth_handler.go → internal/adapters/api/handler/auth_handler.go

@@ -7,10 +7,11 @@ import (
 	"github.com/gofiber/fiber/v3"
 	"github.com/opentracing/opentracing-go"
 
-	"github.com/voltgizerz/POS-restaurant/internal/app/constants"
-	"github.com/voltgizerz/POS-restaurant/internal/app/entity"
-	"github.com/voltgizerz/POS-restaurant/internal/app/interactor"
-	"github.com/voltgizerz/POS-restaurant/internal/app/ports"
+	"github.com/voltgizerz/POS-restaurant/internal/adapters/api/common"
+	"github.com/voltgizerz/POS-restaurant/internal/constants"
+	"github.com/voltgizerz/POS-restaurant/internal/core/entity"
+	"github.com/voltgizerz/POS-restaurant/internal/core/interactor"
+	"github.com/voltgizerz/POS-restaurant/internal/core/ports"
 	"github.com/voltgizerz/POS-restaurant/internal/utils"
 )
 
@@ -32,26 +33,26 @@ func (h *AuthHandler) Login(c fiber.Ctx) error {
 
 	err := c.Bind().Body(req)
 	if err != nil {
-		return SendErrorResp(c, fiber.StatusBadRequest, constants.ErrMsgInvalidUsernameAndPassword)
+		return common.SendErrorResp(c, fiber.StatusBadRequest, constants.ErrMsgInvalidUsernameAndPassword)
 	}
 
 	err = validator.New().StructCtx(ctx, req)
 	if err != nil {
 		err = utils.GetFirstValidatorError(err)
 
-		return SendErrorResp(c, fiber.StatusBadRequest, err.Error())
+		return common.SendErrorResp(c, fiber.StatusBadRequest, err.Error())
 	}
 
 	dataLogin, err := h.authService.Login(ctx, req.Username, req.Password)
 	if err != nil {
 		if err == sql.ErrNoRows {
-			return SendErrorResp(c, fiber.StatusUnauthorized, constants.ErrMsgUsernameNotFound)
+			return common.SendErrorResp(c, fiber.StatusUnauthorized, constants.ErrMsgUsernameNotFound)
 		}
 
-		return SendErrorResp(c, fiber.StatusUnauthorized, constants.ErrMsgInvalidUsernameOrPassword)
+		return common.SendErrorResp(c, fiber.StatusUnauthorized, constants.ErrMsgInvalidUsernameOrPassword)
 	}
 
-	return SendSuccessResp(c, fiber.StatusOK, "Success", dataLogin)
+	return common.SendSuccessResp(c, fiber.StatusOK, "Success", dataLogin)
 }
 
 func (h *AuthHandler) Register(c fiber.Ctx) error {
@@ -62,18 +63,18 @@ func (h *AuthHandler) Register(c fiber.Ctx) error {
 
 	err := c.Bind().Body(req)
 	if err != nil {
-		return SendErrorResp(c, fiber.StatusBadRequest, "Invalid request body.")
+		return common.SendErrorResp(c, fiber.StatusBadRequest, "Invalid request body.")
 	}
 
 	err = validator.New().StructCtx(ctx, req)
 	if err != nil {
 		err = utils.GetFirstValidatorError(err)
 
-		return SendErrorResp(c, fiber.StatusBadRequest, err.Error())
+		return common.SendErrorResp(c, fiber.StatusBadRequest, err.Error())
 	}
 
 	if req.Password != req.ConfirmPassword {
-		return SendErrorResp(c, fiber.StatusBadRequest, "Password mismatch")
+		return common.SendErrorResp(c, fiber.StatusBadRequest, "Password mismatch")
 	}
 
 	userData := &entity.User{
@@ -85,12 +86,12 @@ func (h *AuthHandler) Register(c fiber.Ctx) error {
 
 	result, err := h.authService.Register(ctx, *userData)
 	if err != nil {
-		return SendErrorResp(c, fiber.StatusBadRequest, err.Error())
+		return common.SendErrorResp(c, fiber.StatusBadRequest, err.Error())
 	}
 
 	res := map[string]int64{
 		"user_id": result,
 	}
 
-	return SendSuccessResp(c, fiber.StatusCreated, "Account created succesfully.", res)
+	return common.SendSuccessResp(c, fiber.StatusCreated, "Account created succesfully.", res)
 }

internal/app/api/handler/auth_handler_test.go → internal/adapters/api/handler/auth_handler_test.go

@@ -9,9 +9,9 @@ import (
 	"github.com/bytedance/sonic"
 	"github.com/gofiber/fiber/v3"
 	"github.com/valyala/fasthttp"
-	"github.com/voltgizerz/POS-restaurant/internal/app/constants"
-	"github.com/voltgizerz/POS-restaurant/internal/app/entity"
-	"github.com/voltgizerz/POS-restaurant/internal/app/interactor"
+	"github.com/voltgizerz/POS-restaurant/internal/core/interactor"
+	"github.com/voltgizerz/POS-restaurant/internal/constants"
+	"github.com/voltgizerz/POS-restaurant/internal/core/entity"
 	"go.uber.org/mock/gomock"
 )
 

internal/app/api/handler/init_test.go → internal/adapters/api/handler/init_test.go

@@ -6,7 +6,7 @@ import (
 
 	"go.uber.org/mock/gomock"
 
-	"github.com/voltgizerz/POS-restaurant/internal/app/mocks"
+	"github.com/voltgizerz/POS-restaurant/internal/mocks"
 	"github.com/voltgizerz/POS-restaurant/pkg/logger"
 )
 

internal/app/api/handler/menu_handler.go → internal/adapters/api/handler/menu_handler.go

@@ -6,10 +6,11 @@ import (
 
 	"github.com/gofiber/fiber/v3"
 	"github.com/opentracing/opentracing-go"
-	"github.com/voltgizerz/POS-restaurant/internal/app/constants"
-	"github.com/voltgizerz/POS-restaurant/internal/app/entity"
-	"github.com/voltgizerz/POS-restaurant/internal/app/interactor"
-	"github.com/voltgizerz/POS-restaurant/internal/app/ports"
+	"github.com/voltgizerz/POS-restaurant/internal/adapters/api/common"
+	"github.com/voltgizerz/POS-restaurant/internal/constants"
+	"github.com/voltgizerz/POS-restaurant/internal/core/entity"
+	"github.com/voltgizerz/POS-restaurant/internal/core/interactor"
+	"github.com/voltgizerz/POS-restaurant/internal/core/ports"
 )
 
 type MenuHandler struct {
@@ -30,12 +31,12 @@ func (h *MenuHandler) AddMenu(c fiber.Ctx) error {
 
 	err := c.Bind().Body(req)
 	if err != nil {
-		return SendErrorResp(c, fiber.StatusBadRequest, "Error data menu")
+		return common.SendErrorResp(c, fiber.StatusBadRequest, "Error data menu")
 	}
 
 	priceConvert, err := strconv.ParseFloat(req.Price, 64)
 	if err != nil {
-		return SendErrorResp(c, fiber.StatusBadRequest, err.Error())
+		return common.SendErrorResp(c, fiber.StatusBadRequest, err.Error())
 	}
 
 	menuData := &entity.Menu{
@@ -48,14 +49,14 @@ func (h *MenuHandler) AddMenu(c fiber.Ctx) error {
 
 	result, err := h.menuService.RegisterMenu(ctx, *menuData)
 	if err != nil {
-		return SendErrorResp(c, fiber.StatusUnauthorized, err.Error())
+		return common.SendErrorResp(c, fiber.StatusUnauthorized, err.Error())
 	}
 
 	responseMsg := map[string]int64{
 		"menu_id": result,
 	}
 
-	return SendSuccessResp(c, fiber.StatusOK, "Success", responseMsg)
+	return common.SendSuccessResp(c, fiber.StatusOK, "Success", responseMsg)
 }
 
 func (h *MenuHandler) GetMenuByUserID(c fiber.Ctx) error {
@@ -65,15 +66,15 @@ func (h *MenuHandler) GetMenuByUserID(c fiber.Ctx) error {
 	userID := c.Params("user_id")
 	convertUserIDtoInt, err := strconv.Atoi(userID)
 	if err != nil {
-		return SendErrorResp(c, fiber.StatusBadRequest, err.Error())
+		return common.SendErrorResp(c, fiber.StatusBadRequest, err.Error())
 	}
 
 	result, err := h.menuService.GetMenu(ctx, int64(convertUserIDtoInt))
 	if err != nil {
-		return SendErrorResp(c, fiber.StatusBadRequest, constants.ErrMsgMenuNotFound)
+		return common.SendErrorResp(c, fiber.StatusBadRequest, constants.ErrMsgMenuNotFound)
 	}
 
-	return SendSuccessResp(c, fiber.StatusOK, "Success", result)
+	return common.SendSuccessResp(c, fiber.StatusOK, "Success", result)
 }
 
 func (h *MenuHandler) UpdateMenuByMenuID(c fiber.Ctx) error {
@@ -83,18 +84,18 @@ func (h *MenuHandler) UpdateMenuByMenuID(c fiber.Ctx) error {
 	req := &updateMenuRequest{}
 	err := c.Bind().Body(req)
 	if err != nil {
-		return SendErrorResp(c, fiber.StatusBadRequest, "Invalid request body.")
+		return common.SendErrorResp(c, fiber.StatusBadRequest, "Invalid request body.")
 	}
 
 	menuID := c.Params("menu_id")
 	convertMenuIDtoInt, err := strconv.Atoi(menuID)
 	if err != nil {
-		return SendErrorResp(c, fiber.StatusBadRequest, err.Error())
+		return common.SendErrorResp(c, fiber.StatusBadRequest, err.Error())
 	}
 
 	priceConvert, err := strconv.ParseFloat(req.Price, 64)
 	if err != nil {
-		return SendErrorResp(c, fiber.StatusBadRequest, err.Error())
+		return common.SendErrorResp(c, fiber.StatusBadRequest, err.Error())
 	}
 
 	menuData := entity.Menu{
@@ -108,10 +109,10 @@ func (h *MenuHandler) UpdateMenuByMenuID(c fiber.Ctx) error {
 
 	result, err := h.menuService.UpdateMenuID(ctx, menuData)
 	if err != nil {
-		return SendErrorResp(c, fiber.StatusBadRequest, constants.ErrMsgFailedUpdateMenu)
+		return common.SendErrorResp(c, fiber.StatusBadRequest, constants.ErrMsgFailedUpdateMenu)
 	}
 
-	return SendSuccessResp(c, fiber.StatusOK, "Success", result)
+	return common.SendSuccessResp(c, fiber.StatusOK, "Success", result)
 }
 
 func (h *MenuHandler) UpdateActiveMenuBatchByUserID(c fiber.Ctx) error {
@@ -121,15 +122,15 @@ func (h *MenuHandler) UpdateActiveMenuBatchByUserID(c fiber.Ctx) error {
 	userID := c.Params("user_id")
 	convertUserIDtoInt, err := strconv.Atoi(userID)
 	if err != nil {
-		return SendErrorResp(c, fiber.StatusBadRequest, err.Error())
+		return common.SendErrorResp(c, fiber.StatusBadRequest, err.Error())
 	}
 
 	result, err := h.menuService.UpdateActiveMenuBatchUserID(ctx, int64(convertUserIDtoInt))
 	if err != nil {
-		return SendErrorResp(c, fiber.StatusBadRequest, fmt.Sprintf(constants.ErrMsgFailedDeleteMenu, " delete batch by user id"))
+		return common.SendErrorResp(c, fiber.StatusBadRequest, fmt.Sprintf(constants.ErrMsgFailedDeleteMenu, " delete batch by user id"))
 	}
 
-	return SendSuccessResp(c, fiber.StatusOK, "Success", result)
+	return common.SendSuccessResp(c, fiber.StatusOK, "Success", result)
 }
 
 func (h *MenuHandler) UpdateActiveMenuByMenuID(c fiber.Ctx) error {
@@ -139,13 +140,13 @@ func (h *MenuHandler) UpdateActiveMenuByMenuID(c fiber.Ctx) error {
 	menuID := c.Params("menu_id")
 	convertMenuIDtoInt, err := strconv.Atoi(menuID)
 	if err != nil {
-		return SendErrorResp(c, fiber.StatusBadRequest, err.Error())
+		return common.SendErrorResp(c, fiber.StatusBadRequest, err.Error())
 	}
 
 	result, err := h.menuService.UpdateActiveMenuID(ctx, int64(convertMenuIDtoInt))
 	if err != nil {
-		return SendErrorResp(c, fiber.StatusBadRequest, fmt.Sprintf(constants.ErrMsgFailedDeleteMenu, " delete by menu id"))
+		return common.SendErrorResp(c, fiber.StatusBadRequest, fmt.Sprintf(constants.ErrMsgFailedDeleteMenu, " delete by menu id"))
 	}
 
-	return SendSuccessResp(c, fiber.StatusOK, "Success", result)
+	return common.SendSuccessResp(c, fiber.StatusOK, "Success", result)
 }

internal/app/api/init_test.go → internal/adapters/api/init_test.go

@@ -4,7 +4,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/voltgizerz/POS-restaurant/internal/app/mocks"
+	"github.com/voltgizerz/POS-restaurant/internal/mocks"
 	"github.com/voltgizerz/POS-restaurant/pkg/logger"
 	"go.uber.org/mock/gomock"
 )