fixes

Reviewed-on: #57
Reviewed-by: Wiktor Dudzic <dudzic_wiktor@ma-al.com>

app/delivery/web/api/restricted/addresses.go

@@ -0,0 +1,157 @@
+package restricted
+
+import (
+	"strconv"
+
+	"git.ma-al.com/goc_daniel/b2b/app/service/addressesService"
+	"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"
+	"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 AddressesHandler struct {
+	addressesService *addressesService.AddressesService
+}
+
+func NewAddressesHandler() *AddressesHandler {
+	addressesService := addressesService.New()
+	return &AddressesHandler{
+		addressesService: addressesService,
+	}
+}
+
+func AddressesHandlerRoutes(r fiber.Router) fiber.Router {
+	handler := NewAddressesHandler()
+
+	r.Get("/get-template", handler.GetTemplate)
+	r.Post("/add-new-address", handler.AddNewAddress)
+	r.Post("/modify-address", handler.ModifyAddress)
+	r.Get("/retrieve-addresses", handler.RetrieveAddressesInfo)
+	r.Delete("/delete-address", handler.DeleteAddress)
+
+	return r
+}
+
+func (h *AddressesHandler) GetTemplate(c fiber.Ctx) error {
+	country_id_attribute := c.Query("country_id")
+	country_id, err := strconv.Atoi(country_id_attribute)
+	if err != nil {
+		return c.Status(responseErrors.GetErrorStatus(responseErrors.ErrBadAttribute)).
+			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, responseErrors.ErrBadAttribute)))
+	}
+
+	template, err := h.addressesService.GetTemplate(uint(country_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(&template, 0, i18n.T_(c, response.Message_OK)))
+}
+
+func (h *AddressesHandler) AddNewAddress(c fiber.Ctx) error {
+	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)))
+	}
+
+	address_info := string(c.Body())
+	if address_info == "" {
+		return c.Status(responseErrors.GetErrorStatus(responseErrors.ErrInvalidBody)).
+			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, responseErrors.ErrInvalidBody)))
+	}
+
+	country_id_attribute := c.Query("country_id")
+	country_id, err := strconv.Atoi(country_id_attribute)
+	if err != nil {
+		return c.Status(responseErrors.GetErrorStatus(responseErrors.ErrBadAttribute)).
+			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, responseErrors.ErrBadAttribute)))
+	}
+
+	err = h.addressesService.AddNewAddress(userID, address_info, uint(country_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)))
+}
+
+func (h *AddressesHandler) ModifyAddress(c fiber.Ctx) error {
+	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)))
+	}
+
+	address_id_attribute := c.Query("address_id")
+	address_id, err := strconv.Atoi(address_id_attribute)
+	if err != nil {
+		return c.Status(responseErrors.GetErrorStatus(responseErrors.ErrBadAttribute)).
+			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, responseErrors.ErrBadAttribute)))
+	}
+
+	address_info := string(c.Body())
+	if address_info == "" {
+		return c.Status(responseErrors.GetErrorStatus(responseErrors.ErrInvalidBody)).
+			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, responseErrors.ErrInvalidBody)))
+	}
+
+	country_id_attribute := c.Query("country_id")
+	country_id, err := strconv.Atoi(country_id_attribute)
+	if err != nil {
+		return c.Status(responseErrors.GetErrorStatus(responseErrors.ErrBadAttribute)).
+			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, responseErrors.ErrBadAttribute)))
+	}
+
+	err = h.addressesService.ModifyAddress(userID, uint(address_id), address_info, uint(country_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)))
+}
+
+func (h *AddressesHandler) RetrieveAddressesInfo(c fiber.Ctx) error {
+	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)))
+	}
+
+	addresses_info, err := h.addressesService.RetrieveAddressesInfo(userID)
+	if err != nil {
+		return c.Status(responseErrors.GetErrorStatus(err)).
+			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, err)))
+	}
+
+	return c.JSON(response.Make(&addresses_info, 0, i18n.T_(c, response.Message_OK)))
+}
+
+func (h *AddressesHandler) DeleteAddress(c fiber.Ctx) error {
+	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)))
+	}
+
+	address_id_attribute := c.Query("address_id")
+	address_id, err := strconv.Atoi(address_id_attribute)
+	if err != nil {
+		return c.Status(responseErrors.GetErrorStatus(responseErrors.ErrBadAttribute)).
+			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, responseErrors.ErrBadAttribute)))
+	}
+
+	err = h.addressesService.DeleteAddress(userID, uint(address_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)))
+}

app/delivery/web/api/restricted/product.go

@@ -34,6 +34,8 @@ func ProductsHandlerRoutes(r fiber.Router) fiber.Router {
 
 	r.Get("/:id/:country_id/:quantity", handler.GetProductJson)
 	r.Get("/list", handler.ListProducts)
+	r.Post("/favorite/:product_id", handler.AddToFavorites)
+	r.Delete("/favorite/:product_id", handler.RemoveFromFavorites)
 
 	return r
 }
@@ -90,7 +92,13 @@ func (h *ProductsHandler) ListProducts(c fiber.Ctx) error {
 			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, responseErrors.ErrBadAttribute)))
 	}
 
-	list, err := h.productService.Find(id_lang, paging, filters)
+	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)
 	if err != nil {
 		return c.Status(responseErrors.GetErrorStatus(err)).
 			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, err)))
@@ -106,4 +114,53 @@ var columnMappingListProducts map[string]string = map[string]string{
 	"category_name": "cl.name",
 	"category_id":   "cp.id_category",
 	"quantity":      "sa.quantity",
+	"is_favorite":   "ps.is_favorite",
+}
+
+func (h *ProductsHandler) AddToFavorites(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)))
+	}
+
+	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)))
+	}
+
+	err = h.productService.AddToFavorites(userID, uint(productID))
+	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 *ProductsHandler) RemoveFromFavorites(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)))
+	}
+
+	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)))
+	}
+
+	err = h.productService.RemoveFromFavorites(userID, uint(productID))
+	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)))
 }

