Merge pull request #18 from codeclubvn/mvp

loại bỏ một số thứ ko cần thiết

api/base.go

@@ -5,6 +5,7 @@ import (
 	"erp/api/response"
 	"erp/api_errors"
 	"erp/utils"
+	"fmt"
 	"net/http"
 
 	"github.com/pkg/errors"
@@ -55,7 +56,7 @@ func (b *BaseController) ResponseList(c *gin.Context, message string, total *int
 }
 
 func (b *BaseController) ResponseError(c *gin.Context, err error) {
-
+	fmt.Println(err.Error())
 	mas, ok := api_errors.MapErrorCodeMessage[err.Error()]
 	var status int
 	ginType := gin.ErrorTypePublic

api/controllers/erp/product.go

@@ -27,7 +27,7 @@ func (b *ERPProductController) Create(c *gin.Context) {
 		return
 	}
 
-	req.StoreId = utils.GetStoreIDFromContext(c.Request.Context())
+	//req.StoreId = utils.GetStoreIDFromContext(c.Request.Context())
 
 	res, err := b.productService.Create(c, req)
 	if err != nil {
@@ -83,5 +83,5 @@ func (b *ERPProductController) GetList(c *gin.Context) {
 		b.ResponseError(c, err)
 		return
 	}
-	b.ResponseList(c, "success", total, res)
+	b.ResponseList(c, "success", &total, res)
 }

api/middlewares/auth.go

@@ -5,7 +5,6 @@ import (
 	"erp/api/response"
 	"erp/api_errors"
 	dto "erp/dto/auth"
-	"erp/models"
 	"net/http"
 	"strings"
 
@@ -56,69 +55,69 @@ func (e *GinMiddleware) Auth(authorization bool) gin.HandlerFunc {
 			return
 		}
 
-		storeID := c.Request.Header.Get("x-store-id")
-		if storeID == "" {
-			c.Errors = append(c.Errors, &gin.Error{
-				Err: errors.New(api_errors.ErrMissingXStoreID),
-			})
-
-			mas := api_errors.MapErrorCodeMessage[api_errors.ErrMissingXStoreID]
-
-			c.AbortWithStatusJSON(mas.Status, response.ResponseError{
-				Message: mas.Message,
-				Code:    api_errors.ErrMissingXStoreID,
-			})
-			return
-		}
-		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 {
-			c.Errors = append(c.Errors, &gin.Error{
-				Err: errors.Wrap(err, "cannot find user role"),
-			})
-
-			mas := api_errors.MapErrorCodeMessage[api_errors.ErrUnauthorizedAccess]
-
-			c.AbortWithStatusJSON(mas.Status, response.ResponseError{
-				Message: mas.Message,
-				Code:    api_errors.ErrUnauthorizedAccess,
-			})
-			return
-		}
-		if ur.IsStoreOwner {
-			c.Next()
-			return
-		}
-
-		role := new(models.Role)
-		if err = e.db.Model(models.Role{}).Where("id = ?", ur.RoleID).First(role).Error; err != nil {
-			c.Errors = append(c.Errors, &gin.Error{
-				Err: errors.Wrap(err, "cannot find role"),
-			})
-
-			mas := api_errors.MapErrorCodeMessage[api_errors.ErrUnauthorizedAccess]
-
-			c.AbortWithStatusJSON(mas.Status, response.ResponseError{
-				Message: mas.Message,
-				Code:    api_errors.ErrUnauthorizedAccess,
-			})
-			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 {
-			c.Errors = append(c.Errors, &gin.Error{
-				Err: errors.Wrap(err, "cannot find permission"),
-			})
-
-			mas := api_errors.MapErrorCodeMessage[api_errors.ErrUnauthorizedAccess]
-
-			c.AbortWithStatusJSON(mas.Status, response.ResponseError{
-				Message: mas.Message,
-				Code:    api_errors.ErrUnauthorizedAccess,
-			})
-			return
-		}
+		//storeID := c.Request.Header.Get("x-store-id")
+		//if storeID == "" {
+		//	c.Errors = append(c.Errors, &gin.Error{
+		//		Err: errors.New(api_errors.ErrMissingXStoreID),
+		//	})
+		//
+		//	mas := api_errors.MapErrorCodeMessage[api_errors.ErrMissingXStoreID]
+		//
+		//	c.AbortWithStatusJSON(mas.Status, response.ResponseError{
+		//		Message: mas.Message,
+		//		Code:    api_errors.ErrMissingXStoreID,
+		//	})
+		//	return
+		//}
+		//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 {
+		//	c.Errors = append(c.Errors, &gin.Error{
+		//		Err: errors.Wrap(err, "cannot find user role"),
+		//	})
+		//
+		//	mas := api_errors.MapErrorCodeMessage[api_errors.ErrUnauthorizedAccess]
+		//
+		//	c.AbortWithStatusJSON(mas.Status, response.ResponseError{
+		//		Message: mas.Message,
+		//		Code:    api_errors.ErrUnauthorizedAccess,
+		//	})
+		//	return
+		//}
+		//if ur.IsStoreOwner {
+		//	c.Next()
+		//	return
+		//}
+
+		//role := new(models.Role)
+		//if err = e.db.Model(models.Role{}).Where("id = ?", ur.RoleID).First(role).Error; err != nil {
+		//	c.Errors = append(c.Errors, &gin.Error{
+		//		Err: errors.Wrap(err, "cannot find role"),
+		//	})
+		//
+		//	mas := api_errors.MapErrorCodeMessage[api_errors.ErrUnauthorizedAccess]
+		//
+		//	c.AbortWithStatusJSON(mas.Status, response.ResponseError{
+		//		Message: mas.Message,
+		//		Code:    api_errors.ErrUnauthorizedAccess,
+		//	})
+		//	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 {
+		//	c.Errors = append(c.Errors, &gin.Error{
+		//		Err: errors.Wrap(err, "cannot find permission"),
+		//	})
+		//
+		//	mas := api_errors.MapErrorCodeMessage[api_errors.ErrUnauthorizedAccess]
+		//
+		//	c.AbortWithStatusJSON(mas.Status, response.ResponseError{
+		//		Message: mas.Message,
+		//		Code:    api_errors.ErrUnauthorizedAccess,
+		//	})
+		//	return
+		//}
 
 		c.Next()
 	}