diff --git a/app/delivery/middleware/auth.go b/app/delivery/middleware/auth.go index 756e79f..54910ea 100644 --- a/app/delivery/middleware/auth.go +++ b/app/delivery/middleware/auth.go @@ -10,7 +10,6 @@ import ( "git.ma-al.com/goc_daniel/b2b/app/model" "git.ma-al.com/goc_daniel/b2b/app/service/authService" constdata "git.ma-al.com/goc_daniel/b2b/app/utils/const_data" - "git.ma-al.com/goc_daniel/b2b/app/utils/localeExtractor" "github.com/gofiber/fiber/v3" ) @@ -115,26 +114,6 @@ func AuthMiddleware() fiber.Handler { } } -// RequireAdmin creates admin-only middleware -func RequireAdmin() fiber.Handler { - return func(c fiber.Ctx) error { - originalUserRole, ok := localeExtractor.GetOriginalUserRole(c) - if !ok { - return c.Status(fiber.StatusUnauthorized).JSON(fiber.Map{ - "error": "not authenticated", - }) - } - - if model.CustomerRole(originalUserRole.Name) != model.RoleAdmin { - return c.Status(fiber.StatusForbidden).JSON(fiber.Map{ - "error": "admin access required", - }) - } - - return c.Next() - } -} - // Webdav func Webdav() fiber.Handler { authService := authService.NewAuthService() diff --git a/app/delivery/middleware/permissions.go b/app/delivery/middleware/permissions.go index 96ab057..9c2eb00 100644 --- a/app/delivery/middleware/permissions.go +++ b/app/delivery/middleware/permissions.go @@ -2,27 +2,27 @@ package middleware import ( "git.ma-al.com/goc_daniel/b2b/app/delivery/middleware/perms" - "git.ma-al.com/goc_daniel/b2b/app/model" + "git.ma-al.com/goc_daniel/b2b/app/utils/localeExtractor" + "git.ma-al.com/goc_daniel/b2b/app/utils/nullable" + "git.ma-al.com/goc_daniel/b2b/app/utils/response" + "git.ma-al.com/goc_daniel/b2b/app/utils/responseErrors" "github.com/gofiber/fiber/v3" ) func Require(p perms.Permission) fiber.Handler { return func(c fiber.Ctx) error { - u := c.Locals("user") - if u == nil { - return c.SendStatus(fiber.StatusUnauthorized) - } - - user, ok := u.(*model.UserSession) + user, ok := localeExtractor.GetCustomer(c) if !ok { - return c.SendStatus(fiber.StatusInternalServerError) + return c.Status(responseErrors.GetErrorStatus(responseErrors.ErrInvalidBody)). + JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, responseErrors.ErrInvalidBody))) } - for _, perm := range user.Permissions { - if perm == p { + for _, perm := range user.Role.Permissions { + if perm.Name == p { return c.Next() } } - return c.SendStatus(fiber.StatusForbidden) + return c.Status(responseErrors.GetErrorStatus(responseErrors.ErrForbidden)). + JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, responseErrors.ErrForbidden))) } } diff --git a/app/delivery/middleware/perms/permissions.go b/app/delivery/middleware/perms/permissions.go index 40c10d4..9887fa4 100644 --- a/app/delivery/middleware/perms/permissions.go +++ b/app/delivery/middleware/perms/permissions.go @@ -3,10 +3,22 @@ package perms type Permission string const ( +<<<<<<< HEAD UserReadAny Permission = "user.read.any" UserWriteAny Permission = "user.write.any" UserDeleteAny Permission = "user.delete.any" CurrencyWrite Permission = "currency.write" ViewAllOrders Permission = "orders.view" ModifyAllOrders Permission = "orders.modify" +======= + UserReadAny Permission = "user.read.any" + UserWriteAny Permission = "user.write.any" + UserDeleteAny Permission = "user.delete.any" + CurrencyWrite Permission = "currency.write" + SpecificPriceManage Permission = "specific_price.manage" + WebdavCreateToken Permission = "webdav.create_token" + ProductTranslationSave Permission = "product_translation.save" + ProductTranslationTranslate Permission = "product_translation.translate" + SearchCreateIndex Permission = "search.create_index" +>>>>>>> e5988a85f32e0b3324f6d9f48254355fbffd559e ) diff --git a/app/delivery/web/api/restricted/product.go b/app/delivery/web/api/restricted/product.go index 096d5ec..ba6b99d 100644 --- a/app/delivery/web/api/restricted/product.go +++ b/app/delivery/web/api/restricted/product.go @@ -4,8 +4,9 @@ import ( "strconv" "git.ma-al.com/goc_daniel/b2b/app/config" - "git.ma-al.com/goc_daniel/b2b/app/model" + "git.ma-al.com/goc_daniel/b2b/app/model/dbmodel" "git.ma-al.com/goc_daniel/b2b/app/service/productService" + constdata "git.ma-al.com/goc_daniel/b2b/app/utils/const_data" "git.ma-al.com/goc_daniel/b2b/app/utils/i18n" "git.ma-al.com/goc_daniel/b2b/app/utils/localeExtractor" "git.ma-al.com/goc_daniel/b2b/app/utils/nullable" @@ -34,6 +35,7 @@ func ProductsHandlerRoutes(r fiber.Router) fiber.Router { r.Get("/:id/:country_id/:quantity", handler.GetProductJson) r.Get("/list", handler.ListProducts) + r.Get("/list-variants/:product_id", handler.ListProductVariants) r.Post("/favorite/:product_id", handler.AddToFavorites) r.Delete("/favorite/:product_id", handler.RemoveFromFavorites) @@ -70,7 +72,7 @@ func (h *ProductsHandler) GetProductJson(c fiber.Ctx) error { return c.Status(responseErrors.GetErrorStatus(responseErrors.ErrBadAttribute)). JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, responseErrors.ErrBadAttribute))) } - productJson, err := h.productService.GetJSON(p_id_product, int(customer.LangID), int(customer.ID), b2b_id_country, p_quantity) + productJson, err := h.productService.Get(uint(p_id_product), customer.LangID, customer.ID, uint(b2b_id_country), uint(p_quantity)) if err != nil { return c.Status(responseErrors.GetErrorStatus(err)). JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, err))) @@ -80,25 +82,19 @@ func (h *ProductsHandler) GetProductJson(c fiber.Ctx) error { } func (h *ProductsHandler) ListProducts(c fiber.Ctx) error { - paging, filters, err := query_params.ParseFilters[model.Product](c, columnMappingListProducts) + paging, filters, err := query_params.ParseFilters[dbmodel.PsProduct](c, columnMappingListProducts) if err != nil { return c.Status(responseErrors.GetErrorStatus(err)). JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, err))) } - id_lang, ok := localeExtractor.GetLangID(c) - if !ok { + customer, ok := localeExtractor.GetCustomer(c) + if !ok || customer == nil { return c.Status(responseErrors.GetErrorStatus(responseErrors.ErrBadAttribute)). JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, responseErrors.ErrBadAttribute))) } - userID, ok := localeExtractor.GetUserID(c) - if !ok { - return c.Status(responseErrors.GetErrorStatus(responseErrors.ErrInvalidBody)). - JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, responseErrors.ErrInvalidBody))) - } - - list, err := h.productService.Find(id_lang, userID, paging, filters) + list, err := h.productService.Find(customer.LangID, customer.ID, paging, filters, customer, constdata.DEFAULT_PRODUCT_QUANTITY, constdata.SHOP_ID) if err != nil { return c.Status(responseErrors.GetErrorStatus(err)). JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, err))) @@ -107,14 +103,15 @@ func (h *ProductsHandler) ListProducts(c fiber.Ctx) error { return c.JSON(response.Make(&list.Items, int(list.Count), i18n.T_(c, response.Message_OK))) } +// These are all the filterable fields var columnMappingListProducts map[string]string = map[string]string{ - "product_id": "ps.id_product", - "name": "pl.name", - "reference": "p.reference", - "category_name": "cl.name", - "category_id": "cp.id_category", - "quantity": "sa.quantity", - "is_favorite": "ps.is_favorite", + "product_id": "bp.product_id", + "name": "bp.name", + "reference": "bp.reference", + "category_id": "bp.category_id", + "quantity": "bp.quantity", + "is_favorite": "bp.is_favorite", + "is_new": "bp.is_new", } func (h *ProductsHandler) AddToFavorites(c fiber.Ctx) error { @@ -164,3 +161,27 @@ func (h *ProductsHandler) RemoveFromFavorites(c fiber.Ctx) error { return c.JSON(response.Make(nullable.GetNil(""), 0, i18n.T_(c, response.Message_OK))) } + +func (h *ProductsHandler) ListProductVariants(c fiber.Ctx) error { + productIDStr := c.Params("product_id") + + productID, err := strconv.Atoi(productIDStr) + if err != nil { + return c.Status(responseErrors.GetErrorStatus(err)). + JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, err))) + } + + customer, ok := localeExtractor.GetCustomer(c) + if !ok || customer == nil { + return c.Status(responseErrors.GetErrorStatus(responseErrors.ErrBadAttribute)). + JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, responseErrors.ErrBadAttribute))) + } + + list, err := h.productService.GetProductAttributes(customer.LangID, uint(productID), constdata.SHOP_ID, customer.ID, customer.CountryID, constdata.DEFAULT_PRODUCT_QUANTITY) + if err != nil { + return c.Status(responseErrors.GetErrorStatus(err)). + JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, err))) + } + + return c.JSON(response.Make(&list, len(list), i18n.T_(c, response.Message_OK))) +} diff --git a/app/delivery/web/api/restricted/productTranslation.go b/app/delivery/web/api/restricted/productTranslation.go index 3dc16bd..eb3fee1 100644 --- a/app/delivery/web/api/restricted/productTranslation.go +++ b/app/delivery/web/api/restricted/productTranslation.go @@ -4,7 +4,8 @@ import ( "strconv" "git.ma-al.com/goc_daniel/b2b/app/config" - "git.ma-al.com/goc_daniel/b2b/app/model" + "git.ma-al.com/goc_daniel/b2b/app/delivery/middleware" + "git.ma-al.com/goc_daniel/b2b/app/delivery/middleware/perms" "git.ma-al.com/goc_daniel/b2b/app/service/productTranslationService" "git.ma-al.com/goc_daniel/b2b/app/utils/i18n" "git.ma-al.com/goc_daniel/b2b/app/utils/localeExtractor" @@ -35,8 +36,8 @@ func ProductTranslationHandlerRoutes(r fiber.Router) fiber.Router { handler := NewProductTranslationHandler() r.Get("/get-product-description", handler.GetProductDescription) - r.Post("/save-product-description", handler.SaveProductDescription) - r.Get("/translate-product-description", handler.TranslateProductDescription) + r.Post("/save-product-description", middleware.Require(perms.ProductTranslationSave), handler.SaveProductDescription) + r.Get("/translate-product-description", middleware.Require(perms.ProductTranslationTranslate), handler.TranslateProductDescription) return r } @@ -80,12 +81,6 @@ func (h *ProductTranslationHandler) SaveProductDescription(c fiber.Ctx) error { JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, responseErrors.ErrInvalidBody))) } - userRole, ok := localeExtractor.GetOriginalUserRole(c) - if !ok || model.CustomerRole(userRole.Name) != model.RoleAdmin { - return c.Status(responseErrors.GetErrorStatus(responseErrors.ErrAdminAccessRequired)). - JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, responseErrors.ErrAdminAccessRequired))) - } - productID_attribute := c.Query("productID") productID, err := strconv.Atoi(productID_attribute) if err != nil { @@ -123,12 +118,6 @@ func (h *ProductTranslationHandler) TranslateProductDescription(c fiber.Ctx) err JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, responseErrors.ErrInvalidBody))) } - userRole, ok := localeExtractor.GetOriginalUserRole(c) - if !ok || model.CustomerRole(userRole.Name) != model.RoleAdmin { - return c.Status(responseErrors.GetErrorStatus(responseErrors.ErrAdminAccessRequired)). - JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, responseErrors.ErrAdminAccessRequired))) - } - productID_attribute := c.Query("productID") productID, err := strconv.Atoi(productID_attribute) if err != nil { diff --git a/app/delivery/web/api/restricted/search.go b/app/delivery/web/api/restricted/search.go index 843c956..ebb3a76 100644 --- a/app/delivery/web/api/restricted/search.go +++ b/app/delivery/web/api/restricted/search.go @@ -4,7 +4,8 @@ import ( "encoding/json" "fmt" - "git.ma-al.com/goc_daniel/b2b/app/model" + "git.ma-al.com/goc_daniel/b2b/app/delivery/middleware" + "git.ma-al.com/goc_daniel/b2b/app/delivery/middleware/perms" "git.ma-al.com/goc_daniel/b2b/app/service/meiliService" searchservice "git.ma-al.com/goc_daniel/b2b/app/service/searchService" "git.ma-al.com/goc_daniel/b2b/app/utils/i18n" @@ -30,7 +31,7 @@ func NewMeiliSearchHandler() *MeiliSearchHandler { func MeiliSearchHandlerRoutes(r fiber.Router) fiber.Router { handler := NewMeiliSearchHandler() - r.Get("/create-index", handler.CreateIndex) + r.Get("/create-index", middleware.Require(perms.SearchCreateIndex), handler.CreateIndex) r.Post("/search", handler.Search) r.Post("/settings", handler.GetSettings) @@ -44,12 +45,6 @@ func (h *MeiliSearchHandler) CreateIndex(c fiber.Ctx) error { JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, responseErrors.ErrBadAttribute))) } - userRole, ok := localeExtractor.GetOriginalUserRole(c) - if !ok || model.CustomerRole(userRole.Name) != model.RoleAdmin { - return c.Status(responseErrors.GetErrorStatus(responseErrors.ErrAdminAccessRequired)). - JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, responseErrors.ErrAdminAccessRequired))) - } - err := h.meiliService.CreateIndex(id_lang) if err != nil { fmt.Printf("CreateIndex error: %v\n", err) diff --git a/app/delivery/web/api/restricted/specificPrice.go b/app/delivery/web/api/restricted/specificPrice.go new file mode 100644 index 0000000..e007f57 --- /dev/null +++ b/app/delivery/web/api/restricted/specificPrice.go @@ -0,0 +1,160 @@ +package restricted + +import ( + "strconv" + + "git.ma-al.com/goc_daniel/b2b/app/config" + "git.ma-al.com/goc_daniel/b2b/app/delivery/middleware" + "git.ma-al.com/goc_daniel/b2b/app/delivery/middleware/perms" + "git.ma-al.com/goc_daniel/b2b/app/model" + "git.ma-al.com/goc_daniel/b2b/app/service/specificPriceService" + "git.ma-al.com/goc_daniel/b2b/app/utils/i18n" + "git.ma-al.com/goc_daniel/b2b/app/utils/nullable" + "git.ma-al.com/goc_daniel/b2b/app/utils/response" + "git.ma-al.com/goc_daniel/b2b/app/utils/responseErrors" + "github.com/gofiber/fiber/v3" +) + +type SpecificPriceHandler struct { + SpecificPriceService *specificPriceService.SpecificPriceService + config *config.Config +} + +func NewSpecificPriceHandler() *SpecificPriceHandler { + SpecificPriceService := specificPriceService.New() + return &SpecificPriceHandler{ + SpecificPriceService: SpecificPriceService, + config: config.Get(), + } +} + +func SpecificPriceHandlerRoutes(r fiber.Router) fiber.Router { + handler := NewSpecificPriceHandler() + + r.Post("/", middleware.Require(perms.SpecificPriceManage), handler.Create) + r.Put("/:id", middleware.Require(perms.SpecificPriceManage), handler.Update) + r.Delete("/:id", middleware.Require(perms.SpecificPriceManage), handler.Delete) + r.Get("/", middleware.Require(perms.SpecificPriceManage), handler.List) + r.Get("/:id", middleware.Require(perms.SpecificPriceManage), handler.GetByID) + r.Patch("/:id/activate", middleware.Require(perms.SpecificPriceManage), handler.Activate) + r.Patch("/:id/deactivate", middleware.Require(perms.SpecificPriceManage), handler.Deactivate) + + return r +} + +func (h *SpecificPriceHandler) Create(c fiber.Ctx) error { + var pr model.SpecificPrice + if err := c.Bind().Body(&pr); err != nil { + return c.Status(responseErrors.GetErrorStatus(responseErrors.ErrInvalidBody)). + JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, responseErrors.ErrInvalidBody))) + } + + result, err := h.SpecificPriceService.Create(c.Context(), &pr) + if err != nil { + return c.Status(responseErrors.GetErrorStatus(err)). + JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, err))) + } + + return c.JSON(response.Make(&result, 1, i18n.T_(c, response.Message_OK))) +} + +func (h *SpecificPriceHandler) Update(c fiber.Ctx) error { + idStr := c.Params("id") + id, err := strconv.ParseUint(idStr, 10, 64) + if err != nil { + return c.Status(responseErrors.GetErrorStatus(responseErrors.ErrBadAttribute)). + JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, responseErrors.ErrBadAttribute))) + } + + var pr model.SpecificPrice + if err := c.Bind().Body(&pr); err != nil { + return c.Status(responseErrors.GetErrorStatus(responseErrors.ErrInvalidBody)). + JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, responseErrors.ErrInvalidBody))) + } + + result, err := h.SpecificPriceService.Update(c.Context(), id, &pr) + if err != nil { + return c.Status(responseErrors.GetErrorStatus(err)). + JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, err))) + } + + return c.JSON(response.Make(&result, 1, i18n.T_(c, response.Message_OK))) +} + +func (h *SpecificPriceHandler) List(c fiber.Ctx) error { + result, err := h.SpecificPriceService.List(c.Context()) + if err != nil { + return c.Status(responseErrors.GetErrorStatus(err)). + JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, err))) + } + + return c.JSON(response.Make(&result, 1, i18n.T_(c, response.Message_OK))) +} + +func (h *SpecificPriceHandler) GetByID(c fiber.Ctx) error { + idStr := c.Params("id") + id, err := strconv.ParseUint(idStr, 10, 64) + if err != nil { + return c.Status(responseErrors.GetErrorStatus(responseErrors.ErrBadAttribute)). + JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, responseErrors.ErrBadAttribute))) + } + + result, err := h.SpecificPriceService.GetByID(c.Context(), id) + if err != nil { + return c.Status(responseErrors.GetErrorStatus(err)). + JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, err))) + } + + return c.JSON(response.Make(&result, 1, i18n.T_(c, response.Message_OK))) +} + +func (h *SpecificPriceHandler) Activate(c fiber.Ctx) error { + idStr := c.Params("id") + id, err := strconv.ParseUint(idStr, 10, 64) + if err != nil { + return c.Status(responseErrors.GetErrorStatus(responseErrors.ErrBadAttribute)). + JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, responseErrors.ErrBadAttribute))) + } + + err = h.SpecificPriceService.SetActive(c.Context(), id, true) + if err != nil { + return c.Status(responseErrors.GetErrorStatus(err)). + JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, err))) + } + + return c.JSON(response.Make(nullable.GetNil(""), 0, i18n.T_(c, response.Message_OK))) +} + +func (h *SpecificPriceHandler) Deactivate(c fiber.Ctx) error { + idStr := c.Params("id") + id, err := strconv.ParseUint(idStr, 10, 64) + if err != nil { + return c.Status(responseErrors.GetErrorStatus(responseErrors.ErrBadAttribute)). + JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, responseErrors.ErrBadAttribute))) + } + + err = h.SpecificPriceService.SetActive(c.Context(), id, false) + if err != nil { + return c.Status(responseErrors.GetErrorStatus(err)). + JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, err))) + } + + return c.JSON(response.Make(nullable.GetNil(""), 0, i18n.T_(c, response.Message_OK))) +} + +func (h *SpecificPriceHandler) Delete(c fiber.Ctx) error { + idStr := c.Params("id") + id, err := strconv.ParseUint(idStr, 10, 64) + if err != nil { + return c.Status(responseErrors.GetErrorStatus(responseErrors.ErrBadAttribute)). + JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, responseErrors.ErrBadAttribute))) + } + + err = h.SpecificPriceService.Delete(c.Context(), id) + if err != nil { + return c.Status(responseErrors.GetErrorStatus(err)). + JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, err))) + } + + return c.JSON(response.Make(nullable.GetNil(""), 0, i18n.T_(c, response.Message_OK))) +} diff --git a/app/delivery/web/api/restricted/storage.go b/app/delivery/web/api/restricted/storage.go index 910aae1..1a252b0 100644 --- a/app/delivery/web/api/restricted/storage.go +++ b/app/delivery/web/api/restricted/storage.go @@ -4,7 +4,8 @@ import ( "strconv" "git.ma-al.com/goc_daniel/b2b/app/config" - "git.ma-al.com/goc_daniel/b2b/app/model" + "git.ma-al.com/goc_daniel/b2b/app/delivery/middleware" + "git.ma-al.com/goc_daniel/b2b/app/delivery/middleware/perms" "git.ma-al.com/goc_daniel/b2b/app/service/storageService" "git.ma-al.com/goc_daniel/b2b/app/utils/i18n" "git.ma-al.com/goc_daniel/b2b/app/utils/localeExtractor" @@ -34,7 +35,7 @@ func StorageHandlerRoutes(r fiber.Router) fiber.Router { r.Get("/download-file/*", handler.DownloadFile) // for admins only - r.Get("/create-new-webdav-token", handler.CreateNewWebdavToken) + r.Get("/create-new-webdav-token", middleware.Require(perms.WebdavCreateToken), handler.CreateNewWebdavToken) return r } @@ -84,12 +85,6 @@ func (h *StorageHandler) CreateNewWebdavToken(c fiber.Ctx) error { JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, responseErrors.ErrInvalidBody))) } - userRole, ok := localeExtractor.GetOriginalUserRole(c) - if !ok || model.CustomerRole(userRole.Name) != model.RoleAdmin { - return c.Status(responseErrors.GetErrorStatus(responseErrors.ErrAdminAccessRequired)). - JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, responseErrors.ErrAdminAccessRequired))) - } - new_token, err := h.storageService.NewWebdavToken(userID) if err != nil { return c.Status(responseErrors.GetErrorStatus(err)). diff --git a/app/delivery/web/init.go b/app/delivery/web/init.go index eb7a4c3..8e6eac9 100644 --- a/app/delivery/web/init.go +++ b/app/delivery/web/init.go @@ -136,6 +136,9 @@ func (s *Server) Setup() error { orders := s.restricted.Group("/orders") restricted.OrdersHandlerRoutes(orders) + specificPrice := s.restricted.Group("/specific-price") + restricted.SpecificPriceHandlerRoutes(specificPrice) + // addresses (restricted) addresses := s.restricted.Group("/addresses") restricted.AddressesHandlerRoutes(addresses) @@ -163,16 +166,6 @@ func (s *Server) Setup() error { // }) // }) - // // Admin routes example - // admin := s.api.Group("/admin") - // admin.Use(middleware.AuthMiddleware()) - // admin.Use(middleware.RequireAdmin()) - // admin.Get("/users", func(c fiber.Ctx) error { - // return c.JSON(fiber.Map{ - // "message": "Admin area - user management", - // }) - // }) - // keep this at the end because its wilderange general.InitBo(s.App()) diff --git a/app/model/category.go b/app/model/category.go index 50e6ce9..8ba7ee1 100644 --- a/app/model/category.go +++ b/app/model/category.go @@ -10,7 +10,8 @@ type ScannedCategory struct { LinkRewrite string `gorm:"column:link_rewrite"` IsoCode string `gorm:"column:iso_code"` - Visited bool //this is for internal backend use only + Visited bool // this is for internal backend use only + Filter string // filter applicable to this category } type Category struct { @@ -25,6 +26,7 @@ type CategoryParams struct { CategoryID uint `json:"category_id" form:"category_id"` LinkRewrite string `json:"link_rewrite" form:"link_rewrite"` Locale string `json:"locale" form:"locale"` + Filter string `json:"filter" form:"filter"` } type CategoryInBreadcrumb struct { diff --git a/app/model/countries.go b/app/model/countries.go index 83600b5..43b4b42 100644 --- a/app/model/countries.go +++ b/app/model/countries.go @@ -1,15 +1,13 @@ package model -import "git.ma-al.com/goc_daniel/b2b/app/model/dbmodel" - // Represents a country together with its associated currency type Country struct { ID uint `gorm:"primaryKey;column:id" json:"id"` Name string `gorm:"column:name" json:"name"` Flag string `gorm:"size:16;not null;column:flag" json:"flag"` - PSCurrencyID uint `gorm:"column:currency_id" json:"currency_id"` - PSCurrency *dbmodel.PsCurrency `gorm:"foreignKey:PSCurrencyID;references:IDCurrency" json:"ps_currency"` + CurrencyID uint `gorm:"column:b2b_id_currency" json:"currency_id"` + Currency *Currency `gorm:"foreignKey:CurrencyID" json:"currency,omitempty"` } func (Country) TableName() string { diff --git a/app/model/customer.go b/app/model/customer.go index f79d282..cc4b9f1 100644 --- a/app/model/customer.go +++ b/app/model/customer.go @@ -31,6 +31,7 @@ type Customer struct { LastLoginAt *time.Time `json:"last_login_at,omitempty"` LangID uint `gorm:"default:2" json:"lang_id"` // User's preferred language CountryID uint `gorm:"default:2" json:"country_id"` // User's selected country + Country *Country `gorm:"foreignKey:CountryID" json:"country,omitempty"` CreatedAt time.Time `json:"created_at"` UpdatedAt time.Time `json:"updated_at"` DeletedAt gorm.DeletedAt `gorm:"index" json:"-"` diff --git a/app/model/product.go b/app/model/product.go index e862259..6595f79 100644 --- a/app/model/product.go +++ b/app/model/product.go @@ -1,76 +1,18 @@ package model -// Product contains each and every column from the table ps_product. -type Product struct { - ProductID uint `gorm:"column:id_product;primaryKey" json:"product_id" form:"product_id"` - SupplierID uint `gorm:"column:id_supplier" json:"supplier_id" form:"supplier_id"` - ManufacturerID uint `gorm:"column:id_manufacturer" json:"manufacturer_id" form:"manufacturer_id"` - CategoryDefaultID uint `gorm:"column:id_category_default" json:"category_default_id" form:"category_default_id"` - ShopDefaultID uint `gorm:"column:id_shop_default" json:"shop_default_id" form:"shop_default_id"` - TaxRulesGroupID uint `gorm:"column:id_tax_rules_group" json:"tax_rules_group_id" form:"tax_rules_group_id"` - OnSale uint `gorm:"column:on_sale" json:"on_sale" form:"on_sale"` - OnlineOnly uint `gorm:"column:online_only" json:"online_only" form:"online_only"` - EAN13 string `gorm:"column:ean13;type:varchar(13)" json:"ean13" form:"ean13"` - ISBN string `gorm:"column:isbn;type:varchar(32)" json:"isbn" form:"isbn"` - UPC string `gorm:"column:upc;type:varchar(12)" json:"upc" form:"upc"` - EkoTax float32 `gorm:"column:eko_tax;type:decimal(20,6)" json:"eko_tax" form:"eko_tax"` - Quantity uint `gorm:"column:quantity" json:"quantity" form:"quantity"` - MinimalQuantity uint `gorm:"column:minimal_quantity" json:"minimal_quantity" form:"minimal_quantity"` - LowStockThreshold uint `gorm:"column:low_stock_threshold" json:"low_stock_threshold" form:"low_stock_threshold"` - LowStockAlert uint `gorm:"column:low_stock_alert" json:"low_stock_alert" form:"low_stock_alert"` - Price float32 `gorm:"column:price;type:decimal(20,6)" json:"price" form:"price"` - WholesalePrice float32 `gorm:"column:wholesale_price;type:decimal(20,6)" json:"wholesale_price" form:"wholesale_price"` - Unity string `gorm:"column:unity;type:varchar(255)" json:"unity" form:"unity"` - UnitPriceRatio float32 `gorm:"column:unit_price_ratio;type:decimal(20,6)" json:"unit_price_ratio" form:"unit_price_ratio"` - UnitID uint `gorm:"column:id_unit;primaryKey" json:"unit_id" form:"unit_id"` - AdditionalShippingCost float32 `gorm:"column:additional_shipping_cost;type:decimal(20,2)" json:"additional_shipping_cost" form:"additional_shipping_cost"` - Reference string `gorm:"column:reference;type:varchar(64)" json:"reference" form:"reference"` - SupplierReference string `gorm:"column:supplier_reference;type:varchar(64)" json:"supplier_reference" form:"supplier_reference"` - Location string `gorm:"column:location;type:varchar(64)" json:"location" form:"location"` - - Width float32 `gorm:"column:width;type:decimal(20,6)" json:"width" form:"width"` - Height float32 `gorm:"column:height;type:decimal(20,6)" json:"height" form:"height"` - Depth float32 `gorm:"column:depth;type:decimal(20,6)" json:"depth" form:"depth"` - Weight float32 `gorm:"column:weight;type:decimal(20,6)" json:"weight" form:"weight"` - OutOfStock uint `gorm:"column:out_of_stock" json:"out_of_stock" form:"out_of_stock"` - AdditionalDeliveryTimes uint `gorm:"column:additional_delivery_times" json:"additional_delivery_times" form:"additional_delivery_times"` - QuantityDiscount uint `gorm:"column:quantity_discount" json:"quantity_discount" form:"quantity_discount"` - Customizable uint `gorm:"column:customizable" json:"customizable" form:"customizable"` - UploadableFiles uint `gorm:"column:uploadable_files" json:"uploadable_files" form:"uploadable_files"` - TextFields uint `gorm:"column:text_fields" json:"text_fields" form:"text_fields"` - - Active uint `gorm:"column:active" json:"active" form:"active"` - RedirectType string `gorm:"column:redirect_type;type:enum('','404','301-product','302-product','301-category','302-category')" json:"redirect_type" form:"redirect_type"` - TypeRedirectedID int `gorm:"column:id_type_redirected" json:"type_redirected_id" form:"type_redirected_id"` - AvailableForOrder uint `gorm:"column:available_for_order" json:"available_for_order" form:"available_for_order"` - AvailableDate string `gorm:"column:available_date;type:date" json:"available_date" form:"available_date"` - ShowCondition uint `gorm:"column:show_condition" json:"show_condition" form:"show_condition"` - Condition string `gorm:"column:condition;type:enum('new','used','refurbished')" json:"condition" form:"condition"` - ShowPrice uint `gorm:"column:show_price" json:"show_price" form:"show_price"` - - Indexed uint `gorm:"column:indexed" json:"indexed" form:"indexed"` - Visibility string `gorm:"column:visibility;type:enum('both','catalog','search','none')" json:"visibility" form:"visibility"` - CacheIsPack uint `gorm:"column:cache_is_pack" json:"cache_is_pack" form:"cache_is_pack"` - CacheHasAttachments uint `gorm:"column:cache_has_attachments" json:"cache_has_attachments" form:"cache_has_attachments"` - IsVirtual uint `gorm:"column:is_virtual" json:"is_virtual" form:"is_virtual"` - CacheDefaultAttribute uint `gorm:"column:cache_default_attribute" json:"cache_default_attribute" form:"cache_default_attribute"` - DateAdd string `gorm:"column:date_add;type:datetime" json:"date_add" form:"date_add"` - DateUpd string `gorm:"column:date_upd;type:datetime" json:"date_upd" form:"date_upd"` - AdvancedStockManagement uint `gorm:"column:advanced_stock_management" json:"advanced_stock_management" form:"advanced_stock_management"` - PackStockType uint `gorm:"column:pack_stock_type" json:"pack_stock_type" form:"pack_stock_type"` - State uint `gorm:"column:state" json:"state" form:"state"` - DeliveryDays uint `gorm:"column:delivery_days" json:"delivery_days" form:"delivery_days"` -} type ProductInList struct { - ProductID uint `gorm:"column:product_id" json:"product_id" form:"product_id"` - Name string `gorm:"column:name" json:"name" form:"name"` - LinkRewrite string `gorm:"column:link_rewrite" json:"link_rewrite"` - ImageLink string `gorm:"column:image_link" json:"image_link"` - CategoryName string `gorm:"column:category_name" json:"category_name" form:"category_name"` - Reference string `gorm:"column:reference" json:"reference"` - VariantsNumber uint `gorm:"column:variants_number" json:"variants_number"` - Quantity int64 `gorm:"column:quantity" json:"quantity"` - IsFavorite bool `gorm:"column:is_favorite" json:"is_favorite"` + ProductID uint `gorm:"column:product_id" json:"product_id" form:"product_id"` + Name string `gorm:"column:name" json:"name" form:"name"` + LinkRewrite string `gorm:"column:link_rewrite" json:"link_rewrite"` + ImageLink string `gorm:"column:image_link" json:"image_link"` + CategoryName string `gorm:"column:category_name" json:"category_name" form:"category_name"` + Reference string `gorm:"column:reference" json:"reference"` + VariantsNumber uint `gorm:"column:variants_number" json:"variants_number"` + Quantity int64 `gorm:"column:quantity" json:"quantity"` + PriceTaxExcl float64 `gorm:"column:price_tax_excl" json:"price_tax_excl"` + PriceTaxIncl float64 `gorm:"column:price_tax_incl" json:"price_tax_incl"` + IsFavorite bool `gorm:"column:is_favorite" json:"is_favorite"` + IsNew uint `gorm:"column:is_new" json:"is_new"` } type ProductFilters struct { diff --git a/app/model/specificPrice.go b/app/model/specificPrice.go new file mode 100644 index 0000000..46746f2 --- /dev/null +++ b/app/model/specificPrice.go @@ -0,0 +1,29 @@ +package model + +import "time" + +type SpecificPrice struct { + ID uint64 `gorm:"primaryKey;autoIncrement" json:"id"` + Name string `gorm:"type:varchar(255);not null" json:"name"` + ValidFrom *time.Time `gorm:"null" json:"valid_from"` + ValidTill *time.Time `gorm:"null" json:"valid_till"` + HasExpirationDate bool `gorm:"default:false" json:"has_expiration_date"` + ReductionType string `gorm:"type:enum('amount','percentage');not null" json:"reduction_type"` + Price *float64 `gorm:"type:decimal(10,2);null" json:"price"` + CurrencyID *uint64 `gorm:"column:b2b_id_currency;null" json:"currency_id"` + PercentageReduction *float64 `gorm:"type:decimal(5,2);null" json:"percentage_reduction"` + FromQuantity uint32 `gorm:"default:1" json:"from_quantity"` + IsActive bool `gorm:"default:true" json:"is_active"` + CreatedAt *time.Time `gorm:"null" json:"created_at"` + UpdatedAt *time.Time `gorm:"null" json:"updated_at"` + + ProductIDs []uint64 `gorm:"-" json:"product_ids"` + CategoryIDs []uint64 `gorm:"-" json:"category_ids"` + ProductAttributeIDs []uint64 `gorm:"-" json:"product_attribute_ids"` + CountryIDs []uint64 `gorm:"-" json:"country_ids"` + CustomerIDs []uint64 `gorm:"-" json:"customer_ids"` +} + +func (SpecificPrice) TableName() string { + return "b2b_specific_price" +} diff --git a/app/repos/categoriesRepo/categoriesRepo.go b/app/repos/categoriesRepo/categoriesRepo.go deleted file mode 100644 index 955292a..0000000 --- a/app/repos/categoriesRepo/categoriesRepo.go +++ /dev/null @@ -1,48 +0,0 @@ -package categoriesRepo - -import ( - "git.ma-al.com/goc_daniel/b2b/app/db" - "git.ma-al.com/goc_daniel/b2b/app/model" - "git.ma-al.com/goc_daniel/b2b/app/model/dbmodel" - constdata "git.ma-al.com/goc_daniel/b2b/app/utils/const_data" -) - -type UICategoriesRepo interface { - GetAllCategories(idLang uint) ([]model.ScannedCategory, error) -} - -type CategoriesRepo struct{} - -func New() UICategoriesRepo { - return &CategoriesRepo{} -} - -func (r *CategoriesRepo) GetAllCategories(idLang uint) ([]model.ScannedCategory, error) { - var allCategories []model.ScannedCategory - - categoryTbl := (&dbmodel.PsCategory{}).TableName() - categoryLangTbl := (&dbmodel.PsCategoryLang{}).TableName() - categoryShopTbl := (&dbmodel.PsCategoryShop{}).TableName() - langTbl := (&dbmodel.PsLang{}).TableName() - - err := db.Get(). - Model(dbmodel.PsCategory{}). - Select(` - ps_category.id_category AS category_id, - ps_category_lang.name AS name, - ps_category.active AS active, - ps_category_shop.position AS position, - ps_category.id_parent AS id_parent, - ps_category.is_root_category AS is_root_category, - ps_category_lang.link_rewrite AS link_rewrite, - ps_lang.iso_code AS iso_code - `). - Joins(`LEFT JOIN `+categoryLangTbl+` ON `+categoryLangTbl+`.id_category = `+categoryTbl+`.id_category AND `+categoryLangTbl+`.id_shop = ? AND `+categoryLangTbl+`.id_lang = ?`, - constdata.SHOP_ID, idLang). - Joins(`LEFT JOIN `+categoryShopTbl+` ON `+categoryShopTbl+`.id_category = `+categoryTbl+`.id_category AND `+categoryShopTbl+`.id_shop = ?`, - constdata.SHOP_ID). - Joins(`JOIN ` + langTbl + ` ON ` + langTbl + `.id_lang = ` + categoryLangTbl + `.id_lang`). - Scan(&allCategories).Error - - return allCategories, err -} diff --git a/app/repos/categoryRepo/categoryRepo.go b/app/repos/categoryRepo/categoryRepo.go index dd31f39..086cfcf 100644 --- a/app/repos/categoryRepo/categoryRepo.go +++ b/app/repos/categoryRepo/categoryRepo.go @@ -2,11 +2,14 @@ package categoryrepo import ( "git.ma-al.com/goc_daniel/b2b/app/db" + "git.ma-al.com/goc_daniel/b2b/app/model" "git.ma-al.com/goc_daniel/b2b/app/model/dbmodel" + constdata "git.ma-al.com/goc_daniel/b2b/app/utils/const_data" ) type UICategoryRepo interface { GetCategoryTranslations(ids []uint, idLang uint) (map[uint]string, error) + RetrieveMenuCategories(idLang uint) ([]model.ScannedCategory, error) } type CategoryRepo struct{} @@ -42,3 +45,33 @@ func (r *CategoryRepo) GetCategoryTranslations(ids []uint, idLang uint) (map[uin return translations, nil } + +func (r *CategoryRepo) RetrieveMenuCategories(idLang uint) ([]model.ScannedCategory, error) { + var allCategories []model.ScannedCategory + + categoryTbl := (&dbmodel.PsCategory{}).TableName() + categoryLangTbl := (&dbmodel.PsCategoryLang{}).TableName() + categoryShopTbl := (&dbmodel.PsCategoryShop{}).TableName() + langTbl := (&dbmodel.PsLang{}).TableName() + + err := db.Get(). + Model(dbmodel.PsCategory{}). + Select(` + ps_category.id_category AS category_id, + ps_category_lang.name AS name, + ps_category.active AS active, + ps_category_shop.position AS position, + ps_category.id_parent AS id_parent, + ps_category.is_root_category AS is_root_category, + ps_category_lang.link_rewrite AS link_rewrite, + ps_lang.iso_code AS iso_code + `). + Joins(`LEFT JOIN `+categoryLangTbl+` ON `+categoryLangTbl+`.id_category = `+categoryTbl+`.id_category AND `+categoryLangTbl+`.id_shop = ? AND `+categoryLangTbl+`.id_lang = ?`, + constdata.SHOP_ID, idLang). + Joins(`LEFT JOIN `+categoryShopTbl+` ON `+categoryShopTbl+`.id_category = `+categoryTbl+`.id_category AND `+categoryShopTbl+`.id_shop = ?`, + constdata.SHOP_ID). + Joins(`JOIN ` + langTbl + ` ON ` + langTbl + `.id_lang = ` + categoryLangTbl + `.id_lang`). + Scan(&allCategories).Error + + return allCategories, err +} diff --git a/app/repos/productDescriptionRepo/productDescriptionRepo.go b/app/repos/productDescriptionRepo/productDescriptionRepo.go index 5083a42..b6eda1e 100644 --- a/app/repos/productDescriptionRepo/productDescriptionRepo.go +++ b/app/repos/productDescriptionRepo/productDescriptionRepo.go @@ -9,7 +9,6 @@ import ( "git.ma-al.com/goc_daniel/b2b/app/model" "git.ma-al.com/goc_daniel/b2b/app/model/dbmodel" constdata "git.ma-al.com/goc_daniel/b2b/app/utils/const_data" - "github.com/WinterYukky/gorm-extra-clause-plugin/exclause" "gorm.io/gorm" ) @@ -17,7 +16,6 @@ type UIProductDescriptionRepo interface { GetProductDescription(productID uint, productid_lang uint) (*model.ProductDescription, error) CreateIfDoesNotExist(productID uint, productid_lang uint) error UpdateFields(productID uint, productid_lang uint, updates map[string]string) error - GetMeiliProducts(id_lang uint, offset, limit int) ([]model.MeiliSearchProduct, error) } type ProductDescriptionRepo struct{} @@ -118,108 +116,3 @@ func (r *ProductDescriptionRepo) UpdateFields(productID uint, productid_lang uin return nil } - -// GetMeiliProductsBatchedScanned returns a batch of products with LIMIT/OFFSET pagination -// The scanning is done inside the repo to keep the service layer cleaner -func (r *ProductDescriptionRepo) GetMeiliProducts(id_lang uint, offset, limit int) ([]model.MeiliSearchProduct, error) { - - var products []model.MeiliSearchProduct - - err := db.Get(). - Table("ps_product_shop ps"). - Select(` - ps.id_product AS id_product, - pl.name AS name, - TRIM(REGEXP_REPLACE(REGEXP_REPLACE(pl.description_short, '<[^>]*>', ' '), '[[:space:]]+', ' ')) AS description, - p.ean13, - p.reference, - ps.price, - ps.id_category_default AS id_category, - cl.name AS cat_name, - cl.link_rewrite AS l_rew, - COALESCE(vary.attributes, JSON_OBJECT()) AS attr, - COALESCE(feat.features, JSON_OBJECT()) AS feat, - img.id_image, - cat.category_ids, - (SELECT COUNT(*) FROM ps_product_attribute_shop pas2 WHERE pas2.id_product = ps.id_product AND pas2.id_shop = ?) AS variations - `, constdata.SHOP_ID). - Joins("JOIN ps_product p ON p.id_product = ps.id_product"). - Joins("JOIN ps_product_lang pl ON pl.id_product = ps.id_product AND pl.id_shop = ? AND pl.id_lang = ?", constdata.SHOP_ID, id_lang). - Joins("JOIN ps_category_lang cl ON cl.id_category = ps.id_category_default AND cl.id_shop = ? AND cl.id_lang = ?", constdata.SHOP_ID, id_lang). - Joins("LEFT JOIN variations vary ON vary.id_product = ps.id_product"). - Joins("LEFT JOIN features feat ON feat.id_product = ps.id_product"). - Joins("LEFT JOIN images img ON img.id_product = ps.id_product"). - Joins("LEFT JOIN categories cat ON cat.id_product = ps.id_product"). - Joins("JOIN products_page pp ON pp.id_product = ps.id_product"). - Where("ps.active = ?", 1). - Order("ps.id_product"). - Clauses(exclause.With{CTEs: []exclause.CTE{ - { - Name: "products_page", - Subquery: exclause.Subquery{ - DB: db.Get(). - Model(&dbmodel.PsProductShop{}). - Select("id_product, price"). - Where("id_shop = ? AND active = 1", constdata.SHOP_ID). - Order("id_product"). - Limit(limit). - Offset(offset), - }, - }, - { - Name: "variation_attributes", - Subquery: exclause.Subquery{ - DB: db.Get(). - Table("ps_product_attribute_shop pas"). // <- explicit alias here - Select(` - pas.id_product, - pag.id_attribute_group AS attribute_name, - JSON_ARRAYAGG(DISTINCT pa.id_attribute) AS attribute_values - `). - Joins("JOIN ps_product_attribute_combination ppac ON ppac.id_product_attribute = pas.id_product_attribute"). - Joins("JOIN ps_attribute pa ON pa.id_attribute = ppac.id_attribute"). - Joins("JOIN ps_attribute_group pag ON pag.id_attribute_group = pa.id_attribute_group"). - Where("pas.id_shop = ?", constdata.SHOP_ID). - Group("pas.id_product, pag.id_attribute_group"), - }, - }, - { - Name: "variations", - Subquery: exclause.Subquery{ - DB: db.Get(). - Table("variation_attributes"). - Select("id_product, JSON_OBJECTAGG(attribute_name, attribute_values) AS attributes"). - Group("id_product"), - }, - }, - { - Name: "features", - Subquery: exclause.Subquery{ - DB: db.Get(). - Table("ps_feature_product pfp"). // <- explicit alias - Select("pfp.id_product, JSON_OBJECTAGG(pfp.id_feature, pfp.id_feature_value) AS features"). - Group("pfp.id_product"), - }, - }, - { - Name: "images", - Subquery: exclause.Subquery{ - DB: db.Get(). - Model(&dbmodel.PsImageShop{}). - Select("id_product, id_image"). - Where("id_shop = ? AND cover = 1", constdata.SHOP_ID), - }, - }, - { - Name: "categories", - Subquery: exclause.Subquery{ - DB: db.Get(). - Model(&dbmodel.PsCategoryProduct{}). - Select("id_product, JSON_ARRAYAGG(id_category) AS category_ids"). - Group("id_product"), - }, - }, - }}).Find(&products).Error - - return products, err -} diff --git a/app/repos/productsRepo/productsRepo.go b/app/repos/productsRepo/productsRepo.go index 4450b52..344b7a8 100644 --- a/app/repos/productsRepo/productsRepo.go +++ b/app/repos/productsRepo/productsRepo.go @@ -2,7 +2,6 @@ package productsRepo import ( "encoding/json" - "fmt" "git.ma-al.com/goc_daniel/b2b/app/config" "git.ma-al.com/goc_daniel/b2b/app/db" @@ -10,13 +9,18 @@ import ( "git.ma-al.com/goc_daniel/b2b/app/model/dbmodel" "git.ma-al.com/goc_daniel/b2b/app/utils/query/filters" "git.ma-al.com/goc_daniel/b2b/app/utils/query/find" + "git.ma-al.com/goc_daniel/b2b/app/view" "git.ma-al.com/goc_marek/gormcol" "github.com/WinterYukky/gorm-extra-clause-plugin/exclause" ) type UIProductsRepo interface { - GetJSON(p_id_product, p_id_shop, p_id_lang, p_id_customer, b2b_id_country, p_quantity int) (*json.RawMessage, error) - Find(id_lang, userID uint, p find.Paging, filt *filters.FiltersList) (find.Found[model.ProductInList], error) + // GetJSON(p_id_product, p_id_shop, p_id_lang, p_id_customer, b2b_id_country, p_quantity int) (*json.RawMessage, error) + Find(id_lang uint, userID uint, p find.Paging, filt *filters.FiltersList) (*find.Found[model.ProductInList], error) + GetProductVariants(langID uint, productID uint, shopID uint, customerID uint, countryID uint, quantity uint) ([]view.ProductAttribute, error) + GetBase(p_id_product, p_id_shop, p_id_lang uint) (view.Product, error) + GetPrice(p_id_product uint, productAttributeID *uint, p_id_shop uint, p_id_customer uint, p_id_country uint, p_quantity uint) (view.Price, error) + GetVariants(p_id_product, p_id_shop, p_id_lang, p_id_customer, p_id_country, p_quantity uint) ([]view.ProductAttribute, error) AddToFavorites(userID uint, productID uint) error RemoveFromFavorites(userID uint, productID uint) error ExistsInFavorites(userID uint, productID uint) (bool, error) @@ -29,105 +33,221 @@ func New() UIProductsRepo { return &ProductsRepo{} } -func (repo *ProductsRepo) GetJSON(p_id_product, p_id_shop, p_id_lang, p_id_customer, b2b_id_country, p_quantity int) (*json.RawMessage, error) { - var productStr string // ← Scan as string first +func (repo *ProductsRepo) GetBase(p_id_product, p_id_shop, p_id_lang uint) (view.Product, error) { + var result view.Product - err := db.DB.Raw(`CALL get_full_product(?,?,?,?,?,?)`, - p_id_product, p_id_shop, p_id_lang, p_id_customer, b2b_id_country, p_quantity). - Scan(&productStr). - Error + err := db.DB.Raw(`CALL get_product_base(?,?,?)`, + p_id_product, p_id_shop, p_id_lang). + Scan(&result).Error - if err != nil { - return nil, err - } - - if !json.Valid([]byte(productStr)) { - return nil, fmt.Errorf("invalid json returned from stored procedure") - } - - raw := json.RawMessage(productStr) - return &raw, nil + return result, err } -func (repo *ProductsRepo) Find(id_lang, userID uint, p find.Paging, filt *filters.FiltersList) (find.Found[model.ProductInList], error) { - var list []model.ProductInList - var total int64 +func (repo *ProductsRepo) GetPrice( + p_id_product uint, productAttributeID *uint, p_id_shop uint, p_id_customer uint, p_id_country uint, p_quantity uint, +) (view.Price, error) { - query := db.Get(). - Table(gormcol.Field.Tab(dbmodel.PsProductShopCols.Active)+" AS ps"). - Select(` - ps.id_product AS product_id, - pl.name AS name, - pl.link_rewrite AS link_rewrite, - CONCAT(?, '/', ims.id_image, '-small_default/', pl.link_rewrite, '.webp') AS image_link, - cl.name AS category_name, - p.reference AS reference, - COALESCE(v.variants_number, 0) AS variants_number, - sa.quantity AS quantity, - COALESCE(f.is_favorite, 0) AS is_favorite - `, config.Get().Image.ImagePrefix). - Joins("JOIN "+dbmodel.PsProductCols.IDProduct.Tab()+" p ON p.id_product = ps.id_product"). - Joins("JOIN ps_product_lang pl ON pl.id_product = ps.id_product AND pl.id_lang = ?", id_lang). - Joins("JOIN ps_image_shop ims ON ims.id_product = ps.id_product AND ims.cover = 1"). - Joins("JOIN ps_category_lang cl ON cl.id_category = ps.id_category_default AND cl.id_lang = ?", id_lang). - Joins("JOIN ps_category_product cp ON cp.id_product = ps.id_product"). - Joins("LEFT JOIN variants v ON v.id_product = ps.id_product"). - Joins("LEFT JOIN favorites f ON f.id_product = ps.id_product"). - Joins("LEFT JOIN ps_stock_available sa ON sa.id_product = ps.id_product AND sa.id_product_attribute = 0"). - Where("ps.active = ?", 1). - Group("ps.id_product"). + type row struct { + Price json.RawMessage `gorm:"column:price"` + } + + var r row + err := db.DB.Raw(` + SELECT fn_product_price(?,?,?,?,?,?) AS price`, + p_id_product, p_id_shop, p_id_customer, p_id_country, p_quantity, productAttributeID). + Scan(&r).Error + + if err != nil { + return view.Price{}, err + } + + var temp struct { + Base json.Number `json:"base"` + FinalTaxExcl json.Number `json:"final_tax_excl"` + FinalTaxIncl json.Number `json:"final_tax_incl"` + TaxRate json.Number `json:"tax_rate"` + Priority json.Number `json:"priority"` + } + + if err := json.Unmarshal(r.Price, &temp); err != nil { + return view.Price{}, err + } + + price := view.Price{ + Base: mustParseFloat(temp.Base), + FinalTaxExcl: mustParseFloat(temp.FinalTaxExcl), + FinalTaxIncl: mustParseFloat(temp.FinalTaxIncl), + TaxRate: mustParseFloat(temp.TaxRate), + Priority: mustParseInt(temp.Priority), + } + + return price, nil +} +func mustParseFloat(n json.Number) float64 { + f, _ := n.Float64() + return f +} + +func mustParseInt(n json.Number) int { + i, _ := n.Int64() + return int(i) +} +func (repo *ProductsRepo) GetVariants(p_id_product, p_id_shop, p_id_lang, p_id_customer, p_id_country, p_quantity uint) ([]view.ProductAttribute, error) { + + var results []view.ProductAttribute + + err := db.DB.Raw(` + CALL get_product_variants(?,?,?,?,?,?)`, + p_id_product, p_id_shop, p_id_lang, p_id_customer, p_id_country, p_quantity). + Scan(&results).Error + + return results, err +} + +func (repo *ProductsRepo) Find(langID uint, userID uint, p find.Paging, filt *filters.FiltersList) (*find.Found[model.ProductInList], error) { + query := db.DB. + Table("base_products AS bp"). Clauses(exclause.With{ CTEs: []exclause.CTE{ - { - Name: "variants", - Subquery: exclause.Subquery{ - DB: db.Get(). - Model(&dbmodel.PsProductAttributeShop{}). - Select("id_product", "COUNT(*) AS variants_number"). - Group("id_product"), - }, - }, - { Name: "favorites", Subquery: exclause.Subquery{ - DB: db.Get(). + DB: db.DB. Table("b2b_favorites"). Select(` - product_id AS id_product, + product_id AS product_id, COUNT(*) > 0 AS is_favorite `). Where("user_id = ?", userID). Group("product_id"), }, }, + { + Name: "new_product_days", + Subquery: exclause.Subquery{ + DB: db.DB. + Table("ps_configuration"). + Select("CAST(value AS SIGNED) AS days"). + Where("name = ?", "PS_NB_DAYS_NEW_PRODUCT"), + }, + }, + { + Name: "variants", + Subquery: exclause.Subquery{ + DB: db.DB. + Table("ps_product_attribute_shop"). + Select("id_product, COUNT(*) AS variants_number"). + Group("id_product"), + }, + }, + { + Name: "base_products", + Subquery: exclause.Subquery{ + DB: db.DB. + Table(gormcol.Field.Tab(dbmodel.PsProductShopCols.Active)+" AS ps"). + Select(` + ps.id_product AS product_id, + pl.name AS name, + ps.id_category_default AS category_id, + p.reference AS reference, + sa.quantity AS quantity, + COALESCE(f.is_favorite, 0) AS is_favorite, + CASE + WHEN ps.date_add >= DATE_SUB( + NOW(), + INTERVAL COALESCE(npd.days, 20) DAY + ) AND ps.active = 1 + THEN 1 + ELSE 0 + END AS is_new + `). + Joins("JOIN "+dbmodel.PsProductCols.IDProduct.Tab()+" p ON p.id_product = ps.id_product"). + Joins("JOIN ps_product_lang pl ON pl.id_product = ps.id_product AND pl.id_lang = ?", langID). + Joins("LEFT JOIN favorites f ON f.product_id = ps.id_product"). + Joins("LEFT JOIN ps_stock_available sa ON sa.id_product = ps.id_product AND sa.id_product_attribute = 0"). + Joins("LEFT JOIN new_product_days npd ON 1 = 1"). + Where("ps.active = ?", 1). + Group("ps.id_product"), + }, + }, }, }). - Order("ps.id_product DESC") + Select(` + bp.product_id AS product_id, + bp.name AS name, + pl.link_rewrite AS link_rewrite, + CONCAT(?, '/', ims.id_image, '-small_default/', pl.link_rewrite, '.webp') AS image_link, + cl.name AS category_name, + bp.reference AS reference, + COALESCE(v.variants_number, 0) AS variants_number, + bp.quantity AS quantity, + bp.is_favorite AS is_favorite, + bp.is_new AS is_new + `, config.Get().Image.ImagePrefix). + Joins("JOIN ps_product_lang pl ON pl.id_product = bp.product_id AND pl.id_lang = ?", langID). + Joins("JOIN ps_image_shop ims ON ims.id_product = bp.product_id AND ims.cover = 1"). + Joins("JOIN ps_category_lang cl ON cl.id_category = bp.category_id AND cl.id_lang = ?", langID). + Joins("LEFT JOIN variants v ON v.id_product = bp.product_id"). + Order("bp.product_id DESC") - // Apply all filters - if filt != nil { - filt.ApplyAll(query) - } + query = query.Scopes(filt.All()...) - // run counter first as query is without limit and offset - err := query.Count(&total).Error + list, err := find.Paginate[model.ProductInList](langID, p, query) if err != nil { - return find.Found[model.ProductInList]{}, err + return nil, err } + return &list, nil +} + +func (repo *ProductsRepo) GetProductVariants(langID uint, productID uint, shopID uint, customerID uint, countryID uint, quantity uint) ([]view.ProductAttribute, error) { + var result []view.ProductAttribute + err := db.DB. + Raw(` + CALL get_product_attributes_with_price(?, ?, ?, ?, ?, ?) + `, + langID, + productID, + shopID, + customerID, + countryID, + quantity, + ). + Scan(&result).Error - err = query. - Limit(p.Limit()). - Offset(p.Offset()). - Find(&list).Error if err != nil { - return find.Found[model.ProductInList]{}, err + return nil, err } - return find.Found[model.ProductInList]{ - Items: list, - Count: uint(total), - }, nil + return result, nil +} + +func (repo *ProductsRepo) PopulateProductPrice(product *model.ProductInList, targetCustomer *model.Customer, quantity int, shopID uint) error { + row := db.Get().Raw( + "CALL get_product_price(?, ?, ?, ?, ?)", + product.ProductID, + shopID, + targetCustomer.ID, + targetCustomer.CountryID, + quantity, + ).Row() + + var ( + id uint + base float64 + excl float64 + incl float64 + tax float64 + ) + + err := row.Scan(&id, &base, &excl, &incl, &tax) + if err != nil { + return err + } + + product.PriceTaxExcl = excl + product.PriceTaxIncl = incl + return nil + } func (repo *ProductsRepo) AddToFavorites(userID uint, productID uint) error { diff --git a/app/repos/searchRepo/searchRepo.go b/app/repos/searchRepo/searchRepo.go index de4d5ea..d8b56ba 100644 --- a/app/repos/searchRepo/searchRepo.go +++ b/app/repos/searchRepo/searchRepo.go @@ -7,7 +7,11 @@ import ( "net/http" "git.ma-al.com/goc_daniel/b2b/app/config" + "git.ma-al.com/goc_daniel/b2b/app/db" "git.ma-al.com/goc_daniel/b2b/app/model" + "git.ma-al.com/goc_daniel/b2b/app/model/dbmodel" + constdata "git.ma-al.com/goc_daniel/b2b/app/utils/const_data" + "github.com/WinterYukky/gorm-extra-clause-plugin/exclause" ) type SearchProxyResponse struct { @@ -17,6 +21,7 @@ type SearchProxyResponse struct { type UISearchRepo interface { Search(index string, body []byte) (*SearchProxyResponse, error) + GetMeiliProducts(id_lang uint, offset, limit int) ([]model.MeiliSearchProduct, error) GetIndexSettings(index string) (*SearchProxyResponse, error) GetRoutes(langId uint) ([]model.Route, error) } @@ -80,3 +85,108 @@ func (r *SearchRepo) doRequest(method, url string, body []byte) (*SearchProxyRes func (r *SearchRepo) GetRoutes(langId uint) ([]model.Route, error) { return nil, nil } + +// GetMeiliProductsProducts returns a batch of products with LIMIT/OFFSET pagination +// The scanning is done inside the repo to keep the service layer cleaner +func (r *SearchRepo) GetMeiliProducts(id_lang uint, offset, limit int) ([]model.MeiliSearchProduct, error) { + + var products []model.MeiliSearchProduct + + err := db.Get(). + Table("ps_product_shop ps"). + Select(` + ps.id_product AS id_product, + pl.name AS name, + TRIM(REGEXP_REPLACE(REGEXP_REPLACE(pl.description_short, '<[^>]*>', ' '), '[[:space:]]+', ' ')) AS description, + p.ean13, + p.reference, + ps.price, + ps.id_category_default AS id_category, + cl.name AS cat_name, + cl.link_rewrite AS l_rew, + COALESCE(vary.attributes, JSON_OBJECT()) AS attr, + COALESCE(feat.features, JSON_OBJECT()) AS feat, + img.id_image, + cat.category_ids, + (SELECT COUNT(*) FROM ps_product_attribute_shop pas2 WHERE pas2.id_product = ps.id_product AND pas2.id_shop = ?) AS variations + `, constdata.SHOP_ID). + Joins("JOIN ps_product p ON p.id_product = ps.id_product"). + Joins("JOIN ps_product_lang pl ON pl.id_product = ps.id_product AND pl.id_shop = ? AND pl.id_lang = ?", constdata.SHOP_ID, id_lang). + Joins("JOIN ps_category_lang cl ON cl.id_category = ps.id_category_default AND cl.id_shop = ? AND cl.id_lang = ?", constdata.SHOP_ID, id_lang). + Joins("LEFT JOIN variations vary ON vary.id_product = ps.id_product"). + Joins("LEFT JOIN features feat ON feat.id_product = ps.id_product"). + Joins("LEFT JOIN images img ON img.id_product = ps.id_product"). + Joins("LEFT JOIN categories cat ON cat.id_product = ps.id_product"). + Joins("JOIN products_page pp ON pp.id_product = ps.id_product"). + Where("ps.active = ?", 1). + Order("ps.id_product"). + Clauses(exclause.With{CTEs: []exclause.CTE{ + { + Name: "products_page", + Subquery: exclause.Subquery{ + DB: db.Get(). + Model(&dbmodel.PsProductShop{}). + Select("id_product, price"). + Where("id_shop = ? AND active = 1", constdata.SHOP_ID). + Order("id_product"). + Limit(limit). + Offset(offset), + }, + }, + { + Name: "variation_attributes", + Subquery: exclause.Subquery{ + DB: db.Get(). + Table("ps_product_attribute_shop pas"). // <- explicit alias here + Select(` + pas.id_product, + pag.id_attribute_group AS attribute_name, + JSON_ARRAYAGG(DISTINCT pa.id_attribute) AS attribute_values + `). + Joins("JOIN ps_product_attribute_combination ppac ON ppac.id_product_attribute = pas.id_product_attribute"). + Joins("JOIN ps_attribute pa ON pa.id_attribute = ppac.id_attribute"). + Joins("JOIN ps_attribute_group pag ON pag.id_attribute_group = pa.id_attribute_group"). + Where("pas.id_shop = ?", constdata.SHOP_ID). + Group("pas.id_product, pag.id_attribute_group"), + }, + }, + { + Name: "variations", + Subquery: exclause.Subquery{ + DB: db.Get(). + Table("variation_attributes"). + Select("id_product, JSON_OBJECTAGG(attribute_name, attribute_values) AS attributes"). + Group("id_product"), + }, + }, + { + Name: "features", + Subquery: exclause.Subquery{ + DB: db.Get(). + Table("ps_feature_product pfp"). // <- explicit alias + Select("pfp.id_product, JSON_OBJECTAGG(pfp.id_feature, pfp.id_feature_value) AS features"). + Group("pfp.id_product"), + }, + }, + { + Name: "images", + Subquery: exclause.Subquery{ + DB: db.Get(). + Model(&dbmodel.PsImageShop{}). + Select("id_product, id_image"). + Where("id_shop = ? AND cover = 1", constdata.SHOP_ID), + }, + }, + { + Name: "categories", + Subquery: exclause.Subquery{ + DB: db.Get(). + Model(&dbmodel.PsCategoryProduct{}). + Select("id_product, JSON_ARRAYAGG(id_category) AS category_ids"). + Group("id_product"), + }, + }, + }}).Find(&products).Error + + return products, err +} diff --git a/app/repos/specificPriceRepo/specificPriceRepo.go b/app/repos/specificPriceRepo/specificPriceRepo.go new file mode 100644 index 0000000..e67749b --- /dev/null +++ b/app/repos/specificPriceRepo/specificPriceRepo.go @@ -0,0 +1,247 @@ +package specificPriceRepo + +import ( + "context" + "errors" + "time" + + "git.ma-al.com/goc_daniel/b2b/app/db" + "git.ma-al.com/goc_daniel/b2b/app/model" + "gorm.io/gorm" +) + +type UISpecificPriceRepo interface { + Create(ctx context.Context, pr *model.SpecificPrice) error + Update(ctx context.Context, pr *model.SpecificPrice) error + Delete(ctx context.Context, id uint64) error + GetByID(ctx context.Context, id uint64) (*model.SpecificPrice, error) + List(ctx context.Context) ([]*model.SpecificPrice, error) + SetActive(ctx context.Context, id uint64, active bool) error +} + +type SpecificPriceRepo struct{} + +func New() UISpecificPriceRepo { + return &SpecificPriceRepo{} +} + +func (repo *SpecificPriceRepo) Create(ctx context.Context, pr *model.SpecificPrice) error { + return db.DB.WithContext(ctx).Transaction(func(tx *gorm.DB) error { + now := time.Now() + pr.CreatedAt = &now + + if err := tx.Create(pr).Error; err != nil { + return err + } + + return repo.insertRelations(tx, pr) + }) +} + +func (repo *SpecificPriceRepo) Update(ctx context.Context, pr *model.SpecificPrice) error { + return db.DB.WithContext(ctx).Transaction(func(tx *gorm.DB) error { + now := time.Now() + pr.UpdatedAt = &now + + if err := tx.Save(pr).Error; err != nil { + return err + } + + if err := repo.clearRelations(tx, pr.ID); err != nil { + return err + } + + return repo.insertRelations(tx, pr) + }) +} + +func (repo *SpecificPriceRepo) GetByID(ctx context.Context, id uint64) (*model.SpecificPrice, error) { + var pr model.SpecificPrice + err := db.DB.WithContext(ctx).Where("id = ?", id).First(&pr).Error + if err != nil { + if errors.Is(err, gorm.ErrRecordNotFound) { + return nil, nil + } + return nil, err + } + + if err := repo.loadRelations(ctx, &pr); err != nil { + return nil, err + } + + return &pr, nil +} + +func (repo *SpecificPriceRepo) List(ctx context.Context) ([]*model.SpecificPrice, error) { + var specificPrices []*model.SpecificPrice + err := db.DB.WithContext(ctx).Find(&specificPrices).Error + if err != nil { + return nil, err + } + + for i := range specificPrices { + if err := repo.loadRelations(ctx, specificPrices[i]); err != nil { + return nil, err + } + } + + return specificPrices, nil +} + +func (repo *SpecificPriceRepo) SetActive(ctx context.Context, id uint64, active bool) error { + return db.DB.WithContext(ctx).Model(&model.SpecificPrice{}).Where("id = ?", id).Update("is_active", active).Error +} + +func (repo *SpecificPriceRepo) Delete(ctx context.Context, id uint64) error { + return db.DB.WithContext(ctx).Transaction(func(tx *gorm.DB) error { + if err := tx.Exec("DELETE FROM b2b_specific_price_product WHERE b2b_specific_price_id = ?", id).Error; err != nil { + return err + } + if err := tx.Exec("DELETE FROM b2b_specific_price_category WHERE b2b_specific_price_id = ?", id).Error; err != nil { + return err + } + if err := tx.Exec("DELETE FROM b2b_specific_price_product_attribute WHERE b2b_specific_price_id = ?", id).Error; err != nil { + return err + } + if err := tx.Exec("DELETE FROM b2b_specific_price_country WHERE b2b_specific_price_id = ?", id).Error; err != nil { + return err + } + if err := tx.Exec("DELETE FROM b2b_specific_price_customer WHERE b2b_specific_price_id = ?", id).Error; err != nil { + return err + } + if err := tx.Delete(&model.SpecificPrice{}, "id = ?", id).Error; err != nil { + return err + } + return nil + }) +} + +func (repo *SpecificPriceRepo) insertRelations(tx *gorm.DB, pr *model.SpecificPrice) error { + if len(pr.ProductIDs) > 0 { + for _, productID := range pr.ProductIDs { + if err := tx.Exec(` + INSERT INTO b2b_specific_price_product (b2b_specific_price_id, id_product) VALUES (?, ?) + `, pr.ID, productID).Error; err != nil { + return err + } + } + } + + if len(pr.CategoryIDs) > 0 { + for _, categoryID := range pr.CategoryIDs { + if err := tx.Exec(` + INSERT INTO b2b_specific_price_category (b2b_specific_price_id, id_category) VALUES (?, ?) + `, pr.ID, categoryID).Error; err != nil { + return err + } + } + } + + if len(pr.ProductAttributeIDs) > 0 { + for _, attrID := range pr.ProductAttributeIDs { + if err := tx.Exec(` + INSERT INTO b2b_specific_price_product_attribute (b2b_specific_price_id, id_product_attribute) VALUES (?, ?) + `, pr.ID, attrID).Error; err != nil { + return err + } + } + } + + if len(pr.CountryIDs) > 0 { + for _, countryID := range pr.CountryIDs { + if err := tx.Exec(` + INSERT INTO b2b_specific_price_country (b2b_specific_price_id, b2b_id_country) VALUES (?, ?) + `, pr.ID, countryID).Error; err != nil { + return err + } + } + } + + if len(pr.CustomerIDs) > 0 { + for _, customerID := range pr.CustomerIDs { + if err := tx.Exec(` + INSERT INTO b2b_specific_price_customer (b2b_specific_price_id, b2b_id_customer) VALUES (?, ?) + `, pr.ID, customerID).Error; err != nil { + return err + } + } + } + + return nil +} + +func (repo *SpecificPriceRepo) clearRelations(tx *gorm.DB, id uint64) error { + if err := tx.Exec("DELETE FROM b2b_specific_price_product WHERE b2b_specific_price_id = ?", id).Error; err != nil { + return err + } + if err := tx.Exec("DELETE FROM b2b_specific_price_category WHERE b2b_specific_price_id = ?", id).Error; err != nil { + return err + } + if err := tx.Exec("DELETE FROM b2b_specific_price_product_attribute WHERE b2b_specific_price_id = ?", id).Error; err != nil { + return err + } + if err := tx.Exec("DELETE FROM b2b_specific_price_country WHERE b2b_specific_price_id = ?", id).Error; err != nil { + return err + } + if err := tx.Exec("DELETE FROM b2b_specific_price_customer WHERE b2b_specific_price_id = ?", id).Error; err != nil { + return err + } + + return nil +} + +func (repo *SpecificPriceRepo) loadRelations(ctx context.Context, pr *model.SpecificPrice) error { + var err error + + var productIDs []struct { + IDProduct uint64 `gorm:"column:id_product"` + } + if err = db.DB.WithContext(ctx).Table("b2b_specific_price_product").Where("b2b_specific_price_id = ?", pr.ID).Select("id_product").Scan(&productIDs).Error; err != nil { + return err + } + for _, p := range productIDs { + pr.ProductIDs = append(pr.ProductIDs, p.IDProduct) + } + + var categoryIDs []struct { + IDCategory uint64 `gorm:"column:id_category"` + } + if err = db.DB.WithContext(ctx).Table("b2b_specific_price_category").Where("b2b_specific_price_id = ?", pr.ID).Select("id_category").Scan(&categoryIDs).Error; err != nil { + return err + } + for _, c := range categoryIDs { + pr.CategoryIDs = append(pr.CategoryIDs, c.IDCategory) + } + + var attrIDs []struct { + IDAttr uint64 `gorm:"column:id_product_attribute"` + } + if err = db.DB.WithContext(ctx).Table("b2b_specific_price_product_attribute").Where("b2b_specific_price_id = ?", pr.ID).Select("id_product_attribute").Scan(&attrIDs).Error; err != nil { + return err + } + for _, a := range attrIDs { + pr.ProductAttributeIDs = append(pr.ProductAttributeIDs, a.IDAttr) + } + + var countryIDs []struct { + IDCountry uint64 `gorm:"column:b2b_id_country"` + } + if err = db.DB.WithContext(ctx).Table("b2b_specific_price_country").Where("b2b_specific_price_id = ?", pr.ID).Select("b2b_id_country").Scan(&countryIDs).Error; err != nil { + return err + } + for _, c := range countryIDs { + pr.CountryIDs = append(pr.CountryIDs, c.IDCountry) + } + + var customerIDs []struct { + IDCustomer uint64 `gorm:"column:b2b_id_customer"` + } + if err = db.DB.WithContext(ctx).Table("b2b_specific_price_customer").Where("b2b_specific_price_id = ?", pr.ID).Select("b2b_id_customer").Scan(&customerIDs).Error; err != nil { + return err + } + for _, c := range customerIDs { + pr.CustomerIDs = append(pr.CustomerIDs, c.IDCustomer) + } + + return nil +} diff --git a/app/service/authService/auth.go b/app/service/authService/auth.go index 83b6b2f..8f8c63a 100644 --- a/app/service/authService/auth.go +++ b/app/service/authService/auth.go @@ -21,6 +21,7 @@ import ( "github.com/golang-jwt/jwt/v5" "golang.org/x/crypto/bcrypt" "gorm.io/gorm" + "gorm.io/gorm/clause" ) // JWTClaims represents the JWT claims @@ -436,7 +437,7 @@ func (s *AuthService) RevokeAllRefreshTokens(userID uint) { // GetUserByID retrieves a user by ID func (s *AuthService) GetUserByID(userID uint) (*model.Customer, error) { var user model.Customer - if err := s.db.Preload("Role.Permissions").First(&user, userID).Error; err != nil { + if err := s.db.Preload("Role.Permissions").Preload(clause.Associations).First(&user, userID).Error; err != nil { if errors.Is(err, gorm.ErrRecordNotFound) { return nil, responseErrors.ErrUserNotFound } diff --git a/app/service/meiliService/meiliService.go b/app/service/meiliService/meiliService.go index 6d9120a..41e9b8f 100644 --- a/app/service/meiliService/meiliService.go +++ b/app/service/meiliService/meiliService.go @@ -6,7 +6,7 @@ import ( "git.ma-al.com/goc_daniel/b2b/app/config" "git.ma-al.com/goc_daniel/b2b/app/model" - "git.ma-al.com/goc_daniel/b2b/app/repos/productDescriptionRepo" + searchrepo "git.ma-al.com/goc_daniel/b2b/app/repos/searchRepo" constdata "git.ma-al.com/goc_daniel/b2b/app/utils/const_data" "github.com/meilisearch/meilisearch-go" ) @@ -20,8 +20,8 @@ type MeiliIndexSettings struct { } type MeiliService struct { - productDescriptionRepo productDescriptionRepo.UIProductDescriptionRepo - meiliClient meilisearch.ServiceManager + searchRepo searchrepo.UISearchRepo + meiliClient meilisearch.ServiceManager } func New() *MeiliService { @@ -32,8 +32,8 @@ func New() *MeiliService { ) return &MeiliService{ - meiliClient: client, - productDescriptionRepo: productDescriptionRepo.New(), + meiliClient: client, + searchRepo: searchrepo.New(), } } @@ -50,7 +50,7 @@ func (s *MeiliService) CreateIndex(id_lang uint) error { for { // Get batch of products from repo (includes scanning) - products, err := s.productDescriptionRepo.GetMeiliProducts(id_lang, offset, batchSize) + products, err := s.searchRepo.GetMeiliProducts(id_lang, offset, batchSize) if err != nil { return fmt.Errorf("failed to get products batch at offset %d: %w", offset, err) } diff --git a/app/service/menuService/menuService.go b/app/service/menuService/menuService.go index de2498d..e63b6b5 100644 --- a/app/service/menuService/menuService.go +++ b/app/service/menuService/menuService.go @@ -3,31 +3,45 @@ package menuService import ( "slices" "sort" + "strconv" "git.ma-al.com/goc_daniel/b2b/app/model" - "git.ma-al.com/goc_daniel/b2b/app/repos/categoriesRepo" + categoryrepo "git.ma-al.com/goc_daniel/b2b/app/repos/categoryRepo" routesRepo "git.ma-al.com/goc_daniel/b2b/app/repos/routesRepo" + constdata "git.ma-al.com/goc_daniel/b2b/app/utils/const_data" + "git.ma-al.com/goc_daniel/b2b/app/utils/i18n" "git.ma-al.com/goc_daniel/b2b/app/utils/responseErrors" ) type MenuService struct { - categoriesRepo categoriesRepo.UICategoriesRepo - routesRepo routesRepo.UIRoutesRepo + categoryRepo categoryrepo.UICategoryRepo + routesRepo routesRepo.UIRoutesRepo } func New() *MenuService { return &MenuService{ - categoriesRepo: categoriesRepo.New(), - routesRepo: routesRepo.New(), + categoryRepo: categoryrepo.New(), + routesRepo: routesRepo.New(), } } func (s *MenuService) GetCategoryTree(root_category_id uint, id_lang uint) (*model.Category, error) { - all_categories, err := s.categoriesRepo.GetAllCategories(id_lang) + all_categories, err := s.categoryRepo.RetrieveMenuCategories(id_lang) if err != nil { return &model.Category{}, err } + // remove blacklisted categories + // to do so, we detach them from the main tree + for i := 0; i < len(all_categories); i++ { + if slices.Contains(constdata.CATEGORY_BLACKLIST, all_categories[i].CategoryID) { + all_categories[i].ParentID = all_categories[i].CategoryID + } + } + + iso_code := all_categories[0].IsoCode + s.appendAdditional(&all_categories, id_lang, iso_code) + // find the root root_index := 0 root_found := false @@ -98,7 +112,7 @@ func (s *MenuService) scannedToNormalCategory(scanned model.ScannedCategory) mod normal.CategoryID = scanned.CategoryID normal.Label = scanned.Name // normal.Active = scanned.Active == 1 - normal.Params = model.CategoryParams{CategoryID: normal.CategoryID, LinkRewrite: scanned.LinkRewrite, Locale: scanned.IsoCode} + normal.Params = model.CategoryParams{CategoryID: normal.CategoryID, LinkRewrite: scanned.LinkRewrite, Locale: scanned.IsoCode, Filter: scanned.Filter} normal.Children = []model.Category{} return normal } @@ -114,11 +128,14 @@ func (a ByPosition) Swap(i, j int) { a[i], a[j] = a[j], a[i] } func (a ByPosition) Less(i, j int) bool { return a[i].Position < a[j].Position } func (s *MenuService) GetBreadcrumb(root_category_id uint, start_category_id uint, id_lang uint) ([]model.CategoryInBreadcrumb, error) { - all_categories, err := s.categoriesRepo.GetAllCategories(id_lang) + all_categories, err := s.categoryRepo.RetrieveMenuCategories(id_lang) if err != nil { return []model.CategoryInBreadcrumb{}, err } + iso_code := all_categories[0].IsoCode + s.appendAdditional(&all_categories, id_lang, iso_code) + breadcrumb := []model.CategoryInBreadcrumb{} start_index := 0 @@ -211,3 +228,24 @@ func (s *MenuService) GetTopMenu(languageId uint, roleId uint) ([]*model.B2BTopM return roots, nil } + +func (s *MenuService) appendAdditional(all_categories *[]model.ScannedCategory, id_lang uint, iso_code string) { + for i := 0; i < len(*all_categories); i++ { + (*all_categories)[i].Filter = "category_id_in=" + strconv.Itoa(int((*all_categories)[i].CategoryID)) + } + + var additional model.ScannedCategory + additional.CategoryID = 10001 + additional.Name = "New Products" + additional.Active = 1 + additional.Position = 10 + additional.ParentID = 2 + additional.IsRoot = 0 + additional.LinkRewrite = i18n.T___(id_lang, "category.new_products") + additional.IsoCode = iso_code + + additional.Visited = false + additional.Filter = "is_new_in=true" + + *all_categories = append(*all_categories, additional) +} diff --git a/app/service/productService/productService.go b/app/service/productService/productService.go index de6d70e..3296d88 100644 --- a/app/service/productService/productService.go +++ b/app/service/productService/productService.go @@ -2,6 +2,7 @@ package productService import ( "encoding/json" + "errors" "git.ma-al.com/goc_daniel/b2b/app/model" "git.ma-al.com/goc_daniel/b2b/app/repos/productsRepo" @@ -9,6 +10,7 @@ import ( "git.ma-al.com/goc_daniel/b2b/app/utils/query/filters" "git.ma-al.com/goc_daniel/b2b/app/utils/query/find" "git.ma-al.com/goc_daniel/b2b/app/utils/responseErrors" + "git.ma-al.com/goc_daniel/b2b/app/view" ) type ProductService struct { @@ -21,17 +23,108 @@ func New() *ProductService { } } -func (s *ProductService) GetJSON(p_id_product, p_id_lang, p_id_customer, b2b_id_country, p_quantity int) (*json.RawMessage, error) { - products, err := s.productsRepo.GetJSON(p_id_product, constdata.SHOP_ID, p_id_lang, p_id_customer, b2b_id_country, p_quantity) +func (s *ProductService) Get( + p_id_product, p_id_lang, p_id_customer, b2b_id_country, p_quantity uint, +) (*json.RawMessage, error) { + + product, err := s.productsRepo.GetBase(p_id_product, constdata.SHOP_ID, p_id_lang) if err != nil { - return products, err + return nil, err } - return products, nil + price, err := s.productsRepo.GetPrice(p_id_product, nil, constdata.SHOP_ID, p_id_customer, b2b_id_country, p_quantity) + if err != nil { + return nil, err + } + + variants, err := s.productsRepo.GetVariants(p_id_product, constdata.SHOP_ID, p_id_lang, p_id_customer, b2b_id_country, p_quantity) + if err != nil { + return nil, err + } + + result := view.ProductFull{ + Product: product, + Price: price, + Variants: variants, + } + + if len(variants) > 0 { + result.Variants = variants + } + + jsonBytes, err := json.Marshal(result) + if err != nil { + return nil, err + } + + raw := json.RawMessage(jsonBytes) + return &raw, nil } -func (s *ProductService) Find(id_lang, userID uint, p find.Paging, filters *filters.FiltersList) (find.Found[model.ProductInList], error) { - return s.productsRepo.Find(id_lang, userID, p, filters) +func (s *ProductService) Find( + idLang uint, + userID uint, + p find.Paging, + filters *filters.FiltersList, + customer *model.Customer, + quantity uint, + shopID uint, +) (*find.Found[model.ProductInList], error) { + + if customer == nil || customer.Country == nil { + return nil, errors.New("customer is nil or missing fields") + } + + found, err := s.productsRepo.Find(idLang, userID, p, filters) + if err != nil { + return nil, err + } + + // 1. collect simple products (no variants) + simpleProductIndexes := make([]int, 0, len(found.Items)) + + for i := range found.Items { + if found.Items[i].VariantsNumber <= 0 { + simpleProductIndexes = append(simpleProductIndexes, i) + } + } + + // 2. resolve prices ONLY for simple products + for _, i := range simpleProductIndexes { + price, err := s.productsRepo.GetPrice( + found.Items[i].ProductID, + nil, + shopID, + customer.ID, + customer.CountryID, + quantity, + ) + if err != nil { + return nil, err + } + + found.Items[i].PriceTaxExcl = price.FinalTaxExcl + found.Items[i].PriceTaxIncl = price.FinalTaxIncl + } + + return found, nil +} + +func (s *ProductService) GetProductAttributes( + langID uint, + productID uint, + shopID uint, + customerID uint, + countryID uint, + quantity uint, +) ([]view.ProductAttribute, error) { + variants, err := s.productsRepo.GetVariants(productID, constdata.SHOP_ID, langID, customerID, countryID, quantity) + if err != nil { + return nil, err + } + + return variants, nil + } func (s *ProductService) AddToFavorites(userID uint, productID uint) error { diff --git a/app/service/productTranslationService/sanitizeURLSlug.go b/app/service/productTranslationService/sanitizeURLSlug.go index ea69d7c..2d0ddbf 100644 --- a/app/service/productTranslationService/sanitizeURLSlug.go +++ b/app/service/productTranslationService/sanitizeURLSlug.go @@ -4,6 +4,7 @@ import ( "strings" "unicode" + "git.ma-al.com/goc_daniel/b2b/app/db" constdata "git.ma-al.com/goc_daniel/b2b/app/utils/const_data" "github.com/dlclark/regexp2" "golang.org/x/text/runes" @@ -22,7 +23,7 @@ func SanitizeSlug(s string) string { s = strings.TrimSpace(strings.ToLower(s)) // First apply explicit transliteration for language-specific letters. - s = transliterateWithTable(s) + s = transliterateSlug(s) // Then normalize and strip any remaining combining marks. s = removeDiacritics(s) @@ -40,19 +41,17 @@ func SanitizeSlug(s string) string { return s } -func transliterateWithTable(s string) string { - var b strings.Builder - b.Grow(len(s)) +func transliterateSlug(s string) string { + var cleared string - for _, r := range s { - if repl, ok := constdata.TRANSLITERATION_TABLE[r]; ok { - b.WriteString(repl) - } else { - b.WriteRune(r) - } + err := db.DB.Raw("SELECT slugify_eu(?)", s).Scan(&cleared).Error + if err != nil { + // log error + _ = err + return s } - return b.String() + return cleared } func removeDiacritics(s string) string { diff --git a/app/service/specificPriceService/specificPriceService.go b/app/service/specificPriceService/specificPriceService.go new file mode 100644 index 0000000..e22d855 --- /dev/null +++ b/app/service/specificPriceService/specificPriceService.go @@ -0,0 +1,124 @@ +package specificPriceService + +import ( + "context" + + "git.ma-al.com/goc_daniel/b2b/app/model" + "git.ma-al.com/goc_daniel/b2b/app/repos/specificPriceRepo" + "git.ma-al.com/goc_daniel/b2b/app/utils/responseErrors" +) + +type SpecificPriceService struct { + specificPriceRepo specificPriceRepo.UISpecificPriceRepo +} + +func New() *SpecificPriceService { + return &SpecificPriceService{ + specificPriceRepo: specificPriceRepo.New(), + } +} + +func (s *SpecificPriceService) Create(ctx context.Context, pr *model.SpecificPrice) (*model.SpecificPrice, error) { + if err := s.validateRequest(pr); err != nil { + return nil, err + } + + if err := s.specificPriceRepo.Create(ctx, pr); err != nil { + return nil, err + } + + return pr, nil +} + +func (s *SpecificPriceService) Update(ctx context.Context, id uint64, pr *model.SpecificPrice) (*model.SpecificPrice, error) { + existing, err := s.specificPriceRepo.GetByID(ctx, id) + if err != nil { + return nil, err + } + if existing == nil { + return nil, responseErrors.ErrSpecificPriceNotFound + } + + if err := s.validateUpdateRequest(pr); err != nil { + return nil, err + } + + pr.ID = id + + if err := s.specificPriceRepo.Update(ctx, pr); err != nil { + return nil, err + } + + return pr, nil +} + +func (s *SpecificPriceService) GetByID(ctx context.Context, id uint64) (*model.SpecificPrice, error) { + pr, err := s.specificPriceRepo.GetByID(ctx, id) + if err != nil { + return nil, err + } + if pr == nil { + return nil, responseErrors.ErrSpecificPriceNotFound + } + return pr, nil +} + +func (s *SpecificPriceService) List(ctx context.Context) ([]*model.SpecificPrice, error) { + return s.specificPriceRepo.List(ctx) +} + +func (s *SpecificPriceService) SetActive(ctx context.Context, id uint64, active bool) error { + pr, err := s.specificPriceRepo.GetByID(ctx, id) + if err != nil { + return err + } + if pr == nil { + return responseErrors.ErrSpecificPriceNotFound + } + + return s.specificPriceRepo.SetActive(ctx, id, active) +} + +func (s *SpecificPriceService) Delete(ctx context.Context, id uint64) error { + pr, err := s.specificPriceRepo.GetByID(ctx, id) + if err != nil { + return err + } + if pr == nil { + return responseErrors.ErrSpecificPriceNotFound + } + + return s.specificPriceRepo.Delete(ctx, id) +} + +func (s *SpecificPriceService) validateRequest(pr *model.SpecificPrice) error { + if pr.ReductionType != "amount" && pr.ReductionType != "percentage" { + return responseErrors.ErrInvalidReductionType + } + + if pr.ReductionType == "percentage" && pr.PercentageReduction == nil { + return responseErrors.ErrPercentageRequired + } + + if pr.ReductionType == "amount" && pr.Price == nil { + return responseErrors.ErrPriceRequired + } + + return nil +} + +func (s *SpecificPriceService) validateUpdateRequest(pr *model.SpecificPrice) error { + if pr.ReductionType != "" && pr.ReductionType != "amount" && pr.ReductionType != "percentage" { + return responseErrors.ErrInvalidReductionType + } + + if pr.ReductionType == "percentage" && pr.PercentageReduction == nil { + return responseErrors.ErrPercentageRequired + } + + if pr.ReductionType == "amount" && pr.Price == nil { + return responseErrors.ErrPriceRequired + } + + return nil +} diff --git a/app/utils/const_data/consts.go b/app/utils/const_data/consts.go index 547698c..7800703 100644 --- a/app/utils/const_data/consts.go +++ b/app/utils/const_data/consts.go @@ -3,12 +3,16 @@ package constdata // PASSWORD_VALIDATION_REGEX is used by the frontend (JavaScript supports lookaheads). const PASSWORD_VALIDATION_REGEX = `^(?=.*[a-z])(?=.*[A-Z])(?=.*\d).{10,}$` const SHOP_ID = 1 +const DEFAULT_PRODUCT_QUANTITY = 1 const SHOP_DEFAULT_LANGUAGE = 1 const ADMIN_NOTIFICATION_LANGUAGE = 2 // CATEGORY_TREE_ROOT_ID corresponds to id_category in ps_category which has is_root_category=1 const CATEGORY_TREE_ROOT_ID = 2 +// since arrays can not be const +var CATEGORY_BLACKLIST = []uint{250} + const MAX_AMOUNT_OF_CARTS_PER_USER = 10 const DEFAULT_NEW_CART_NAME = "new cart" @@ -28,23 +32,3 @@ const WEBDAV_TRIMMED_ROOT = "localhost:3000/api/v1/webdav/storage" const NON_ALNUM_REGEX = `[^a-z0-9]+` const MULTI_DASH_REGEX = `-+` const SLUG_REGEX = `^[a-z0-9]+(?:-[a-z0-9]+)*$` - -// Currently supports only German+Polish specific cases -var TRANSLITERATION_TABLE = map[rune]string{ - // German - 'ä': "ae", - 'ö': "oe", - 'ü': "ue", - 'ß': "ss", - - // Polish - 'ą': "a", - 'ć': "c", - 'ę': "e", - 'ł': "l", - 'ń': "n", - 'ó': "o", - 'ś': "s", - 'ż': "z", - 'ź': "z", -} diff --git a/app/utils/localeExtractor/localeExtractor.go b/app/utils/localeExtractor/localeExtractor.go index 37bdb0a..7dcd0cc 100644 --- a/app/utils/localeExtractor/localeExtractor.go +++ b/app/utils/localeExtractor/localeExtractor.go @@ -22,14 +22,6 @@ func GetUserID(c fiber.Ctx) (uint, bool) { return user_locale.User.ID, true } -func GetOriginalUserRole(c fiber.Ctx) (model.Role, bool) { - user_locale, ok := c.Locals(constdata.USER_LOCALE).(*model.UserLocale) - if !ok || user_locale.OriginalUser == nil || user_locale.OriginalUser.Role == nil { - return model.Role{}, false - } - return *user_locale.OriginalUser.Role, true -} - func GetCustomer(c fiber.Ctx) (*model.Customer, bool) { user_locale, ok := c.Locals(constdata.USER_LOCALE).(*model.UserLocale) if !ok || user_locale.User == nil { diff --git a/app/utils/responseErrors/responseErrors.go b/app/utils/responseErrors/responseErrors.go index 4d14a50..c0aee88 100644 --- a/app/utils/responseErrors/responseErrors.go +++ b/app/utils/responseErrors/responseErrors.go @@ -70,6 +70,12 @@ var ( ErrEmptyCart = errors.New("the cart is empty") ErrUserHasNoSuchOrder = errors.New("user does not have order with given id") + // Typed errors for price reduction handler + ErrInvalidReductionType = errors.New("invalid reduction type: must be 'amount' or 'percentage'") + ErrPercentageRequired = errors.New("percentage_reduction required when reduction_type is percentage") + ErrPriceRequired = errors.New("price required when reduction_type is amount") + ErrSpecificPriceNotFound = errors.New("price reduction not found") + // Typed errors for storage ErrAccessDenied = errors.New("access denied!") ErrFolderDoesNotExist = errors.New("folder does not exist") @@ -216,6 +222,15 @@ func GetErrorCode(c fiber.Ctx, err error) string { case errors.Is(err, ErrMissingFileFieldDocument): return i18n.T_(c, "error.err_missing_file_field_document") + case errors.Is(err, ErrInvalidReductionType): + return i18n.T_(c, "error.invalid_reduction_type") + case errors.Is(err, ErrPercentageRequired): + return i18n.T_(c, "error.percentage_required") + case errors.Is(err, ErrPriceRequired): + return i18n.T_(c, "error.price_required") + case errors.Is(err, ErrSpecificPriceNotFound): + return i18n.T_(c, "error.price_reduction_not_found") + case errors.Is(err, ErrJSONBody): return i18n.T_(c, "error.err_json_body") @@ -279,6 +294,9 @@ func GetErrorStatus(err error) int { errors.Is(err, ErrProductOrItsVariationDoesNotExist), errors.Is(err, ErrEmptyCart), errors.Is(err, ErrUserHasNoSuchOrder), + errors.Is(err, ErrInvalidReductionType), + errors.Is(err, ErrPercentageRequired), + errors.Is(err, ErrPriceRequired), errors.Is(err, ErrAccessDenied), errors.Is(err, ErrFolderDoesNotExist), errors.Is(err, ErrFileDoesNotExist), @@ -290,6 +308,8 @@ func GetErrorStatus(err error) int { errors.Is(err, ErrInvalidCountryID), errors.Is(err, ErrInvalidAddressJSON): return fiber.StatusBadRequest + case errors.Is(err, ErrSpecificPriceNotFound): + return fiber.StatusNotFound case errors.Is(err, ErrEmailExists): return fiber.StatusConflict case errors.Is(err, ErrAIResponseFail), diff --git a/app/view/product.go b/app/view/product.go new file mode 100644 index 0000000..9dba8d1 --- /dev/null +++ b/app/view/product.go @@ -0,0 +1,98 @@ +package view + +import ( + "encoding/json" + "time" +) + +type ProductAttribute struct { + IDProductAttribute uint `gorm:"column:id_product_attribute" json:"id_product_attribute"` + Reference string `gorm:"column:reference" json:"reference"` + BasePrice float64 `gorm:"column:base_price" json:"base_price"` + PriceTaxExcl float64 `gorm:"column:price_tax_excl" json:"price_tax_excl"` + PriceTaxIncl float64 `gorm:"column:price_tax_incl" json:"price_tax_incl"` + Quantity int64 `gorm:"column:quantity" json:"quantity"` + Attributes json.RawMessage `gorm:"column:attributes" json:"attributes"` +} + +type Price struct { + Base float64 `json:"base"` + FinalTaxExcl float64 `json:"final_tax_excl"` + FinalTaxIncl float64 `json:"final_tax_incl"` + TaxRate float64 `json:"tax_rate"` + Priority int `json:"priority"` // or string +} + +type Variant struct { + ID uint `json:"id_product_attribute"` + Reference string `json:"reference"` + + BasePrice float64 `json:"base_price"` + FinalExcl float64 `json:"final_tax_excl"` + FinalIncl float64 `json:"final_tax_incl"` + + Stock int `json:"stock"` +} +type ProductFull struct { + Product Product `json:"product"` + Price Price `json:"price"` + Variants []ProductAttribute `json:"variants,omitempty"` +} + +type Product struct { + ID uint `gorm:"column:id" json:"id"` + Reference string `gorm:"column:reference" json:"reference"` + SupplierReference string `gorm:"column:supplier_reference" json:"supplier_reference,omitempty"` + EAN13 string `gorm:"column:ean13" json:"ean13,omitempty"` + UPC string `gorm:"column:upc" json:"upc,omitempty"` + ISBN string `gorm:"column:isbn" json:"isbn,omitempty"` + + // Basic Price (from product table) + BasePrice float64 `gorm:"column:base_price" json:"base_price"` + WholesalePrice float64 `gorm:"column:wholesale_price" json:"wholesale_price,omitempty"` + Unity string `gorm:"column:unity" json:"unity,omitempty"` + UnitPriceRatio float64 `gorm:"column:unit_price_ratio" json:"unit_price_ratio,omitempty"` + + // Stock & Availability + Quantity int `gorm:"column:quantity" json:"quantity"` + MinimalQuantity int `gorm:"column:minimal_quantity" json:"minimal_quantity"` + AvailableForOrder bool `gorm:"column:available_for_order" json:"available_for_order"` + AvailableDate string `gorm:"column:available_date" json:"available_date,omitempty"` + OutOfStockBehavior int `gorm:"column:out_of_stock_behavior" json:"out_of_stock_behavior"` + + // Flags + OnSale bool `gorm:"column:on_sale" json:"on_sale"` + ShowPrice bool `gorm:"column:show_price" json:"show_price"` + Condition string `gorm:"column:condition" json:"condition"` + IsVirtual bool `gorm:"column:is_virtual" json:"is_virtual"` + + // Physical + Weight float64 `gorm:"column:weight" json:"weight"` + Width float64 `gorm:"column:width" json:"width"` + Height float64 `gorm:"column:height" json:"height"` + Depth float64 `gorm:"column:depth" json:"depth"` + AdditionalShippingCost float64 `gorm:"column:additional_shipping_cost" json:"additional_shipping_cost,omitempty"` + + // Delivery + DeliveryDays int `gorm:"column:delivery_days" json:"delivery_days,omitempty"` + + // Status + Active bool `gorm:"column:active" json:"active"` + Visibility string `gorm:"column:visibility" json:"visibility"` + Indexed bool `gorm:"column:indexed" json:"indexed"` + + // Timestamps + DateAdd time.Time `gorm:"column:date_add" json:"date_add"` + DateUpd time.Time `gorm:"column:date_upd" json:"date_upd"` + + // Language fields + Name string `gorm:"column:name" json:"name"` + Description string `gorm:"column:description" json:"description"` + DescriptionShort string `gorm:"column:description_short" json:"description_short"` + + // Relations + Manufacturer string `gorm:"column:manufacturer" json:"manufacturer"` + Category string `gorm:"column:category" json:"category"` + + IsFavorite bool `gorm:"column:is_favorite" json:"is_favorite"` +} diff --git a/bruno/api_v1/Change Locales.yml b/bruno/api_v1/Change Locales.yml index 4e2388e..95af642 100644 --- a/bruno/api_v1/Change Locales.yml +++ b/bruno/api_v1/Change Locales.yml @@ -1,7 +1,7 @@ info: name: Change Locales type: http - seq: 3 + seq: 5 http: method: POST diff --git a/bruno/api_v1/Delete Index - MeiliSearch.yml b/bruno/api_v1/Delete Index - MeiliSearch.yml index b18e531..e5e011e 100644 --- a/bruno/api_v1/Delete Index - MeiliSearch.yml +++ b/bruno/api_v1/Delete Index - MeiliSearch.yml @@ -1,7 +1,7 @@ info: name: Delete Index - MeiliSearch type: http - seq: 5 + seq: 7 http: method: DELETE diff --git a/bruno/api_v1/Search Index Settings.yml b/bruno/api_v1/Search Index Settings.yml index b11cd07..4e2c4bc 100644 --- a/bruno/api_v1/Search Index Settings.yml +++ b/bruno/api_v1/Search Index Settings.yml @@ -1,7 +1,7 @@ info: name: Search Index Settings type: http - seq: 4 + seq: 6 http: method: POST diff --git a/bruno/api_v1/Search Items.yml b/bruno/api_v1/Search Items.yml index 135daab..a092062 100644 --- a/bruno/api_v1/Search Items.yml +++ b/bruno/api_v1/Search Items.yml @@ -1,7 +1,7 @@ info: name: Search Items type: http - seq: 2 + seq: 4 http: method: POST diff --git a/bruno/api_v1/auth/folder.yml b/bruno/api_v1/auth/folder.yml index 4d04d32..e8485e1 100644 --- a/bruno/api_v1/auth/folder.yml +++ b/bruno/api_v1/auth/folder.yml @@ -1,7 +1,7 @@ info: name: auth type: folder - seq: 6 + seq: 2 request: auth: inherit diff --git a/bruno/api_v1/currency/currency-rate.yml b/bruno/api_v1/currency/currency-rate.yml index b741b82..269dea4 100644 --- a/bruno/api_v1/currency/currency-rate.yml +++ b/bruno/api_v1/currency/currency-rate.yml @@ -11,7 +11,7 @@ http: data: |- { "b2b_id_currency" : 1, - "conversion_rate": 4.2 + "conversion_rate": 3 } auth: inherit diff --git a/bruno/api_v1/currency/currency.yml b/bruno/api_v1/currency/currency.yml index b3de3e9..4c444d8 100644 --- a/bruno/api_v1/currency/currency.yml +++ b/bruno/api_v1/currency/currency.yml @@ -11,7 +11,7 @@ http: runtime: variables: - name: id - value: "1" + value: "2" settings: encodeUrl: true diff --git a/bruno/api_v1/currency/folder.yml b/bruno/api_v1/currency/folder.yml index e409d83..7f299b6 100644 --- a/bruno/api_v1/currency/folder.yml +++ b/bruno/api_v1/currency/folder.yml @@ -1,7 +1,7 @@ info: name: currency type: folder - seq: 8 + seq: 9 request: auth: inherit diff --git a/bruno/api_v1/customer/Customer (other).yml b/bruno/api_v1/customer/Customer (other).yml index 161094d..803b6a1 100644 --- a/bruno/api_v1/customer/Customer (other).yml +++ b/bruno/api_v1/customer/Customer (other).yml @@ -5,10 +5,10 @@ info: http: method: GET - url: "{{bas_url}}/restricted/customer?id=1" + url: "{{bas_url}}/restricted/customer?id=2" params: - name: id - value: "1" + value: "2" type: query auth: inherit diff --git a/bruno/api_v1/customer/Customer list.yml b/bruno/api_v1/customer/Customer list.yml index 11c286b..b80318d 100644 --- a/bruno/api_v1/customer/Customer list.yml +++ b/bruno/api_v1/customer/Customer list.yml @@ -5,10 +5,10 @@ info: http: method: GET - url: "{{bas_url}}/restricted/customer/list?search=" + url: "{{bas_url}}/restricted/customer/list?search=marek" params: - name: search - value: "" + value: marek type: query auth: inherit diff --git a/bruno/api_v1/customer/folder.yml b/bruno/api_v1/customer/folder.yml index cdd2d6f..50228ad 100644 --- a/bruno/api_v1/customer/folder.yml +++ b/bruno/api_v1/customer/folder.yml @@ -1,7 +1,7 @@ info: name: customer type: folder - seq: 9 + seq: 10 request: auth: inherit diff --git a/bruno/api_v1/product/Get Product.yml b/bruno/api_v1/product/Get Product.yml index b9b182e..83f9525 100644 --- a/bruno/api_v1/product/Get Product.yml +++ b/bruno/api_v1/product/Get Product.yml @@ -5,7 +5,7 @@ info: http: method: GET - url: "{{bas_url}}/restricted/product/200/1/5" + url: "{{bas_url}}/restricted/product/51/1/7" auth: inherit settings: diff --git a/bruno/api_v1/product/Product Variants List.yml b/bruno/api_v1/product/Product Variants List.yml new file mode 100644 index 0000000..47be24b --- /dev/null +++ b/bruno/api_v1/product/Product Variants List.yml @@ -0,0 +1,22 @@ +info: + name: Product Variants List + type: http + seq: 3 + +http: + method: GET + url: "{{bas_url}}/restricted/product/list-variants/{{product_id}}" + body: + type: json + data: "" + +runtime: + variables: + - name: product_id + value: "51" + +settings: + encodeUrl: true + timeout: 0 + followRedirects: true + maxRedirects: 5 diff --git a/bruno/api_v1/product/Products List.yml b/bruno/api_v1/product/Products List.yml index 6763495..c099b28 100644 --- a/bruno/api_v1/product/Products List.yml +++ b/bruno/api_v1/product/Products List.yml @@ -5,7 +5,7 @@ info: http: method: GET - url: "{{bas_url}}/restricted/product/list?p=1&elems=30&sort=product_id,asc&category_id_in=243&reference=~62" + url: "{{bas_url}}/restricted/product/list?p=1&elems=30&reference=~NC100" params: - name: p value: "1" @@ -16,12 +16,22 @@ http: - name: sort value: product_id,asc type: query + disabled: true - name: category_id_in - value: "243" + value: "23" type: query + disabled: true - name: reference - value: ~62 + value: ~NC100 type: query + - name: is_new_eq + value: "0" + type: query + disabled: true + - name: is_favorite_eq + value: "false" + type: query + disabled: true body: type: json data: "" diff --git a/bruno/api_v1/product/folder.yml b/bruno/api_v1/product/folder.yml index cd2ad8b..3957e49 100644 --- a/bruno/api_v1/product/folder.yml +++ b/bruno/api_v1/product/folder.yml @@ -1,7 +1,7 @@ info: name: product type: folder - seq: 7 + seq: 8 request: auth: inherit diff --git a/bruno/api_v1/specific_price/Activate.yml b/bruno/api_v1/specific_price/Activate.yml new file mode 100644 index 0000000..cf01772 --- /dev/null +++ b/bruno/api_v1/specific_price/Activate.yml @@ -0,0 +1,20 @@ +info: + name: Activate + type: http + seq: 5 + +http: + method: PATCH + url: "{{bas_url}}/restricted/specific-price/{{id}}/activate" + auth: inherit + +runtime: + variables: + - name: id + value: "1" + +settings: + encodeUrl: true + timeout: 0 + followRedirects: true + maxRedirects: 5 diff --git a/bruno/api_v1/specific_price/Create.yml b/bruno/api_v1/specific_price/Create.yml new file mode 100644 index 0000000..5ce143b --- /dev/null +++ b/bruno/api_v1/specific_price/Create.yml @@ -0,0 +1,27 @@ +info: + name: Create + type: http + seq: 3 + +http: + method: POST + url: "{{bas_url}}/restricted/specific-price" + body: + type: json + data: |- + { + "name": "Summer Sale 3", + "scope": "shop", + "reduction_type": "amount", + "price": 69, + "from_quantity": 1, + "is_active": true, + "currency_id": 2 + } + auth: inherit + +settings: + encodeUrl: true + timeout: 0 + followRedirects: true + maxRedirects: 5 diff --git a/bruno/api_v1/specific_price/Deactivate.yml b/bruno/api_v1/specific_price/Deactivate.yml new file mode 100644 index 0000000..eea7b5a --- /dev/null +++ b/bruno/api_v1/specific_price/Deactivate.yml @@ -0,0 +1,20 @@ +info: + name: Deactivate + type: http + seq: 6 + +http: + method: PATCH + url: "{{bas_url}}/restricted/specific-price/{{id}}/deactivate" + auth: inherit + +runtime: + variables: + - name: id + value: "1" + +settings: + encodeUrl: true + timeout: 0 + followRedirects: true + maxRedirects: 5 diff --git a/bruno/api_v1/specific_price/Delete.yml b/bruno/api_v1/specific_price/Delete.yml new file mode 100644 index 0000000..5fe64ea --- /dev/null +++ b/bruno/api_v1/specific_price/Delete.yml @@ -0,0 +1,20 @@ +info: + name: Delete + type: http + seq: 7 + +http: + method: DELETE + url: "{{bas_url}}/restricted/price-reductions/{{id}}" + auth: inherit + +runtime: + variables: + - name: id + value: "1" + +settings: + encodeUrl: true + timeout: 0 + followRedirects: true + maxRedirects: 5 diff --git a/bruno/api_v1/specific_price/Get.yml b/bruno/api_v1/specific_price/Get.yml new file mode 100644 index 0000000..2e4ec71 --- /dev/null +++ b/bruno/api_v1/specific_price/Get.yml @@ -0,0 +1,20 @@ +info: + name: Get + type: http + seq: 2 + +http: + method: GET + url: "{{bas_url}}/restricted/specific-price/{{id}}" + auth: inherit + +runtime: + variables: + - name: id + value: "1" + +settings: + encodeUrl: true + timeout: 0 + followRedirects: true + maxRedirects: 5 diff --git a/bruno/api_v1/specific_price/List.yml b/bruno/api_v1/specific_price/List.yml new file mode 100644 index 0000000..57a51c7 --- /dev/null +++ b/bruno/api_v1/specific_price/List.yml @@ -0,0 +1,15 @@ +info: + name: List + type: http + seq: 1 + +http: + method: GET + url: "{{bas_url}}/restricted/specific-price" + auth: inherit + +settings: + encodeUrl: true + timeout: 0 + followRedirects: true + maxRedirects: 5 diff --git a/bruno/api_v1/specific_price/Update.yml b/bruno/api_v1/specific_price/Update.yml new file mode 100644 index 0000000..82fa032 --- /dev/null +++ b/bruno/api_v1/specific_price/Update.yml @@ -0,0 +1,38 @@ +info: + name: Update + type: http + seq: 4 + +http: + method: PUT + url: "{{bas_url}}/restricted/specific-price/{{id}}" + body: + type: json + data: |- + { + "name": "Summer Sale Updated", + "reduction_type": "amount", + "percentage_reduction": 50.0, + "price": 69, + "currency_id": 1, + "scope": "shop", + "is_active": true, + "from_quantity":1 + // "product_ids": [51,53], + // "category_ids": [1], + // "product_attribute_ids": [1114], + // "country_ids": [1], + // "customer_ids": [2,1] + } + auth: inherit + +runtime: + variables: + - name: id + value: "3" + +settings: + encodeUrl: true + timeout: 0 + followRedirects: true + maxRedirects: 5 diff --git a/bruno/api_v1/specific_price/folder.yml b/bruno/api_v1/specific_price/folder.yml new file mode 100644 index 0000000..92e0937 --- /dev/null +++ b/bruno/api_v1/specific_price/folder.yml @@ -0,0 +1,73 @@ +info: + name: specific_price + type: folder + seq: 3 + +docs: + content: | + # Specific Price API + + Endpoints for managing specific price rules (price reductions). + + ## Scopes + + Specific prices can be **global** or **scoped**: + + - **Global**: If all scope arrays (`product_ids`, `category_ids`, `product_attribute_ids`, `country_ids`, `customer_ids`) are empty, the price reduction applies to everything. + + - **Scoped**: If ANY scope array has values, the price reduction applies only when ANY condition matches (UNION logic). + + ### Scope Fields + + | Field | Type | Description | + |-------|------|-------------| + | `product_ids` | uint[] | Specific products | + | `category_ids` | uint[] | Products in categories | + | `product_attribute_ids` | uint[] | Product variants (e.g., size, color) | + | `country_ids` | uint[] | Customers in countries | + | `customer_ids` | uint[] | Specific customers | + + ### Examples + + **Global** (applies to all products): + ```json + { + "name": "Global Sale", + "reduction_type": "percentage", + "percentage_reduction": 10, + "from_quantity": 1 + } + ``` + + **Scoped to specific products**: + ```json + { + "name": "Product Sale", + "reduction_type": "percentage", + "percentage_reduction": 20, + "product_ids": [1, 2, 3] + } + ``` + + **Scoped to category + country**: + ```json + { + "name": "Category Country Sale", + "reduction_type": "amount", + "price": 9.99, + "category_ids": [5], + "country_ids": [1] + } + ``` + + ## Reduction Types + + - `percentage`: Requires `percentage_reduction` (e.g., 10.5 = 10.5% off) + - `amount`: Requires `price` (fixed price after reduction) + + ## Validation + + - `reduction_type` is required and must be "percentage" or "amount" + - If `reduction_type` is "percentage", then `percentage_reduction` is required + - If `reduction_type` is "amount", then `price` is required + type: text/markdown diff --git a/bruno/b2b_daniel/menu/get-breadcrumb.yml b/bruno/b2b_daniel/menu/get-breadcrumb.yml index a805790..5870773 100644 --- a/bruno/b2b_daniel/menu/get-breadcrumb.yml +++ b/bruno/b2b_daniel/menu/get-breadcrumb.yml @@ -5,10 +5,10 @@ info: http: method: GET - url: http://localhost:3000/api/v1/restricted/menu/get-breadcrumb?root_category_id=10&category_id=13 + url: http://localhost:3000/api/v1/restricted/menu/get-breadcrumb?root_category_id=2&category_id=13 params: - name: root_category_id - value: "10" + value: "2" type: query - name: category_id value: "13" diff --git a/bruno/b2b_daniel/menu/get-category-tree.yml b/bruno/b2b_daniel/menu/get-category-tree.yml index 6e9d875..a1b6714 100644 --- a/bruno/b2b_daniel/menu/get-category-tree.yml +++ b/bruno/b2b_daniel/menu/get-category-tree.yml @@ -5,10 +5,10 @@ info: http: method: GET - url: http://localhost:3000/api/v1/restricted/menu/get-category-tree?root_category_id=10 + url: http://localhost:3000/api/v1/restricted/menu/get-category-tree?root_category_id=2 params: - name: root_category_id - value: "10" + value: "2" type: query auth: inherit diff --git a/i18n/migrations/20260302163122_create_tables.sql b/i18n/migrations/20260302163122_create_tables.sql index a2dcdbe..5662d6a 100644 --- a/i18n/migrations/20260302163122_create_tables.sql +++ b/i18n/migrations/20260302163122_create_tables.sql @@ -266,7 +266,6 @@ CREATE TABLE b2b_specific_price ( created_at DATETIME NULL, updated_at DATETIME NULL, deleted_at DATETIME NULL, - scope ENUM('shop', 'category', 'product') NOT NULL, valid_from DATETIME NULL, valid_till DATETIME NULL, has_expiration_date BOOLEAN DEFAULT FALSE, @@ -277,11 +276,9 @@ CREATE TABLE b2b_specific_price ( from_quantity INT UNSIGNED DEFAULT 1, is_active BOOLEAN DEFAULT TRUE ) ENGINE = InnoDB; -CREATE INDEX idx_b2b_scope ON b2b_specific_price(scope); CREATE INDEX idx_b2b_active_dates ON b2b_specific_price(is_active, valid_from, valid_till); CREATE INDEX idx_b2b_lookup ON b2b_specific_price ( - scope, is_active, from_quantity ); @@ -335,11 +332,11 @@ ON b2b_specific_price_category (id_category); CREATE INDEX idx_b2b_product_attribute_rel ON b2b_specific_price_product_attribute (id_product_attribute); -CREATE INDEX idx_bsp_customer -ON b2b_specific_price_customer (b2b_specific_price_id, b2b_id_customer); +CREATE INDEX idx_bsp_customer_rel +ON b2b_specific_price_customer (b2b_id_customer); -CREATE INDEX idx_bsp_country -ON b2b_specific_price_country (b2b_specific_price_id, b2b_id_country); +CREATE INDEX idx_bsp_country_rel +ON b2b_specific_price_country (b2b_id_country); DELIMITER // @@ -433,16 +430,26 @@ DELIMITER ; -- +goose Down -DROP TABLE IF EXISTS b2b_countries; -DROP TABLE IF EXISTS b2b_language; -DROP TABLE IF EXISTS b2b_components; -DROP TABLE IF EXISTS b2b_scopes; -DROP TABLE IF EXISTS b2b_translations; -DROP TABLE IF EXISTS b2b_customers; -DROP TABLE IF EXISTS b2b_refresh_tokens; -DROP TABLE IF EXISTS b2b_currencies; -DROP TABLE IF EXISTS b2b_currency_rates; -DROP TABLE IF EXISTS b2b_specific_price; -DROP TABLE IF EXISTS b2b_specific_price_product; -DROP TABLE IF EXISTS b2b_specific_price_category; +DROP TABLE IF EXISTS b2b_addresses; +DROP TABLE IF EXISTS b2b_top_menu_roles; +DROP TABLE IF EXISTS b2b_favorites; +DROP TABLE IF EXISTS b2b_carts_products; +DROP TABLE IF EXISTS b2b_customer_carts; +DROP TABLE IF EXISTS b2b_specific_price_country; +DROP TABLE IF EXISTS b2b_specific_price_customer; DROP TABLE IF EXISTS b2b_specific_price_product_attribute; +DROP TABLE IF EXISTS b2b_specific_price_category; +DROP TABLE IF EXISTS b2b_specific_price_product; +DROP TABLE IF EXISTS b2b_specific_price; +DROP TABLE IF EXISTS b2b_role_permissions; +DROP TABLE IF EXISTS b2b_permissions; +DROP TABLE IF EXISTS b2b_roles; +DROP TABLE IF EXISTS b2b_countries; +DROP TABLE IF EXISTS b2b_currency_rates; +DROP TABLE IF EXISTS b2b_currencies; +DROP TABLE IF EXISTS b2b_refresh_tokens; +DROP TABLE IF EXISTS b2b_customers; +DROP TABLE IF EXISTS b2b_translations; +DROP TABLE IF EXISTS b2b_scopes; +DROP TABLE IF EXISTS b2b_components; +DROP TABLE IF EXISTS b2b_language; diff --git a/i18n/migrations/20260302163123_create_tables_data.sql b/i18n/migrations/20260302163123_create_tables_data.sql index dafebf7..5f7a634 100644 --- a/i18n/migrations/20260302163123_create_tables_data.sql +++ b/i18n/migrations/20260302163123_create_tables_data.sql @@ -34,13 +34,28 @@ INSERT INTO `b2b_permissions` (`id`, `name`) VALUES ('1', 'user.read.any'); INSERT INTO `b2b_permissions` (`id`, `name`) VALUES ('2', 'user.write.any'); INSERT INTO `b2b_permissions` (`id`, `name`) VALUES ('3', 'user.delete.any'); INSERT INTO `b2b_permissions` (`id`, `name`) VALUES ('4', 'currency.write'); +INSERT INTO `b2b_permissions` (`id`, `name`) VALUES ('5', 'specific_price.manage'); +INSERT INTO `b2b_permissions` (`id`, `name`) VALUES ('6', 'webdav.create_token'); +INSERT INTO `b2b_permissions` (`id`, `name`) VALUES ('7', 'product_translation.save'); +INSERT INTO `b2b_permissions` (`id`, `name`) VALUES ('8', 'product_translation.translate'); +INSERT INTO `b2b_permissions` (`id`, `name`) VALUES ('9', 'search.create_index'); INSERT INTO `b2b_role_permissions` (`role_id`, `permission_id`) VALUES ('2', '1'); INSERT INTO `b2b_role_permissions` (`role_id`, `permission_id`) VALUES ('2', '2'); INSERT INTO `b2b_role_permissions` (`role_id`, `permission_id`) VALUES ('2', '3'); INSERT INTO `b2b_role_permissions` (`role_id`, `permission_id`) VALUES ('2', '4'); +INSERT INTO `b2b_role_permissions` (`role_id`, `permission_id`) VALUES ('2', '5'); +INSERT INTO `b2b_role_permissions` (`role_id`, `permission_id`) VALUES ('2', '6'); +INSERT INTO `b2b_role_permissions` (`role_id`, `permission_id`) VALUES ('2', '7'); +INSERT INTO `b2b_role_permissions` (`role_id`, `permission_id`) VALUES ('2', '8'); +INSERT INTO `b2b_role_permissions` (`role_id`, `permission_id`) VALUES ('2', '9'); INSERT INTO `b2b_role_permissions` (`role_id`, `permission_id`) VALUES ('3', '1'); INSERT INTO `b2b_role_permissions` (`role_id`, `permission_id`) VALUES ('3', '2'); INSERT INTO `b2b_role_permissions` (`role_id`, `permission_id`) VALUES ('3', '3'); INSERT INTO `b2b_role_permissions` (`role_id`, `permission_id`) VALUES ('3', '4'); +INSERT INTO `b2b_role_permissions` (`role_id`, `permission_id`) VALUES ('3', '5'); +INSERT INTO `b2b_role_permissions` (`role_id`, `permission_id`) VALUES ('3', '6'); +INSERT INTO `b2b_role_permissions` (`role_id`, `permission_id`) VALUES ('3', '7'); +INSERT INTO `b2b_role_permissions` (`role_id`, `permission_id`) VALUES ('3', '8'); +INSERT INTO `b2b_role_permissions` (`role_id`, `permission_id`) VALUES ('3', '9'); -- +goose Down \ No newline at end of file diff --git a/i18n/migrations/20260319163200_procedures.sql b/i18n/migrations/20260319163200_procedures.sql index 743ca43..4f44cc0 100644 --- a/i18n/migrations/20260319163200_procedures.sql +++ b/i18n/migrations/20260319163200_procedures.sql @@ -1,386 +1,410 @@ -- +goose Up -DELIMITER // -DROP PROCEDURE IF EXISTS get_full_product -// -CREATE PROCEDURE get_full_product( - IN p_id_product INT UNSIGNED, - IN p_id_shop INT UNSIGNED, - IN p_id_lang INT UNSIGNED, - IN p_id_customer INT UNSIGNED, - IN b2b_id_country INT UNSIGNED, - IN p_quantity INT UNSIGNED -) -BEGIN -DECLARE v_tax_rate DECIMAL(10, 4) DEFAULT 0; -DECLARE p_id_currency DECIMAL(10, 4) DEFAULT 0; -SELECT - COALESCE(t.rate, 0.0000) INTO v_tax_rate -FROM - ps_tax_rule tr - INNER JOIN ps_tax t ON t.id_tax = tr.id_tax - LEFT JOIN b2b_countries ON b2b_countries.id = b2b_id_country -WHERE - tr.id_tax_rules_group = ( - SELECT - ps.id_tax_rules_group - FROM - ps_product_shop ps - WHERE - ps.id_product = p_id_product +DELIMITER // + +DROP FUNCTION IF EXISTS fn_product_price // +CREATE FUNCTION fn_product_price( + p_id_product INT UNSIGNED, + p_id_shop INT UNSIGNED, + p_id_customer INT UNSIGNED, + p_id_country INT UNSIGNED, + p_quantity INT UNSIGNED, + p_id_product_attribute INT UNSIGNED +) +RETURNS JSON +DETERMINISTIC +READS SQL DATA +BEGIN + + DECLARE v_tax_rate DECIMAL(10,4) DEFAULT 0; + + DECLARE v_base_raw DECIMAL(20,6); + DECLARE v_base DECIMAL(20,6); + DECLARE v_excl DECIMAL(20,6); + DECLARE v_incl DECIMAL(20,6); + + DECLARE v_reduction_type VARCHAR(20); + DECLARE v_percentage DECIMAL(10,4); + DECLARE v_fixed_price DECIMAL(20,6); + DECLARE v_specific_currency_id BIGINT; + + DECLARE v_has_specific INT DEFAULT 0; + + -- currency + DECLARE v_target_currency BIGINT; + DECLARE v_target_rate DECIMAL(13,6) DEFAULT 1; + DECLARE v_specific_rate DECIMAL(13,6) DEFAULT 1; + + SET p_id_product_attribute = NULLIF(p_id_product_attribute, 0); + + -- ================= TAX ================= + SELECT COALESCE(t.rate, 0) + INTO v_tax_rate + FROM ps_tax_rule tr + JOIN ps_tax t ON t.id_tax = tr.id_tax + LEFT JOIN b2b_countries c ON c.id = p_id_country + WHERE tr.id_tax_rules_group = ( + SELECT ps.id_tax_rules_group + FROM ps_product_shop ps + WHERE ps.id_product = p_id_product AND ps.id_shop = p_id_shop - LIMIT - 1 + LIMIT 1 ) - AND tr.id_country = b2b_countries.ps_id_country -ORDER BY - tr.id_state DESC, - tr.zipcode_from != '' DESC, - tr.id_tax_rule DESC -LIMIT - 1; - -SELECT - b2b_currencies.ps_id_currency INTO p_id_currency -FROM - b2b_currencies - LEFT JOIN b2b_countries ON b2b_countries.b2b_id_currency = b2b_currencies.id -WHERE - b2b_countries.id = b2b_id_country -LIMIT 1; - -/* FINAL JSON */ -SELECT - JSON_OBJECT( - /* ================= PRODUCT ================= */ - 'id_product', - p.id_product, - 'reference', - p.reference, - 'name', - pl.name, - 'description', - pl.description, - 'short_description', - pl.description_short, - /* ================= PRICE ================= */ -'price', -JSON_OBJECT( - 'base', - COALESCE(ps.price * r.conversion_rate, p.price * r.conversion_rate), + AND tr.id_country = c.ps_id_country + LIMIT 1; - 'final_tax_excl', - ( - CASE - WHEN bsp.id IS NOT NULL THEN - CASE - /* FIXED PRICE */ - WHEN bsp.reduction_type = 'amount' THEN - ( - CASE - WHEN bsp.b2b_id_currency IS NULL THEN bsp.price - ELSE bsp.price * br_bsp.conversion_rate - END - ) + -- ================= TARGET CURRENCY ================= + SELECT c.b2b_id_currency + INTO v_target_currency + FROM b2b_countries c + WHERE c.id = p_id_country + LIMIT 1; - /* PERCENTAGE */ - WHEN bsp.reduction_type = 'percentage' THEN - COALESCE(ps.price * r.conversion_rate, p.price * r.conversion_rate) - * (1 - bsp.percentage_reduction / 100) + -- latest target rate + SELECT r.conversion_rate + INTO v_target_rate + FROM b2b_currency_rates r + WHERE r.b2b_id_currency = v_target_currency + ORDER BY r.created_at DESC + LIMIT 1; - ELSE - COALESCE(ps.price * r.conversion_rate, p.price * r.conversion_rate) - END + -- ================= BASE PRICE (RAW) ================= + SELECT + COALESCE(ps.price, p.price) + COALESCE(pas.price, 0) + INTO v_base_raw + FROM ps_product p + LEFT JOIN ps_product_shop ps + ON ps.id_product = p.id_product AND ps.id_shop = p_id_shop + LEFT JOIN ps_product_attribute_shop pas + ON pas.id_product_attribute = p_id_product_attribute + AND pas.id_shop = p_id_shop + WHERE p.id_product = p_id_product; - ELSE - COALESCE(ps.price * r.conversion_rate, p.price * r.conversion_rate) - END - ), + -- convert base to target currency + SET v_base = v_base_raw * v_target_rate; - 'final_tax_incl', - ( - ( - CASE - WHEN bsp.id IS NOT NULL THEN - CASE - WHEN bsp.reduction_type = 'amount' THEN - ( - CASE - WHEN bsp.b2b_id_currency IS NULL THEN bsp.price - ELSE bsp.price * br_bsp.conversion_rate - END - ) + -- ================= RULE SELECTION ================= + SELECT + 1, + bsp.reduction_type, + bsp.percentage_reduction, + bsp.price, + bsp.b2b_id_currency - WHEN bsp.reduction_type = 'percentage' THEN - COALESCE(ps.price * r.conversion_rate, p.price * r.conversion_rate) - * (1 - bsp.percentage_reduction / 100) + INTO + v_has_specific, + v_reduction_type, + v_percentage, + v_fixed_price, + v_specific_currency_id - ELSE - COALESCE(ps.price * r.conversion_rate, p.price * r.conversion_rate) - END - ELSE - COALESCE(ps.price * r.conversion_rate, p.price * r.conversion_rate) - END - ) * (1 + v_tax_rate / 100) - ) -), - /* ================= META ================= */ - 'active', - COALESCE(ps.active, p.active), - 'visibility', - COALESCE(ps.visibility, p.visibility), - 'manufacturer', - m.name, - 'category', - cl.name, - /* ================= FAVORITE ================= */ - 'is_favorite', - EXISTS( - SELECT 1 FROM b2b_favorites f - WHERE f.user_id = p_id_customer AND f.product_id = p_id_product - ), - /* ================= IMAGE ================= */ - 'cover_image', - JSON_OBJECT( - 'id', - i.id_image, - 'legend', - il.legend - ), - /* ================= FEATURES ================= */ - 'features', - ( - SELECT - JSON_ARRAYAGG( - JSON_OBJECT( - 'name', - fl.name, - 'value', - fvl.value - ) - ) - FROM - ps_feature_product fp - JOIN ps_feature_lang fl ON fl.id_feature = fp.id_feature - AND fl.id_lang = p_id_lang - JOIN ps_feature_value_lang fvl ON fvl.id_feature_value = fp.id_feature_value - AND fvl.id_lang = p_id_lang - WHERE - fp.id_product = p.id_product - ), - /* ================= COMBINATIONS ================= */ - 'combinations', - ( - SELECT - JSON_ARRAYAGG( - JSON_OBJECT( - 'id_product_attribute', - pa.id_product_attribute, - 'reference', - pa.reference, - 'price', - JSON_OBJECT( - 'impact', - COALESCE(pas.price, pa.price), - 'final_tax_excl', - ( - COALESCE(ps.price, p.price) + COALESCE(pas.price, pa.price) - ), - 'final_tax_incl', - ( - ( - COALESCE(ps.price, p.price) + COALESCE(pas.price, pa.price) - ) * (1 + v_tax_rate / 100) - ) - ), - 'stock', - IFNULL(sa.quantity, 0), - 'default_on', - pas.default_on, - /* ATTRIBUTES JSON */ - 'attributes', - ( - SELECT - JSON_ARRAYAGG( - JSON_OBJECT( - 'group', - agl.name, - 'attribute', - al.name - ) - ) - FROM - ps_product_attribute_combination pac - JOIN ps_attribute a ON a.id_attribute = pac.id_attribute - JOIN ps_attribute_lang al ON al.id_attribute = a.id_attribute - AND al.id_lang = p_id_lang - JOIN ps_attribute_group_lang agl ON agl.id_attribute_group = a.id_attribute_group - AND agl.id_lang = p_id_lang - WHERE - pac.id_product_attribute = pa.id_product_attribute - ), - /* IMAGES */ - 'images', - ( - SELECT - JSON_ARRAYAGG(img.id_image) - FROM - ps_product_attribute_image pai - JOIN ps_image img ON img.id_image = pai.id_image - WHERE - pai.id_product_attribute = pa.id_product_attribute - ) - ) - ) - FROM - ps_product_attribute pa - JOIN ps_product_attribute_shop pas ON pas.id_product_attribute = pa.id_product_attribute - AND pas.id_shop = p_id_shop - LEFT JOIN ps_stock_available sa ON sa.id_product = pa.id_product - AND sa.id_product_attribute = pa.id_product_attribute - AND sa.id_shop = p_id_shop - WHERE - pa.id_product = p.id_product - ) - ) AS product_json -FROM - ps_product p - LEFT JOIN ps_product_shop ps ON ps.id_product = p.id_product - AND ps.id_shop = p_id_shop - LEFT JOIN ps_product_lang pl ON pl.id_product = p.id_product - AND pl.id_lang = p_id_lang - AND pl.id_shop = p_id_shop - LEFT JOIN ps_category_lang cl ON cl.id_category = COALESCE(ps.id_category_default, p.id_category_default) - AND cl.id_lang = p_id_lang - AND cl.id_shop = p_id_shop - LEFT JOIN ps_manufacturer m ON m.id_manufacturer = p.id_manufacturer - LEFT JOIN ps_image i ON i.id_product = p.id_product - AND i.cover = 1 - LEFT JOIN ps_image_lang il ON il.id_image = i.id_image - AND il.id_lang = p_id_lang - /* SPECIFIC PRICE */ -LEFT JOIN ( - SELECT bsp.* FROM b2b_specific_price bsp - /* RELATIONS */ - LEFT JOIN b2b_specific_price_product bsp_p - ON bsp_p.b2b_specific_price_id = bsp.id - - LEFT JOIN b2b_specific_price_category bsp_c - ON bsp_c.b2b_specific_price_id = bsp.id - - WHERE bsp.is_active = TRUE - - /* SCOPE MATCH */ - AND ( - /* PRODUCT */ - (bsp.scope = 'product' AND bsp_p.id_product = p_id_product) - - /* CATEGORY */ - OR ( - bsp.scope = 'category' - AND bsp_c.id_category IN ( - SELECT cp.id_category - FROM ps_category_product cp - WHERE cp.id_product = p_id_product - ) - ) - - /* SHOP (GLOBAL) */ - OR (bsp.scope = 'shop') - ) - - /* CUSTOMER MATCH */ -AND ( - NOT EXISTS ( - SELECT 1 FROM b2b_specific_price_customer c - WHERE c.b2b_specific_price_id = bsp.id - ) - OR EXISTS ( - SELECT 1 FROM b2b_specific_price_customer c - WHERE c.b2b_specific_price_id = bsp.id - AND c.b2b_id_customer = p_id_customer - ) -) - -/* COUNTRY MATCH */ -AND ( - NOT EXISTS ( - SELECT 1 FROM b2b_specific_price_country ctry - WHERE ctry.b2b_specific_price_id = bsp.id - ) - OR EXISTS ( - SELECT 1 FROM b2b_specific_price_country ctry - WHERE ctry.b2b_specific_price_id = bsp.id - AND ctry.b2b_id_country = b2b_id_country - ) -) - - /* QUANTITY */ + WHERE bsp.is_active = 1 AND bsp.from_quantity <= p_quantity - /* DATE */ + -- intersection rules (unchanged) AND ( - bsp.has_expiration_date = FALSE OR ( - (bsp.valid_from IS NULL OR bsp.valid_from <= NOW()) - AND (bsp.valid_till IS NULL OR bsp.valid_till >= NOW()) + NOT EXISTS (SELECT 1 FROM b2b_specific_price_product x WHERE x.b2b_specific_price_id = bsp.id) + OR EXISTS (SELECT 1 FROM b2b_specific_price_product x WHERE x.b2b_specific_price_id = bsp.id AND x.id_product = p_id_product) + ) + + AND ( + NOT EXISTS (SELECT 1 FROM b2b_specific_price_product_attribute x WHERE x.b2b_specific_price_id = bsp.id) + OR EXISTS (SELECT 1 FROM b2b_specific_price_product_attribute x WHERE x.b2b_specific_price_id = bsp.id AND x.id_product_attribute = p_id_product_attribute) + ) + + AND ( + NOT EXISTS (SELECT 1 FROM b2b_specific_price_category x WHERE x.b2b_specific_price_id = bsp.id) + OR EXISTS ( + SELECT 1 FROM b2b_specific_price_category x + JOIN ps_category_product cp ON cp.id_category = x.id_category + WHERE x.b2b_specific_price_id = bsp.id AND cp.id_product = p_id_product ) ) - ORDER BY - /* 🔥 SCOPE PRIORITY */ - bsp.scope = 'product' DESC, - bsp.scope = 'category' DESC, - bsp.scope = 'shop' DESC, + AND ( + NOT EXISTS (SELECT 1 FROM b2b_specific_price_customer x WHERE x.b2b_specific_price_id = bsp.id) + OR EXISTS (SELECT 1 FROM b2b_specific_price_customer x WHERE x.b2b_specific_price_id = bsp.id AND x.b2b_id_customer = p_id_customer) + ) - /* 🔥 CUSTOMER PRIORITY */ - ( - EXISTS ( - SELECT 1 FROM b2b_specific_price_customer c - WHERE c.b2b_specific_price_id = bsp.id - AND c.b2b_id_customer = p_id_customer - ) - ) DESC, + AND ( + NOT EXISTS (SELECT 1 FROM b2b_specific_price_country x WHERE x.b2b_specific_price_id = bsp.id) + OR EXISTS (SELECT 1 FROM b2b_specific_price_country x WHERE x.b2b_specific_price_id = bsp.id AND x.b2b_id_country = p_id_country) + ) - /* 🔥 COUNTRY PRIORITY */ - ( - EXISTS ( - SELECT 1 FROM b2b_specific_price_country ctry - WHERE ctry.b2b_specific_price_id = bsp.id - AND ctry.b2b_id_country = b2b_id_country - ) - ) DESC, + ORDER BY + -- customer wins + (EXISTS (SELECT 1 FROM b2b_specific_price_customer x WHERE x.b2b_specific_price_id = bsp.id AND x.b2b_id_customer = p_id_customer)) DESC, - /* GLOBAL fallback (no restrictions) naturally goes last */ + -- attribute + (EXISTS (SELECT 1 FROM b2b_specific_price_product_attribute x WHERE x.b2b_specific_price_id = bsp.id AND x.id_product_attribute = p_id_product_attribute)) DESC, + + -- product + (EXISTS (SELECT 1 FROM b2b_specific_price_product x WHERE x.b2b_specific_price_id = bsp.id AND x.id_product = p_id_product)) DESC, + + -- category + (EXISTS ( + SELECT 1 FROM b2b_specific_price_category x + JOIN ps_category_product cp ON cp.id_category = x.id_category + WHERE x.b2b_specific_price_id = bsp.id AND cp.id_product = p_id_product + )) DESC, + + -- country + (EXISTS (SELECT 1 FROM b2b_specific_price_country x WHERE x.b2b_specific_price_id = bsp.id AND x.b2b_id_country = p_id_country)) DESC, - bsp.from_quantity DESC, bsp.id DESC - LIMIT 1 -) bsp ON 1=1 -LEFT JOIN b2b_currency_rates br_bsp - ON br_bsp.b2b_id_currency = bsp.b2b_id_currency - AND br_bsp.created_at = ( - SELECT MAX(created_at) - FROM b2b_currency_rates - WHERE b2b_id_currency = bsp.b2b_id_currency - ) - LEFT JOIN b2b_countries ON b2b_countries.id = b2b_id_country - LEFT JOIN b2b_currencies ON b2b_currencies.id = p_id_currency - LEFT JOIN b2b_currency_rates r ON r.b2b_id_currency = b2b_currencies.id - AND r.created_at = ( - SELECT - MAX(created_at) - FROM - b2b_currency_rates - WHERE - b2b_id_currency = b2b_currencies.id - ) -WHERE - p.id_product = p_id_product -LIMIT - 1; + LIMIT 1; + + -- ================= APPLY ================= + SET v_excl = v_base; + + IF v_has_specific = 1 THEN + + IF v_reduction_type = 'amount' THEN + + -- convert specific price currency if needed + IF v_specific_currency_id IS NOT NULL AND v_specific_currency_id != v_target_currency THEN + + SELECT r.conversion_rate + INTO v_specific_rate + FROM b2b_currency_rates r + WHERE r.b2b_id_currency = v_specific_currency_id + ORDER BY r.created_at DESC + LIMIT 1; + + -- normalize → then convert to target + SET v_excl = (v_fixed_price / v_specific_rate) * v_target_rate; + + ELSE + SET v_excl = v_fixed_price; + END IF; + + ELSEIF v_reduction_type = 'percentage' THEN + SET v_excl = v_base * (1 - v_percentage / 100); + END IF; + + END IF; + + SET v_incl = v_excl * (1 + v_tax_rate / 100); + + RETURN JSON_OBJECT( + 'base', v_base, + 'final_tax_excl', v_excl, + 'final_tax_incl', v_incl, + 'tax_rate', v_tax_rate, + 'rate', v_target_rate + ); + END // DELIMITER ; + +DELIMITER // + +DROP PROCEDURE IF EXISTS get_product_variants // +CREATE PROCEDURE get_product_variants( + IN p_id_product INT, + IN p_id_shop INT, + IN p_id_lang INT, + IN p_id_customer INT, + IN p_id_country INT, + IN p_quantity INT +) +BEGIN + +SELECT + pa.id_product_attribute, + pa.reference, + + -- PRICE (computed once per row via correlated subquery) + CAST(JSON_UNQUOTE(JSON_EXTRACT( + fn_product_price( + p_id_product, + p_id_shop, + p_id_customer, + p_id_country, + p_quantity, + pa.id_product_attribute + ), + '$.base' + )) AS DECIMAL(20,6)) AS base_price, + + CAST(JSON_UNQUOTE(JSON_EXTRACT( + fn_product_price( + p_id_product, + p_id_shop, + p_id_customer, + p_id_country, + p_quantity, + pa.id_product_attribute + ), + '$.final_tax_excl' + )) AS DECIMAL(20,6)) AS price_tax_excl, + + CAST(JSON_UNQUOTE(JSON_EXTRACT( + fn_product_price( + p_id_product, + p_id_shop, + p_id_customer, + p_id_country, + p_quantity, + pa.id_product_attribute + ), + '$.final_tax_incl' + )) AS DECIMAL(20,6)) AS price_tax_incl, + + IFNULL(sa.quantity, 0) AS quantity, + + ( + SELECT JSON_ARRAYAGG( + JSON_OBJECT( + 'group', agl.name, + 'attribute', al.name + ) + ) + FROM ps_product_attribute_combination pac + JOIN ps_attribute a ON a.id_attribute = pac.id_attribute + JOIN ps_attribute_lang al + ON al.id_attribute = a.id_attribute AND al.id_lang = p_id_lang + JOIN ps_attribute_group_lang agl + ON agl.id_attribute_group = a.id_attribute_group AND agl.id_lang = p_id_lang + WHERE pac.id_product_attribute = pa.id_product_attribute + ) AS attributes + +FROM ps_product_attribute pa + +JOIN ps_product_attribute_shop pas + ON pas.id_product_attribute = pa.id_product_attribute + AND pas.id_shop = p_id_shop + +LEFT JOIN ps_stock_available sa + ON sa.id_product = pa.id_product + AND sa.id_product_attribute = pa.id_product_attribute + AND sa.id_shop = p_id_shop + +WHERE pa.id_product = p_id_product; + +END // + +DELIMITER ; + +DELIMITER // + +DROP PROCEDURE IF EXISTS get_product_price // +CREATE PROCEDURE get_product_price( + IN p_id_product INT, + IN p_id_shop INT, + IN p_id_customer INT, + IN p_id_country INT, + IN p_quantity INT +) +BEGIN + +SELECT fn_product_price( + p_id_product, + p_id_shop, + p_id_customer, + p_id_country, + p_quantity, + NULL +) AS price; + +END // + +DELIMITER ; + +DELIMITER // +DROP PROCEDURE IF EXISTS get_product_base // +CREATE PROCEDURE get_product_base( + IN p_id_product INT, + IN p_id_shop INT, + IN p_id_lang INT +) +BEGIN + SELECT + p.id_product AS id, -- matches view.Product.ID + + p.reference, + p.supplier_reference, + p.ean13, + p.upc, + p.isbn, + + -- Price related (basic) + p.price AS base_price, + p.wholesale_price, + p.unity, + p.unit_price_ratio, + + -- Stock & Availability + p.quantity, + p.minimal_quantity, + p.available_for_order, + p.available_date, + p.out_of_stock AS out_of_stock_behavior, -- 0=deny, 1=allow, 2=default + + -- Flags + COALESCE(ps.on_sale, 0) AS on_sale, + COALESCE(ps.show_price, 1) AS show_price, + p.condition, + p.is_virtual, + + -- Physical + p.weight, + p.width, + p.height, + p.depth, + p.additional_shipping_cost, + + -- Delivery + p.additional_delivery_times AS delivery_days, -- you can adjust if needed + + -- Status + COALESCE(ps.active, p.active) AS active, + COALESCE(ps.visibility, p.visibility) AS visibility, + p.indexed, + + -- Other useful + p.date_add, + p.date_upd, + + -- Language data + pl.name, + pl.description, + pl.description_short, + + -- Relations + m.name AS manufacturer, + cl.name AS category + + -- This doesn't fit to base product, I'll add proper is_favorite to product later + + -- EXISTS( + -- SELECT 1 FROM b2b_favorites f + -- WHERE f.user_id = p_id_customer AND f.product_id = p_id_product + -- ) AS is_favorite + + + + FROM ps_product p + LEFT JOIN ps_product_shop ps + ON ps.id_product = p.id_product + AND ps.id_shop = p_id_shop + LEFT JOIN ps_product_lang pl + ON pl.id_product = p.id_product + AND pl.id_lang = p_id_lang + AND pl.id_shop = p_id_shop + LEFT JOIN ps_category_lang cl + ON cl.id_category = COALESCE(ps.id_category_default, p.id_category_default) + AND cl.id_lang = p_id_lang + AND cl.id_shop = p_id_shop + LEFT JOIN ps_manufacturer m + ON m.id_manufacturer = p.id_manufacturer + + WHERE p.id_product = p_id_product + LIMIT 1; +END // +DELIMITER ; + -- +goose Down diff --git a/i18n/migrations/20260320113729_stuff.sql b/i18n/migrations/20260320113729_stuff.sql deleted file mode 100644 index b9c449e..0000000 --- a/i18n/migrations/20260320113729_stuff.sql +++ /dev/null @@ -1,9 +0,0 @@ --- +goose Up --- +goose StatementBegin -SELECT 'up SQL query'; --- +goose StatementEnd - --- +goose Down --- +goose StatementBegin -SELECT 'down SQL query'; --- +goose StatementEnd