app/delivery/web/init.go

@@ -132,6 +132,10 @@ func (s *Server) Setup() error {
 	carts := s.restricted.Group("/carts")
 	restricted.CartsHandlerRoutes(carts)
 
+	// addresses (restricted)
+	addresses := s.restricted.Group("/addresses")
+	restricted.AddressesHandlerRoutes(addresses)
+
 	// storage (uses various authorization means)
 	restrictedStorage := s.restricted.Group("/storage")
 	webdavStorage := s.webdav.Group("/storage")

app/model/address.go

@@ -0,0 +1,79 @@
+package model
+
+type Address struct {
+	ID          uint   `gorm:"column:id;primaryKey;autoIncrement" json:"id"`
+	CustomerID  uint   `gorm:"column:b2b_customer_id;not null;index" json:"customer_id"`
+	AddressInfo string `gorm:"column:address_info;not null" json:"address_info"`
+	CountryID   uint   `gorm:"column:b2b_country_id;not null" json:"country_id"`
+}
+
+func (Address) TableName() string {
+	return "b2b_addresses"
+}
+
+type AddressUnparsed struct {
+	ID          uint         `gorm:"column:id;primaryKey;autoIncrement" json:"id"`
+	CustomerID  uint         `gorm:"column:b2b_customer_id;not null;index" json:"customer_id"`
+	AddressInfo AddressField `gorm:"column:address_info;not null" json:"address_info"`
+	CountryID   uint         `gorm:"column:b2b_country_id;not null" json:"country_id"`
+}
+
+type AddressField interface {
+}
+
+// Address template in Poland
+type AddressPL struct {
+	PostalCode  string `json:"postal_code"` // format: 00-000
+	City        string `json:"city"`        // e.g. Kraków
+	Voivodeship string `json:"voivodeship"` // e.g. małopolskie (optional but useful)
+
+	Street      string `json:"street"`       // e.g. Marszałkowska
+	BuildingNo  string `json:"building_no"`  // e.g. 10, 221B, 12A
+	ApartmentNo string `json:"apartment_no"` // e.g. 5, 12B
+
+	AddressLine2 string `json:"address_line2"` // optional extra info
+
+	Recipient string `json:"recipient"` // name/company
+}
+
+// Address template in Great Britain
+type AddressGB struct {
+	PostalCode string `json:"postal_code"` // e.g. SW1A 1AA
+	PostTown   string `json:"post_town"`   // e.g. London
+	County     string `json:"county"`      // optional
+
+	Thoroughfare string `json:"thoroughfare"`  // street name, e.g. Baker Street
+	BuildingNo   string `json:"building_no"`   // e.g. 221B
+	BuildingName string `json:"building_name"` // e.g. Flatiron House
+	SubBuilding  string `json:"sub_building"`  // e.g. Flat 5, Apt 2
+
+	AddressLine2 string `json:"address_line2"`
+	Recipient    string `json:"recipient"`
+}
+
+// Address template in Czech Republic
+type AddressCZ struct {
+	PostalCode string `json:"postal_code"` // usually 110 00 or 11000
+	City       string `json:"city"`        // e.g. Praha
+	Region     string `json:"region"`
+
+	Street            string `json:"street"`             // may be omitted in some village-style addresses
+	HouseNumber       string `json:"house_number"`       // descriptive / conscription no.
+	OrientationNumber string `json:"orientation_number"` // optional, often after slash
+
+	AddressLine2 string `json:"address_line2"`
+	Recipient    string `json:"recipient"`
+}
+
+// Address template in Germany
+type AddressDE struct {
+	PostalCode string `json:"postal_code"` // e.g. 10115
+	City       string `json:"city"`        // e.g. Berlin
+	State      string `json:"state"`       // Bundesland, optional
+
+	Street      string `json:"street"`       // e.g. Unter den Linden
+	HouseNumber string `json:"house_number"` // e.g. 77, 12a
+
+	AddressLine2 string `json:"address_line2"` // extra details
+	Recipient    string `json:"recipient"`
+}

app/model/category.go

@@ -11,6 +11,7 @@ type ScannedCategory struct {
 	IsoCode     string `gorm:"column:iso_code"`
 
 	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 {

app/model/product.go

@@ -70,6 +70,7 @@ type ProductInList struct {
 	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"`
 }
 
 type ProductFilters struct {
@@ -85,3 +86,12 @@ type ProductFilters struct {
 }
 
 type FeatVal = map[uint][]uint
+
+type B2bFavorite struct {
+	UserID    uint `gorm:"column:user_id;not null;primaryKey" json:"user_id"`
+	ProductID uint `gorm:"column:product_id;not null;primaryKey" json:"product_id"`
+}
+
+func (*B2bFavorite) TableName() string {
+	return "b2b_favorites"
+}

app/repos/addressesRepo/addressesRepo.go

@@ -0,0 +1,91 @@
+package addressesRepo
+
+import (
+	"git.ma-al.com/goc_daniel/b2b/app/db"
+	"git.ma-al.com/goc_daniel/b2b/app/model"
+)
+
+type UIAddressesRepo interface {
+	UserHasAddress(user_id uint, address_id uint) (uint, error)
+	UserAddressesAmt(user_id uint) (uint, error)
+	AddNewAddress(user_id uint, address_info string, country_id uint) error
+	UpdateAddress(user_id uint, address_id uint, address_info string, country_id uint) error
+	RetrieveAddresses(user_id uint) (*[]model.Address, error)
+	DeleteAddress(user_id uint, address_id uint) error
+}
+
+type AddressesRepo struct{}
+
+func New() UIAddressesRepo {
+	return &AddressesRepo{}
+}
+
+func (repo *AddressesRepo) UserHasAddress(user_id uint, address_id uint) (uint, error) {
+	var amt uint
+
+	err := db.DB.
+		Table("b2b_addresses").
+		Select("COUNT(*) AS amt").
+		Where("id = ? AND b2b_customer_id = ?", address_id, user_id).
+		Scan(&amt).
+		Error
+
+	return amt, err
+}
+
+func (repo *AddressesRepo) UserAddressesAmt(user_id uint) (uint, error) {
+	var amt uint
+
+	err := db.DB.
+		Table("b2b_addresses").
+		Select("COUNT(*) AS amt").
+		Where("b2b_customer_id = ?", user_id).
+		Scan(&amt).
+		Error
+
+	return amt, err
+}
+
+func (repo *AddressesRepo) AddNewAddress(user_id uint, address_info string, country_id uint) error {
+	address := model.Address{
+		CustomerID:  user_id,
+		AddressInfo: address_info,
+		CountryID:   country_id,
+	}
+
+	return db.DB.
+		Create(&address).
+		Error
+}
+
+func (repo *AddressesRepo) UpdateAddress(user_id uint, address_id uint, address_info string, country_id uint) error {
+	address := model.Address{
+		ID:          address_id,
+		CustomerID:  user_id,
+		AddressInfo: address_info,
+		CountryID:   country_id,
+	}
+
+	return db.DB.
+		Where("id = ? AND b2b_customer_id = ?", address_id, user_id).
+		Updates(&address).
+		Error
+}
+
+func (repo *AddressesRepo) RetrieveAddresses(user_id uint) (*[]model.Address, error) {
+	var addresses []model.Address
+
+	err := db.DB.
+		Where("b2b_customer_id = ?", user_id).
+		Find(&addresses).
+		Error
+
+	return &addresses, err
+}
+
+func (repo *AddressesRepo) DeleteAddress(user_id uint, address_id uint) error {
+	return db.DB.
+		Where("id = ? AND b2b_customer_id = ?", address_id, user_id).
+		Delete(&model.Address{}).
+		Error
+}

app/repos/categoriesRepo/categoriesRepo.go

@@ -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
-}

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
+}

app/repos/productsRepo/productsRepo.go

@@ -16,7 +16,11 @@ import (
 
 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 uint, p find.Paging, filt *filters.FiltersList) (find.Found[model.ProductInList], error)
+	Find(id_lang, userID uint, p find.Paging, filt *filters.FiltersList) (find.Found[model.ProductInList], error)
+	AddToFavorites(userID uint, productID uint) error
+	RemoveFromFavorites(userID uint, productID uint) error
+	ExistsInFavorites(userID uint, productID uint) (bool, error)
+	ProductInDatabase(productID uint) (bool, error)
 }
 
 type ProductsRepo struct{}
@@ -37,7 +41,6 @@ func (repo *ProductsRepo) GetJSON(p_id_product, p_id_shop, p_id_lang, p_id_custo
 		return nil, err
 	}
 
-	// Optional: validate it's valid JSON
 	if !json.Valid([]byte(productStr)) {
 		return nil, fmt.Errorf("invalid json returned from stored procedure")
 	}
@@ -46,7 +49,7 @@ func (repo *ProductsRepo) GetJSON(p_id_product, p_id_shop, p_id_lang, p_id_custo
 	return &raw, nil
 }
 
-func (repo *ProductsRepo) Find(id_lang uint, p find.Paging, filt *filters.FiltersList) (find.Found[model.ProductInList], error) {
+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
 
@@ -60,7 +63,8 @@ func (repo *ProductsRepo) Find(id_lang uint, p find.Paging, filt *filters.Filter
 			cl.name AS category_name,
 			p.reference AS reference,
 			COALESCE(v.variants_number, 0) AS variants_number,
-            sa.quantity AS quantity
+			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).
@@ -68,15 +72,37 @@ func (repo *ProductsRepo) Find(id_lang uint, p find.Paging, filt *filters.Filter
 		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").
-		Clauses(exclause.With{CTEs: []exclause.CTE{
+		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")},
+					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().
+							Table("b2b_favorites").
+							Select(`
+								product_id AS id_product,
+								COUNT(*) > 0 AS is_favorite
+							`).
+							Where("user_id = ?", userID).
+							Group("product_id"),
+					},
+				},
+			},
+		}).
 		Order("ps.id_product DESC")
 
 	// Apply all filters
@@ -103,3 +129,35 @@ func (repo *ProductsRepo) Find(id_lang uint, p find.Paging, filt *filters.Filter
 		Count: uint(total),
 	}, nil
 }
