[sprint-1][EA-3] category: get total product

api/base.go

@@ -3,8 +3,8 @@ package api
 import (
 	"erp/api/request"
 	"erp/api/response"
-	"erp/api_errors"
 	"erp/utils"
+	"erp/utils/api_errors"
 	"net/http"
 
 	"github.com/pkg/errors"

api/controllers/auth.go

@@ -2,7 +2,7 @@ package controller
 
 import (
 	"erp/api"
-	dto "erp/dto/auth"
+	dto2 "erp/api/dto/auth"
 	service "erp/service"
 	"net/http"
 
@@ -25,7 +25,7 @@ func NewAuthController(authService service.AuthService, logger *zap.Logger) *Aut
 }
 
 func (b *AuthController) Register(c *gin.Context) {
-	var req dto.RegisterRequest
+	var req dto2.RegisterRequest
 
 	if err := c.ShouldBindJSON(&req); err != nil {
 		b.ResponseValidationError(c, err)
@@ -42,7 +42,7 @@ func (b *AuthController) Register(c *gin.Context) {
 }
 
 func (b *AuthController) Login(c *gin.Context) {
-	var req dto.LoginRequest
+	var req dto2.LoginRequest
 
 	if err := c.ShouldBindJSON(&req); err != nil {
 		b.ResponseValidationError(c, err)

api/controllers/budget.go

@@ -2,7 +2,7 @@ package controller
 
 import (
 	"erp/api"
-	erpdto "erp/dto/finance"
+	erpdto "erp/api/dto/finance"
 	erpservice "erp/service"
 	"erp/utils"
 	"net/http"

api/controllers/cashbook.go

@@ -2,7 +2,7 @@ package controller
 
 import (
 	"erp/api"
-	erpdto "erp/dto/finance"
+	erpdto "erp/api/dto/finance"
 	erpservice "erp/service"
 	"erp/utils"
 	"net/http"

api/controllers/cashbook_category.go

@@ -2,7 +2,7 @@ package controller
 
 import (
 	"erp/api"
-	erpdto "erp/dto/finance"
+	erpdto "erp/api/dto/finance"
 	erpservice "erp/service"
 	"erp/utils"
 	"net/http"

api/controllers/category.go

@@ -2,7 +2,7 @@ package controller
 
 import (
 	"erp/api"
-	"erp/dto/erp"
+	"erp/api/dto/erp"
 	"erp/service"
 	"erp/utils"
 	"github.com/gin-gonic/gin"

api/controllers/category_product.go

@@ -0,0 +1,75 @@
+package controller
+
+import (
+	"erp/api"
+	"erp/api/dto/erp"
+	"erp/service"
+	"erp/utils"
+	"github.com/gin-gonic/gin"
+	"net/http"
+)
+
+type CategoryProductController struct {
+	categoryProductService service.CategoryProductService
+	api.BaseController
+}
+
+func NewCategoryProductController(categoryProductService service.CategoryProductService) *CategoryProductController {
+	return &CategoryProductController{
+		categoryProductService: categoryProductService,
+	}
+}
+
+func (b *CategoryProductController) Create(c *gin.Context) {
+	var req erpdto.CategoryProductRequest
+	if err := c.ShouldBindJSON(&req); err != nil {
+		b.ResponseValidationError(c, err)
+		return
+	}
+
+	res, err := b.categoryProductService.Create(c, req)
+	if err != nil {
+		b.ResponseError(c, err)
+		return
+	}
+	b.Response(c, http.StatusOK, "success", res)
+}
+
+func (b *CategoryProductController) Update(c *gin.Context) {
+	var req erpdto.CategoryProductRequest
+
+	if err := c.ShouldBindJSON(&req); err != nil {
+		b.ResponseValidationError(c, err)
+		return
+	}
+	res, err := b.categoryProductService.Update(c, req)
+	if err != nil {
+		b.ResponseError(c, err)
+		return
+	}
+	b.Response(c, http.StatusOK, "success", res)
+}
+
+func (b *CategoryProductController) Delete(c *gin.Context) {
+	id := utils.ParseStringIDFromUri(c)
+	if err := b.categoryProductService.Delete(c, id); err != nil {
+		b.ResponseError(c, err)
+		return
+	}
+	b.Response(c, http.StatusOK, "success", nil)
+}
+
+func (b *CategoryProductController) GetList(c *gin.Context) {
+	var req erpdto.GetListCatProRequest
+
+	if err := c.ShouldBindQuery(&req); err != nil {
+		b.ResponseValidationError(c, err)
+		return
+	}
+	res, total, err := b.categoryProductService.GetList(c, req)
+	if err != nil {
+		b.ResponseError(c, err)
+		return
+	}
+	b.ResponseList(c, "success", total, res)
+}

api/controllers/customer.go

@@ -2,7 +2,7 @@ package controller
 
 import (
 	"erp/api"
-	erpdto "erp/dto/erp"
+	"erp/api/dto/erp"
 	erpservice "erp/service"
 	"erp/utils"
 	"github.com/gin-gonic/gin"

api/controllers/employee_management.go

@@ -2,7 +2,7 @@ package controller
 
 import (
 	"erp/api"
-	erpdto "erp/dto/erp"
+	"erp/api/dto/erp"
 	"erp/lib"
 	erpservice "erp/service"
 	"net/http"

api/controllers/module.go

@@ -10,5 +10,5 @@ var Module = fx.Options(
 		NewERPCategoryController, NewERPCustomerController, NewERPEmployeeManagementController,
 		NewERPProductController, NewERPStoreController, NewOrderController, NewPromoteController,
 		NewCashbookController, NewTransactionCategoryController, NewWalletController,
-		NewBudgetController,
+		NewBudgetController, NewCategoryProductController,
 	))

api/controllers/order.go

@@ -2,10 +2,10 @@ package controller
 
 import (
 	"erp/api"
-	"erp/api_errors"
-	erpdto "erp/dto/erp"
+	"erp/api/dto/erp"
 	erpservice "erp/service"
 	"erp/utils"
+	"erp/utils/api_errors"
 	"errors"
 
 	"github.com/gin-gonic/gin"

api/controllers/product.go

@@ -2,7 +2,7 @@ package controller
 
 import (
 	"erp/api"
-	erpdto "erp/dto/erp"
+	"erp/api/dto/erp"
 	"erp/service"
 	"erp/utils"
 	"github.com/gin-gonic/gin"

api/controllers/promote.go

@@ -2,7 +2,7 @@ package controller
 
 import (
 	"erp/api"
-	erpdto "erp/dto/erp"
+	"erp/api/dto/erp"
 	"erp/service"
 	"erp/utils"
 	"github.com/gin-gonic/gin"

api/controllers/store.go

@@ -2,7 +2,7 @@ package controller
 
 import (
 	"erp/api"
-	erpdto "erp/dto/erp"
+	"erp/api/dto/erp"
 	erpservice "erp/service"
 	"erp/utils"
 	"net/http"

api/controllers/wallet.go

@@ -2,7 +2,7 @@ package controller
 
 import (
 	"erp/api"
-	erpdto "erp/dto/finance"
+	erpdto "erp/api/dto/finance"
 	erpservice "erp/service"
 	"erp/utils"
 	"net/http"

dto/erp/category_product.go → api/dto/erp/category_product.go

@@ -6,7 +6,7 @@ import (
 )
 
 type CategoryProductRequest struct {
-	UserId     string `json:"user_id" binding:"required"`
+	//UserId     string `json:"user_id" binding:"required"`
 	CategoryId string `json:"category_id" binding:"required"`
 	ProductId  string `json:"product_id" binding:"required"`
 }
@@ -21,6 +21,6 @@ type CatProductResponse struct {
 }
 
 type DeleteCatagoryProductRequest struct {
-	UserId string `json:"user_id" binding:"required"`
-	ID     string `json:"id" binding:"required"`
+	//UserId string `json:"user_id" binding:"required"`
+	ID string `json:"id" binding:"required"`
 }

dto/finance/budget.go → api/dto/finance/budget.go

@@ -2,7 +2,7 @@ package finance
 
 import (
 	"erp/api/request"
-	"erp/models"
+	"erp/domain"
 	uuid "github.com/satori/go.uuid"
 	"time"
 )
@@ -31,6 +31,6 @@ type ListBudgetRequest struct {
 }
 
 type BudgetResponse struct {
-	models.Budget
+	domain.Budget
 	Spent float64 `json:"spent"`
 }

api/middlewares/auth.go

@@ -2,9 +2,9 @@ package middlewares
 
 import (
 	"context"
+	"erp/api/dto/auth"
 	"erp/api/response"
-	"erp/api_errors"
-	dto "erp/dto/auth"
+	"erp/utils/api_errors"
 	"net/http"
 	"strings"
 
@@ -71,8 +71,8 @@ func (e *GinMiddleware) Auth(authorization bool) gin.HandlerFunc {
 		//}
 		//c.Request = c.Request.WithContext(context.WithValue(c.Request.Context(), "x-store-id", storeID))
 
-		//ur := new(models.UserRole)
-		//if err = e.db.Model(models.UserRole{}).Where("user_id = ? AND store_id = ?", claims.Subject, storeID).First(ur).Error; err != nil {
+		//ur := new(domain.UserRole)
+		//if err = e.db.Model(domain.UserRole{}).Where("user_id = ? AND store_id = ?", claims.Subject, storeID).First(ur).Error; err != nil {
 		//	c.Errors = append(c.Errors, &gin.Error{
 		//		Err: errors.Wrap(err, "cannot find user role"),
 		//	})
@@ -90,8 +90,8 @@ func (e *GinMiddleware) Auth(authorization bool) gin.HandlerFunc {
 		//	return
 		//}
 
-		//role := new(models.Role)
-		//if err = e.db.Model(models.Role{}).Where("id = ?", ur.RoleID).First(role).Error; err != nil {
+		//role := new(domain.Role)
+		//if err = e.db.Model(domain.Role{}).Where("id = ?", ur.RoleID).First(role).Error; err != nil {
 		//	c.Errors = append(c.Errors, &gin.Error{
 		//		Err: errors.Wrap(err, "cannot find role"),
 		//	})
@@ -104,8 +104,8 @@ func (e *GinMiddleware) Auth(authorization bool) gin.HandlerFunc {
 		//	})
 		//	return
 		//}
-		//up := new(models.Permission)
-		//if err = e.db.Model(models.Permission{}).Where("role_id = ? AND route_path = ?", ur.RoleID, c.Request.URL.Path).First(up).Error; err != nil {
+		//up := new(domain.Permission)
+		//if err = e.db.Model(domain.Permission{}).Where("role_id = ? AND route_path = ?", ur.RoleID, c.Request.URL.Path).First(up).Error; err != nil {
 		//	c.Errors = append(c.Errors, &gin.Error{
 		//		Err: errors.Wrap(err, "cannot find permission"),
 		//	})

models/base.go → domain/base.go

@@ -1,4 +1,4 @@
-package models
+package domain
 
 import (
 	"gorm.io/gorm"

models/budget.go → domain/budget.go

@@ -1,4 +1,4 @@
-package models
+package domain
 
 import (
 	uuid "github.com/satori/go.uuid"

models/category.go → domain/category.go

@@ -1,13 +1,12 @@
-package models
+package domain
 
 import uuid "github.com/satori/go.uuid"
 
 type Category struct {
 	BaseModel
-	StoreId      uuid.UUID `json:"store_id" gorm:"type:uuid;default:uuid_generate_v4();index"`
-	Name         string    `json:"name" gorm:"column:name;type:varchar(50);not null"`
-	Image        string    `json:"image" gorm:"column:image;type:varchar(250);null"`
-	TotalProduct int       `json:"total_product" gorm:"column:total_product;type:int;default:0;"`
+	StoreId uuid.UUID `json:"store_id" gorm:"type:uuid;default:uuid_generate_v4();index"`
+	Name    string    `json:"name" gorm:"column:name;type:varchar(50);not null"`
+	Image   string    `json:"image" gorm:"column:image;type:varchar(250);null"`
 }
 
 type CategoryResult struct {

models/category_product.go → domain/category_product.go

@@ -1,4 +1,4 @@
-package models
+package domain
 
 import uuid "github.com/satori/go.uuid"
 

models/customer.go → domain/customer.go

@@ -1,4 +1,4 @@
-package models
+package domain
 
 type Customer struct {
 	BaseModel

models/debt.go → domain/debt.go

@@ -1,4 +1,4 @@
-package models
+package domain
 
 import (
 	"time"

models/order.go → domain/order.go

@@ -1,4 +1,4 @@
-package models
+package domain
 
 import uuid "github.com/satori/go.uuid"
 

models/order_item.go → domain/order_item.go

@@ -1,4 +1,4 @@
-package models
+package domain
 
 import uuid "github.com/satori/go.uuid"
 

models/permission.go → domain/permission.go

@@ -1,4 +1,4 @@
-package models
+package domain
 
 import uuid "github.com/satori/go.uuid"
 

models/product.go → domain/product.go

@@ -1,4 +1,4 @@
-package models
+package domain
 
 import (
 	uuid "github.com/satori/go.uuid"

models/promote.go → domain/promote.go

@@ -1,4 +1,4 @@
-package models
+package domain
 
 import (
 	uuid "github.com/satori/go.uuid"

models/role.go → domain/role.go

@@ -1,4 +1,4 @@
-package models
+package domain
 
 import (
 	uuid "github.com/satori/go.uuid"

models/store.go → domain/store.go

@@ -1,4 +1,4 @@
-package models
+package domain
 
 type Store struct {
 	BaseModel

models/transaction.go → domain/transaction.go

@@ -1,4 +1,4 @@
-package models
+package domain
 
 import (
 	"github.com/lib/pq"