+
+func (repo *ProductsRepo) AddToFavorites(userID uint, productID uint) error {
+	fav := model.B2bFavorite{
+		UserID:    userID,
+		ProductID: productID,
+	}
+	return db.Get().Create(&fav).Error
+}
+
+func (repo *ProductsRepo) RemoveFromFavorites(userID uint, productID uint) error {
+	return db.Get().
+		Where("user_id = ? AND product_id = ?", userID, productID).
+		Delete(&model.B2bFavorite{}).Error
+}
+
+func (repo *ProductsRepo) ExistsInFavorites(userID uint, productID uint) (bool, error) {
+	var count int64
+	err := db.Get().
+		Table("b2b_favorites").
+		Where("user_id = ? AND product_id = ?", userID, productID).
+		Count(&count).Error
+	return count >= 1, err
+}
+
+func (repo *ProductsRepo) ProductInDatabase(productID uint) (bool, error) {
+	var count int64
+	err := db.Get().
+		Table(dbmodel.TableNamePsProduct).
+		Where(dbmodel.PsProductCols.IDProduct.Col()+" = ?", productID).
+		Count(&count).Error
+	return count >= 1, err
+}

app/service/addressesService/addressesService.go

@@ -0,0 +1,152 @@
+package addressesService
+
+import (
+	"encoding/json"
+	"fmt"
+	"strings"
+
+	"git.ma-al.com/goc_daniel/b2b/app/model"
+	"git.ma-al.com/goc_daniel/b2b/app/repos/addressesRepo"
+	constdata "git.ma-al.com/goc_daniel/b2b/app/utils/const_data"
+	"git.ma-al.com/goc_daniel/b2b/app/utils/responseErrors"
+)
+
+type AddressesService struct {
+	repo addressesRepo.UIAddressesRepo
+}
+
+func New() *AddressesService {
+	return &AddressesService{
+		repo: addressesRepo.New(),
+	}
+}
+
+func (s *AddressesService) GetTemplate(country_id uint) (model.AddressField, error) {
+	switch country_id {
+
+	case 1: // Poland
+		return model.AddressPL{}, nil
+
+	case 2: // Great Britain
+		return model.AddressGB{}, nil
+
+	case 3: // Czech Republic
+		return model.AddressCZ{}, nil
+
+	case 4: // Germany
+		return model.AddressDE{}, nil
+
+	default:
+		return nil, responseErrors.ErrInvalidCountryID
+	}
+}
+
+func (s *AddressesService) AddNewAddress(user_id uint, address_info string, country_id uint) error {
+	amt, err := s.repo.UserAddressesAmt(user_id)
+	if err != nil {
+		return err
+	} else if amt >= constdata.MAX_AMOUNT_OF_ADDRESSES_PER_USER {
+		return responseErrors.ErrMaxAmtOfAddressesReached
+	}
+
+	_, err = s.validateAddressJson(address_info, country_id)
+	if err != nil {
+		return err
+	}
+
+	return s.repo.AddNewAddress(user_id, address_info, country_id)
+}
+
+// country_id = 0 means that country_id remains unchanged
+func (s *AddressesService) ModifyAddress(user_id uint, address_id uint, address_info string, country_id uint) error {
+	amt, err := s.repo.UserHasAddress(user_id, address_id)
+	if err != nil {
+		return err
+	} else if amt != 1 {
+		return responseErrors.ErrUserHasNoSuchAddress
+	}
+
+	_, err = s.validateAddressJson(address_info, country_id)
+	if err != nil {
+		return err
+	}
+
+	return s.repo.UpdateAddress(user_id, address_id, address_info, country_id)
+}
+
+func (s *AddressesService) RetrieveAddressesInfo(user_id uint) (*[]model.AddressUnparsed, error) {
+	parsed_addresses, err := s.repo.RetrieveAddresses(user_id)
+	if err != nil {
+		return nil, err
+	}
+
+	var unparsed_addresses []model.AddressUnparsed
+
+	for i := 0; i < len(*parsed_addresses); i++ {
+		var next_address model.AddressUnparsed
+		next_address.ID = (*parsed_addresses)[i].ID
+		next_address.CustomerID = (*parsed_addresses)[i].CustomerID
+		next_address.CountryID = (*parsed_addresses)[i].CountryID
+
+		next_address.AddressInfo, err = s.validateAddressJson((*parsed_addresses)[i].AddressInfo, next_address.CountryID)
+		// log such errors
+		if err != nil {
+			fmt.Printf("err: %v\n", err)
+		}
+
+		unparsed_addresses = append(unparsed_addresses, next_address)
+	}
+
+	return &unparsed_addresses, nil
+}
+
+func (s *AddressesService) DeleteAddress(user_id uint, address_id uint) error {
+	amt, err := s.repo.UserHasAddress(user_id, address_id)
+	if err != nil {
+		return err
+	} else if amt != 1 {
+		return responseErrors.ErrUserHasNoSuchAddress
+	}
+
+	return s.repo.DeleteAddress(user_id, address_id)
+}
+
+// validateAddressJson makes sure that the info string represents a valid json of address in given country
+func (s *AddressesService) validateAddressJson(info string, country_id uint) (model.AddressField, error) {
+	dec := json.NewDecoder(strings.NewReader(info))
+	dec.DisallowUnknownFields()
+
+	switch country_id {
+
+	case 1: // Poland
+		var address model.AddressPL
+		if err := dec.Decode(&address); err != nil {
+			return address, responseErrors.ErrInvalidAddressJSON
+		}
+		return address, nil
+
+	case 2: // Great Britain
+		var address model.AddressGB
+		if err := dec.Decode(&address); err != nil {
+			return address, responseErrors.ErrInvalidAddressJSON
+		}
+		return address, nil
+
+	case 3: // Czech Republic
+		var address model.AddressCZ
+		if err := dec.Decode(&address); err != nil {
+			return address, responseErrors.ErrInvalidAddressJSON
+		}
+		return address, nil
+
+	case 4: // Germany
+		var address model.AddressDE
+		if err := dec.Decode(&address); err != nil {
+			return address, responseErrors.ErrInvalidAddressJSON
+		}
+		return address, nil
+
+	default:
+		return nil, responseErrors.ErrInvalidCountryID
+	}
+}

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
+	categoryRepo categoryrepo.UICategoryRepo
 	routesRepo   routesRepo.UIRoutesRepo
 }
 
 func New() *MenuService {
 	return &MenuService{
-		categoriesRepo: categoriesRepo.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)
+}

app/service/productService/productService.go

@@ -8,6 +8,7 @@ import (
 	constdata "git.ma-al.com/goc_daniel/b2b/app/utils/const_data"
 	"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"
 )
 
 type ProductService struct {
@@ -29,6 +30,46 @@ func (s *ProductService) GetJSON(p_id_product, p_id_lang, p_id_customer, b2b_id_
 	return products, nil
 }
 
-func (s *ProductService) Find(id_lang uint, p find.Paging, filters *filters.FiltersList) (find.Found[model.ProductInList], error) {
+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, p, filters)
+	return s.productsRepo.Find(id_lang, userID, p, filters)
+}
+
+func (s *ProductService) AddToFavorites(userID uint, productID uint) error {
+	exists, err := s.productsRepo.ProductInDatabase(productID)
+	if err != nil {
+		return err
+	}
+	if !exists {
+		return responseErrors.ErrProductNotFound
+	}
+
+	exists, err = s.productsRepo.ExistsInFavorites(userID, productID)
+	if err != nil {
+		return err
+	}
+	if exists {
+		return responseErrors.ErrAlreadyInFavorites
+	}
+
+	return s.productsRepo.AddToFavorites(userID, productID)
+}
+
+func (s *ProductService) RemoveFromFavorites(userID uint, productID uint) error {
+	exists, err := s.productsRepo.ProductInDatabase(productID)
+	if err != nil {
+		return err
+	}
+	if !exists {
+		return responseErrors.ErrProductNotFound
+	}
+
+	exists, err = s.productsRepo.ExistsInFavorites(userID, productID)
+	if err != nil {
+		return err
+	}
+	if !exists {
+		return responseErrors.ErrNotInFavorites
+	}
+
+	return s.productsRepo.RemoveFromFavorites(userID, productID)
 }

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 {
+func transliterateSlug(s string) string {
-	var b strings.Builder
+	var cleared string
-	b.Grow(len(s))
 
-	for _, r := range s {
+	err := db.DB.Raw("SELECT slugify_eu(?)", s).Scan(&cleared).Error
-		if repl, ok := constdata.TRANSLITERATION_TABLE[r]; ok {
+	if err != nil {
-			b.WriteString(repl)
+		// log error
-		} else {
+		_ = err
-			b.WriteRune(r)
+		return s
-		}
 	}
 
-	return b.String()
+	return cleared
 }
 
 func removeDiacritics(s string) string {

app/utils/const_data/consts.go

@@ -9,9 +9,14 @@ 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"
 
+const MAX_AMOUNT_OF_ADDRESSES_PER_USER = 10
+
 const USER_LOCALE = "user"
 
 // WEBDAV
@@ -23,23 +28,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",
-}

app/utils/responseErrors/responseErrors.go

@@ -49,8 +49,11 @@ var (
 	ErrAIResponseFail = errors.New("AI responded with failure")
 	ErrAIBadOutput    = errors.New("AI response does not obey the format")
 
-	// Typed errors for product list handler
+	// Typed errors for product handler
 	ErrBadPaging          = errors.New("bad or missing paging attribute value in header")
+	ErrProductNotFound    = errors.New("product with provided id does not exist")
+	ErrAlreadyInFavorites = errors.New("the product already is in your favorites")
+	ErrNotInFavorites     = errors.New("the product already is not in your favorites")
 
 	// Typed errors for menu handler
 	ErrNoRootFound           = errors.New("no root found in categories table")
@@ -72,6 +75,12 @@ var (
 
 	// Typed errors for data parsing
 	ErrJSONBody = errors.New("invalid JSON body")
+
+	// Typed errors for addresses
+	ErrMaxAmtOfAddressesReached = errors.New("maximal amount of addresses per user reached")
+	ErrUserHasNoSuchAddress     = errors.New("user has no such address")
+	ErrInvalidCountryID         = errors.New("invalid country id")
+	ErrInvalidAddressJSON       = errors.New("invalid address json")
 )
 
 // Error represents an error with HTTP status code
@@ -154,7 +163,7 @@ func GetErrorCode(c fiber.Ctx, err error) string {
 	case errors.Is(err, ErrBadField):
 		return i18n.T_(c, "error.err_bad_field")
 	case errors.Is(err, ErrInvalidURLSlug):
-		return i18n.T_(c, "error.invalid_url_slug")
+		return i18n.T_(c, "error.err_invalid_url_slug")
 	case errors.Is(err, ErrInvalidXHTML):
 		return i18n.T_(c, "error.err_invalid_html")
 	case errors.Is(err, ErrAIResponseFail):
@@ -164,37 +173,52 @@ func GetErrorCode(c fiber.Ctx, err error) string {
 
 	case errors.Is(err, ErrBadPaging):
 		return i18n.T_(c, "error.err_bad_paging")
+	case errors.Is(err, ErrProductNotFound):
+		return i18n.T_(c, "error.err_product_not_found")
+	case errors.Is(err, ErrAlreadyInFavorites):
+		return i18n.T_(c, "error.err_already_in_favorites")
+	case errors.Is(err, ErrNotInFavorites):
+		return i18n.T_(c, "error.err_already_not_in_favorites")
 
 	case errors.Is(err, ErrNoRootFound):
-		return i18n.T_(c, "error.no_root_found")
+		return i18n.T_(c, "error.err_no_root_found")
 	case errors.Is(err, ErrCircularDependency):
-		return i18n.T_(c, "error.circular_dependency")
+		return i18n.T_(c, "error.err_circular_dependency")
 	case errors.Is(err, ErrStartCategoryNotFound):
-		return i18n.T_(c, "error.start_category_not_found")
+		return i18n.T_(c, "error.err_start_category_not_found")
 	case errors.Is(err, ErrRootNeverReached):
-		return i18n.T_(c, "error.root_never_reached")
+		return i18n.T_(c, "error.err_root_never_reached")
 
 	case errors.Is(err, ErrMaxAmtOfCartsReached):
-		return i18n.T_(c, "error.max_amt_of_carts_reached")
+		return i18n.T_(c, "error.err_max_amt_of_carts_reached")
 	case errors.Is(err, ErrUserHasNoSuchCart):
-		return i18n.T_(c, "error.user_has_no_such_cart")
+		return i18n.T_(c, "error.err_user_has_no_such_cart")
 	case errors.Is(err, ErrProductOrItsVariationDoesNotExist):
-		return i18n.T_(c, "error.product_or_its_variation_does_not_exist")
+		return i18n.T_(c, "error.err_product_or_its_variation_does_not_exist")
 
 	case errors.Is(err, ErrAccessDenied):
-		return i18n.T_(c, "error.access_denied")
+		return i18n.T_(c, "error.err_access_denied")
 	case errors.Is(err, ErrFolderDoesNotExist):
-		return i18n.T_(c, "error.folder_does_not_exist")
+		return i18n.T_(c, "error.err_folder_does_not_exist")
 	case errors.Is(err, ErrFileDoesNotExist):
-		return i18n.T_(c, "error.file_does_not_exist")
+		return i18n.T_(c, "error.err_file_does_not_exist")
 	case errors.Is(err, ErrNameTaken):
-		return i18n.T_(c, "error.name_taken")
+		return i18n.T_(c, "error.err_name_taken")
 	case errors.Is(err, ErrMissingFileFieldDocument):
-		return i18n.T_(c, "error.missing_file_field_document")
+		return i18n.T_(c, "error.err_missing_file_field_document")
 
 	case errors.Is(err, ErrJSONBody):
 		return i18n.T_(c, "error.err_json_body")
 
+	case errors.Is(err, ErrMaxAmtOfAddressesReached):
+		return i18n.T_(c, "error.err_max_amt_of_addresses_reached")
+	case errors.Is(err, ErrUserHasNoSuchAddress):
+		return i18n.T_(c, "error.err_user_has_no_such_address")
+	case errors.Is(err, ErrInvalidCountryID):
+		return i18n.T_(c, "error.err_invalid_country_id")
+	case errors.Is(err, ErrInvalidAddressJSON):
+		return i18n.T_(c, "error.err_invalid_address_json")
+
 	default:
 		return i18n.T_(c, "error.err_internal_server_error")
 	}
@@ -234,6 +258,9 @@ func GetErrorStatus(err error) int {
 		errors.Is(err, ErrInvalidURLSlug),
 		errors.Is(err, ErrInvalidXHTML),
 		errors.Is(err, ErrBadPaging),
+		errors.Is(err, ErrProductNotFound),
+		errors.Is(err, ErrAlreadyInFavorites),
+		errors.Is(err, ErrNotInFavorites),
 		errors.Is(err, ErrNoRootFound),
 		errors.Is(err, ErrCircularDependency),
 		errors.Is(err, ErrStartCategoryNotFound),
@@ -246,7 +273,11 @@ func GetErrorStatus(err error) int {
 		errors.Is(err, ErrFileDoesNotExist),
 		errors.Is(err, ErrNameTaken),
 		errors.Is(err, ErrMissingFileFieldDocument),
-		errors.Is(err, ErrJSONBody):
+		errors.Is(err, ErrJSONBody),
+		errors.Is(err, ErrMaxAmtOfAddressesReached),
+		errors.Is(err, ErrUserHasNoSuchAddress),
+		errors.Is(err, ErrInvalidCountryID),
+		errors.Is(err, ErrInvalidAddressJSON):
 		return fiber.StatusBadRequest
 	case errors.Is(err, ErrEmailExists):
 		return fiber.StatusConflict

bo/components.d.ts

@@ -13,7 +13,6 @@ declare module 'vue' {
   export interface GlobalComponents {
     CartDetails: typeof import('./src/components/customer/CartDetails.vue')['default']
     CategoryMenu: typeof import('./src/components/inner/categoryMenu.vue')['default']
-    CategoryMenuListing: typeof import('./src/components/inner/categoryMenuListing.vue')['default']
     Cs_PrivacyPolicyView: typeof import('./src/components/terms/cs_PrivacyPolicyView.vue')['default']
     Cs_TermsAndConditionsView: typeof import('./src/components/terms/cs_TermsAndConditionsView.vue')['default']
     En_PrivacyPolicyView: typeof import('./src/components/terms/en_PrivacyPolicyView.vue')['default']

bruno/api_v1/product/Add To Favorites.yml

@@ -0,0 +1,15 @@
+info:
+  name: Add To Favorites
+  type: http
+  seq: 3
+
+http:
+  method: POST
+  url: "{{bas_url}}/restricted/product/favorite/53"
+  auth: inherit
+
+settings:
+  encodeUrl: true
+  timeout: 0
+  followRedirects: true
+  maxRedirects: 5

bruno/api_v1/product/Remove Form Favorites.yml

@@ -0,0 +1,15 @@
+info:
+  name: Remove Form Favorites
+  type: http
+  seq: 4
+
+http:
+  method: DELETE
+  url: "{{bas_url}}/restricted/product/favorite/51"
+  auth: inherit
+
+settings:
+  encodeUrl: true
+  timeout: 0
+  followRedirects: true
+  maxRedirects: 5

bruno/b2b_daniel/addresses/add-new-address.yml

@@ -0,0 +1,31 @@
+info:
+  name: add-new-address
+  type: http
+  seq: 1
+
+http:
+  method: POST
+  url: http://localhost:3000/api/v1/restricted/addresses/add-new-address?country_id=1
+  params:
+    - name: country_id
+      value: "1"
+      type: query
+  body:
+    type: json
+    data: |-
+      {
+        "postal_code": "31-154",
+        "city": "Kraków",
+        "voivodeship": "małopolskie",
+        "street": "Długa",
+        "building_no": "5",
+        "apartment_no": "7",
+        "recipient": "Jan Kowalski"
+      }
+  auth: inherit
+
+settings:
+  encodeUrl: true
+  timeout: 0
+  followRedirects: true
+  maxRedirects: 5

bruno/b2b_daniel/addresses/delete-address.yml

@@ -0,0 +1,19 @@
+info:
+  name: delete-address
+  type: http
+  seq: 4
+
+http:
+  method: DELETE
+  url: http://localhost:3000/api/v1/restricted/addresses/delete-address?address_id=1
+  params:
+    - name: address_id
+      value: "1"
+      type: query
+  auth: inherit
+
+settings:
+  encodeUrl: true
+  timeout: 0
+  followRedirects: true
+  maxRedirects: 5

bruno/b2b_daniel/addresses/folder.yml

@@ -0,0 +1,7 @@
+info:
+  name: addresses
+  type: folder
+  seq: 10
+
+request:
+  auth: inherit

bruno/b2b_daniel/addresses/get-template.yml

@@ -0,0 +1,19 @@
+info:
+  name: get-template
+  type: http
+  seq: 5
+
+http:
+  method: GET
+  url: http://localhost:3000/api/v1/restricted/addresses/get-template?country_id=3
+  params:
+    - name: country_id
+      value: "3"
+      type: query
+  auth: inherit
+
+settings:
+  encodeUrl: true
+  timeout: 0
+  followRedirects: true
+  maxRedirects: 5

bruno/b2b_daniel/addresses/modify-address.yml

@@ -0,0 +1,33 @@
+info:
+  name: modify-address
+  type: http
+  seq: 2
+
+http:
+  method: POST
+  url: http://localhost:3000/api/v1/restricted/addresses/modify-address?country_id=1&address_id=1
+  params:
+    - name: country_id
+      value: "1"
+      type: query
+    - name: address_id
+      value: "1"
+      type: query
+  body:
+    type: json
+    data: |-
+      {
+        "postal_code": "31-154",
+        "city": "Kraków",
+        "voivodeship": "śląskie",
+        "street": "Długa",
+        "building_no": "5",
+        "recipient": "Adam Adamowicz"
+      }
+  auth: inherit
+
+settings:
+  encodeUrl: true
+  timeout: 0
+  followRedirects: true
+  maxRedirects: 5

bruno/b2b_daniel/addresses/retrieve-addresses.yml

@@ -0,0 +1,15 @@
+info:
+  name: retrieve-addresses
+  type: http
+  seq: 3
+
+http:
+  method: GET
+  url: http://localhost:3000/api/v1/restricted/addresses/retrieve-addresses
+  auth: inherit
+
+settings:
+  encodeUrl: true
+  timeout: 0
+  followRedirects: true
+  maxRedirects: 5

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"

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
 

bruno/b2b_daniel/storage-restricted/download-file.yml

@@ -0,0 +1,15 @@
+info:
+  name: download-file
+  type: http
+  seq: 3
+
+http:
+  method: GET
+  url: http://localhost:3000/api/v1/restricted/storage/download-file/dest/src/cccc.txt
+  auth: inherit
+
+settings:
+  encodeUrl: true
+  timeout: 0
+  followRedirects: true
+  maxRedirects: 5

bruno/b2b_daniel/storage-restricted/list-content.yml

@@ -0,0 +1,15 @@
+info:
+  name: list-content
+  type: http
+  seq: 2
+
+http:
+  method: GET
+  url: http://localhost:3000/api/v1/restricted/storage/list-content/dest/src
+  auth: inherit
+
+settings:
+  encodeUrl: true
+  timeout: 0
+  followRedirects: true
+  maxRedirects: 5

go.mod

@@ -36,8 +36,6 @@ require (
 	github.com/googleapis/enterprise-certificate-proxy v0.3.6 // indirect
 	github.com/googleapis/gax-go/v2 v2.15.0 // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
-	github.com/mattn/go-runewidth v0.0.16 // indirect
-	github.com/rivo/uniseg v0.2.0 // indirect
 	github.com/spf13/pflag v1.0.6 // indirect
 	github.com/tidwall/gjson v1.18.0 // indirect
 	github.com/tidwall/match v1.1.1 // indirect
@@ -100,10 +98,10 @@ require (
 	github.com/valyala/fasthttp v1.69.0 // indirect
 	github.com/xanzy/ssh-agent v0.3.3 // indirect
 	github.com/xyproto/randomstring v1.2.0 // indirect
-	golang.org/x/net v0.52.0
+	golang.org/x/net v0.52.0 // indirect
 	golang.org/x/sync v0.20.0 // indirect
 	golang.org/x/sys v0.42.0 // indirect
-	golang.org/x/text v0.35.0 // indirect
+	golang.org/x/text v0.35.0
 	gopkg.in/warnings.v0 v0.1.2 // indirect
 	gorm.io/driver/mysql v1.6.0
 )

go.sum

@@ -72,8 +72,6 @@ github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=
 github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE=
 github.com/go-sql-driver/mysql v1.8.1 h1:LedoTUt/eveggdHS9qUFC1EFSa8bU2+1pZjSRpvNJ1Y=
 github.com/go-sql-driver/mysql v1.8.1/go.mod h1:wEBSXgmK//2ZFJyE+qWnIsVGmvmEKlqwuVSjsCm7DZg=
-github.com/gofiber/fiber/v2 v2.52.12 h1:0LdToKclcPOj8PktUdIKo9BUohjjwfnQl42Dhw8/WUw=
-github.com/gofiber/fiber/v2 v2.52.12/go.mod h1:YEcBbO/FB+5M1IZNBP9FO3J9281zgPAreiI1oqg8nDw=
 github.com/gofiber/fiber/v3 v3.1.0 h1:1p4I820pIa+FGxfwWuQZ5rAyX0WlGZbGT6Hnuxt6hKY=
 github.com/gofiber/fiber/v3 v3.1.0/go.mod h1:n2nYQovvL9z3Too/FGOfgtERjW3GQcAUqgfoezGBZdU=
 github.com/gofiber/schema v1.7.0 h1:yNM+FNRZjyYEli9Ey0AXRBrAY9jTnb+kmGs3lJGPvKg=
@@ -136,8 +134,6 @@ github.com/mattn/go-colorable v0.1.14 h1:9A9LHSqF/7dyVVX6g0U9cwm9pG3kP9gSzcuIPHP
 github.com/mattn/go-colorable v0.1.14/go.mod h1:6LmQG8QLFO4G5z1gPvYEzlUgJ2wF+stgPZH1UqBm1s8=
 github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
 github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
-github.com/mattn/go-runewidth v0.0.16 h1:E5ScNMtiwvlvB5paMFdw9p4kSQzbXFikJ5SQO6TULQc=
-github.com/mattn/go-runewidth v0.0.16/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
 github.com/mattn/go-sqlite3 v1.14.8/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU=
 github.com/mattn/go-sqlite3 v1.14.22 h1:2gZY6PC6kBnID23Tichd1K+Z0oS6nE/XwU+Vz/5o4kU=
 github.com/mattn/go-sqlite3 v1.14.22/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y=
@@ -158,8 +154,6 @@ github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINE
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U=
 github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/rivo/uniseg v0.2.0 h1:S1pD9weZBuJdFmowNwbpi7BJ8TNftyUImj/0WQi72jY=
-github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
 github.com/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0tI/otEQ=
 github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7so1lCWt35ZSgc=
 github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=

i18n/migrations/20260302163122_create_tables.sql

@@ -151,6 +151,16 @@ CREATE TABLE IF NOT EXISTS b2b_carts_products (
 CREATE INDEX IF NOT EXISTS idx_carts_products_cart_id ON b2b_carts_products (cart_id);
 
 
+-- favorites
+CREATE TABLE IF NOT EXISTS b2b_favorites (
+  user_id BIGINT UNSIGNED NOT NULL,
+  product_id INT UNSIGNED NOT NULL,
+  PRIMARY KEY (user_id, product_id),
+  CONSTRAINT fk_favorites_customer FOREIGN KEY (user_id) REFERENCES b2b_customers(id) ON DELETE CASCADE ON UPDATE CASCADE,
+  CONSTRAINT fk_favorites_product FOREIGN KEY (product_id) REFERENCES ps_product(id_product) ON DELETE CASCADE ON UPDATE CASCADE
+) ENGINE = InnoDB DEFAULT CHARSET = utf8mb4;
+
+
 -- refresh_tokens
 CREATE TABLE IF NOT EXISTS b2b_refresh_tokens (
   id INT UNSIGNED AUTO_INCREMENT PRIMARY KEY,
@@ -210,6 +220,18 @@ ON `b2b_countries` (
   `ps_id_country` ASC
 );
 
+-- addresses
+CREATE TABLE IF NOT EXISTS b2b_addresses (
+  id BIGINT UNSIGNED AUTO_INCREMENT NOT NULL,
+  b2b_customer_id BIGINT UNSIGNED NOT NULL,
+  address_info TEXT NOT NULL,
+  b2b_country_id BIGINT UNSIGNED NOT NULL,
+   PRIMARY KEY (id),
+  CONSTRAINT fk_b2b_addresses_b2b_customers FOREIGN KEY (b2b_customer_id) REFERENCES b2b_customers (id) ON DELETE CASCADE ON UPDATE CASCADE,
+  CONSTRAINT fk_b2b_addresses_b2b_countries FOREIGN KEY (b2b_country_id) REFERENCES b2b_countries (id) ON DELETE CASCADE ON UPDATE CASCADE
+) ENGINE = InnoDB;
+
+
 CREATE TABLE b2b_specific_price (
   id BIGINT UNSIGNED AUTO_INCREMENT PRIMARY KEY,
   name VARCHAR(255) NOT NULL,
@@ -383,16 +405,26 @@ DELIMITER ;
 
 -- +goose Down
 
-DROP TABLE IF EXISTS b2b_countries;
+DROP TABLE IF EXISTS b2b_addresses;
-DROP TABLE IF EXISTS b2b_language;
+DROP TABLE IF EXISTS b2b_top_menu_roles;
-DROP TABLE IF EXISTS b2b_components;
+DROP TABLE IF EXISTS b2b_favorites;
-DROP TABLE IF EXISTS b2b_scopes;
+DROP TABLE IF EXISTS b2b_carts_products;
-DROP TABLE IF EXISTS b2b_translations;
+DROP TABLE IF EXISTS b2b_customer_carts;
-DROP TABLE IF EXISTS b2b_customers;
+DROP TABLE IF EXISTS b2b_specific_price_country;
-DROP TABLE IF EXISTS b2b_refresh_tokens;
+DROP TABLE IF EXISTS b2b_specific_price_customer;
-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_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;

i18n/migrations/20260319163200_procedures.sql

@@ -132,6 +132,12 @@ JSON_OBJECT(
     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(