Merge remote-tracking branch 'origin' into front-styles

2026-03-25 15:54:00 +01:00
parent e7a7daa2e3 8f37ecbac2
commit 96383fce06
16 changed files with 70 additions and 64 deletions
--- a/app/api/openapi.json
+++ b/app/api/openapi.json
@@ -33,8 +33,8 @@
      "description": "Product listing and description endpoints (under /api/v1/restricted, requires authentication)"
    },
    {
-      "name": "Product Description",
-      "description": "Product description management and translation endpoints (under /api/v1/restricted/product-description, requires authentication)"
+      "name": "Product Translation",
+      "description": "Product description management and translation endpoints (under /api/v1/restricted/product-translation, requires authentication)"
    },
    {
      "name": "Menu",
@@ -915,9 +915,9 @@
        }
      }
    },
-    "/api/v1/restricted/product-description/get-product-description": {
+    "/api/v1/restricted/product-translation/get-product-description": {
      "get": {
-        "tags": ["Product Description"],
+        "tags": ["Product Translation"],
        "summary": "Get product description",
        "description": "Returns the product description for a given product ID and language. Requires authentication.",
        "operationId": "getProductDescription",
@@ -982,9 +982,9 @@
        }
      }
    },
-    "/api/v1/restricted/product-description/save-product-description": {
+    "/api/v1/restricted/product-translation/save-product-description": {
      "post": {
-        "tags": ["Product Description"],
+        "tags": ["Product Translation"],
        "summary": "Save product description",
        "description": "Saves the product description for a given product ID in the specified language. Requires authentication.",
        "operationId": "saveProductDescription",
@@ -1059,9 +1059,9 @@
        }
      }
    },
-    "/api/v1/restricted/product-description/translate-product-description": {
+    "/api/v1/restricted/product-translation/translate-product-description": {
      "get": {
-        "tags": ["Product Description"],
+        "tags": ["Product Translation"],
        "summary": "Translate product description",
        "description": "Translates the product description from one language to another using AI (OpenAI or Google). Requires authentication.",
        "operationId": "translateProductDescription",
@@ -1271,7 +1271,7 @@
            "name": "id_category",
            "in": "query",
            "description": "Filter by category ID",
-            "required": true,
+            "required": false,
            "schema": {
              "type": "integer",
              "format": "uint"
@@ -1281,7 +1281,7 @@
            "name": "price_lower_bound",
            "in": "query",
            "description": "Lower price bound",
-            "required": true,
+            "required": false,
            "schema": {
              "type": "number",
              "format": "double"
@@ -1291,7 +1291,7 @@
            "name": "price_upper_bound",
            "in": "query",
            "description": "Upper price bound",
-            "required": true,
+            "required": false,
            "schema": {
              "type": "number",
              "format": "double"
@@ -1336,7 +1336,7 @@
      "get": {
        "tags": ["Search"],
        "summary": "Create search index",
-        "description": "Creates a MeiliSearch index for products. Requires superadmin access.",
+        "description": "Creates a MeiliSearch index for products. Must be removed before proper release.",
        "operationId": "createSearchIndex",
        "security": [
          {
@@ -1381,7 +1381,7 @@
      "get": {
        "tags": ["Search"],
        "summary": "Test MeiliSearch",
-        "description": "Tests the MeiliSearch connection. Requires superadmin access.",
+        "description": "Tests the MeiliSearch search. Must be removed before proper release.",
        "operationId": "testMeiliSearch",
        "security": [
          {
--- a/app/delivery/web/api/public/auth.go
+++ b/app/delivery/web/api/public/auth.go
@@ -40,7 +40,6 @@ func AuthHandlerRoutes(r fiber.Router) fiber.Router {
 	r.Post("/reset-password", handler.ResetPassword)
 	r.Post("/logout", handler.Logout)
 	r.Post("/refresh", handler.RefreshToken)
-	r.Post("/update-choice", handler.UpdateJWTToken)

 	// Google OAuth2
 	r.Get("/google", handler.GoogleLogin)
@@ -48,6 +47,7 @@ func AuthHandlerRoutes(r fiber.Router) fiber.Router {

 	authProtected := r.Group("", middleware.AuthMiddleware())
 	authProtected.Get("/me", handler.Me)
+	authProtected.Post("/update-choice", handler.UpdateJWTToken)

 	return r
 }
@@ -345,9 +345,9 @@ func (h *AuthHandler) CompleteRegistration(c fiber.Ctx) error {
 	return c.Status(fiber.StatusCreated).JSON(response)
 }

-// CompleteRegistration handles completion of registration with password
+// Updates JWT Tokens
 func (h *AuthHandler) UpdateJWTToken(c fiber.Ctx) error {
-	return h.UpdateJWTToken(c)
+	return h.authService.UpdateJWTToken(c)
 }

 // GoogleLogin redirects the user to Google's OAuth2 consent page
--- a/app/delivery/web/api/restricted/meiliSearch.go
+++ b/app/delivery/web/api/restricted/meiliSearch.go
@@ -25,7 +25,7 @@ func NewMeiliSearchHandler() *MeiliSearchHandler {
 func MeiliSearchHandlerRoutes(r fiber.Router) fiber.Router {
 	handler := NewMeiliSearchHandler()

-	// for superadmin only
+	// for testing purposes only. Must be removed before proper release.
 	r.Get("/create-index", handler.CreateIndex)
 	r.Get("/test", handler.Test)

@@ -84,32 +84,32 @@ func (h *MeiliSearchHandler) Search(c fiber.Ctx) error {
 			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, responseErrors.ErrBadAttribute)))
 	}

-	id_category_attribute := c.Query("id_category")
+	id_category_attribute := c.Query("id_category", "0")
 	id_category, err := strconv.Atoi(id_category_attribute)
 	if err != nil {
 		return c.Status(responseErrors.GetErrorStatus(responseErrors.ErrBadAttribute)).
 			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, responseErrors.ErrBadAttribute)))
 	}

-	price_lower_bound_attribute := c.Query("price_lower_bound")
+	price_lower_bound_attribute := c.Query("price_lower_bound", "-1.0")
 	price_lower_bound, err := strconv.ParseFloat(price_lower_bound_attribute, 64)
 	if err != nil {
 		return c.Status(responseErrors.GetErrorStatus(responseErrors.ErrBadAttribute)).
 			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, responseErrors.ErrBadAttribute)))
 	}

-	price_upper_bound_attribute := c.Query("price_upper_bound")
+	price_upper_bound_attribute := c.Query("price_upper_bound", "-1.0")
 	price_upper_bound, err := strconv.ParseFloat(price_upper_bound_attribute, 64)
 	if err != nil {
 		return c.Status(responseErrors.GetErrorStatus(responseErrors.ErrBadAttribute)).
 			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, responseErrors.ErrBadAttribute)))
 	}

-	test, err := h.meiliService.Search(id_lang, query, uint(limit), uint(id_category), price_lower_bound, price_upper_bound)
+	meili_response, err := h.meiliService.Search(id_lang, query, uint(limit), uint(id_category), price_lower_bound, price_upper_bound)
 	if err != nil {
 		return c.Status(responseErrors.GetErrorStatus(err)).
 			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, err)))
 	}

-	return c.JSON(response.Make(&test, 0, i18n.T_(c, response.Message_OK)))
+	return c.JSON(response.Make(&meili_response, 0, i18n.T_(c, response.Message_OK)))
 }
--- a/app/delivery/web/api/restricted/productTranslation.go
+++ b/app/delivery/web/api/restricted/productTranslation.go
@@ -4,7 +4,7 @@ import (
 	"strconv"

 	"git.ma-al.com/goc_daniel/b2b/app/config"
-	"git.ma-al.com/goc_daniel/b2b/app/service/productDescriptionService"
+	"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/nullable"
 	"git.ma-al.com/goc_daniel/b2b/app/utils/response"
@@ -13,24 +13,24 @@ import (
 	"github.com/gofiber/fiber/v3"
 )

-// ProductDescriptionHandler handles endpoints that receive, save and translate product descriptions.
-type ProductDescriptionHandler struct {
-	productDescriptionService *productDescriptionService.ProductDescriptionService
+// ProductTranslationHandler handles endpoints that receive, save and translate product descriptions.
+type ProductTranslationHandler struct {
+	productTranslationService *productTranslationService.ProductTranslationService
 	config                    *config.Config
 }

-// NewProductDescriptionHandler creates a new ProductDescriptionHandler instance
-func NewProductDescriptionHandler() *ProductDescriptionHandler {
-	productDescriptionService := productDescriptionService.New()
-	return &ProductDescriptionHandler{
-		productDescriptionService: productDescriptionService,
+// NewProductTranslationHandler creates a new ProductTranslationHandler instance
+func NewProductTranslationHandler() *ProductTranslationHandler {
+	productTranslationService := productTranslationService.New()
+	return &ProductTranslationHandler{
+		productTranslationService: productTranslationService,
 		config:                    config.Get(),
 	}
 }

-// ProductDescriptionRoutes registers all product description routes
-func ProductDescriptionHandlerRoutes(r fiber.Router) fiber.Router {
-	handler := NewProductDescriptionHandler()
+// ProductTranslationRoutes registers all product description routes
+func ProductTranslationHandlerRoutes(r fiber.Router) fiber.Router {
+	handler := NewProductTranslationHandler()

 	r.Get("/get-product-description", handler.GetProductDescription)
 	r.Post("/save-product-description", handler.SaveProductDescription)
@@ -40,7 +40,7 @@ func ProductDescriptionHandlerRoutes(r fiber.Router) fiber.Router {
 }

 // GetProductDescription returns the product description for a given product ID
-func (h *ProductDescriptionHandler) GetProductDescription(c fiber.Ctx) error {
+func (h *ProductTranslationHandler) GetProductDescription(c fiber.Ctx) error {
 	userID, ok := c.Locals("userID").(uint)
 	if !ok {
 		return c.Status(responseErrors.GetErrorStatus(responseErrors.ErrInvalidBody)).
@@ -61,7 +61,7 @@ func (h *ProductDescriptionHandler) GetProductDescription(c fiber.Ctx) error {
 			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, responseErrors.ErrBadAttribute)))
 	}

-	description, err := h.productDescriptionService.GetProductDescription(userID, uint(productID), uint(productLangID))
+	description, err := h.productTranslationService.GetProductDescription(userID, uint(productID), uint(productLangID))
 	if err != nil {
 		return c.Status(responseErrors.GetErrorStatus(err)).
 			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, err)))
@@ -71,7 +71,7 @@ func (h *ProductDescriptionHandler) GetProductDescription(c fiber.Ctx) error {
 }

 // SaveProductDescription saves the description for a given product ID, in given language
-func (h *ProductDescriptionHandler) SaveProductDescription(c fiber.Ctx) error {
+func (h *ProductTranslationHandler) SaveProductDescription(c fiber.Ctx) error {
 	userID, ok := c.Locals("userID").(uint)
 	if !ok {
 		return c.Status(responseErrors.GetErrorStatus(responseErrors.ErrInvalidBody)).
@@ -98,7 +98,7 @@ func (h *ProductDescriptionHandler) SaveProductDescription(c fiber.Ctx) error {
 			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, responseErrors.ErrInvalidBody)))
 	}

-	err = h.productDescriptionService.SaveProductDescription(userID, uint(productID), uint(productLangID), updates)
+	err = h.productTranslationService.SaveProductDescription(userID, uint(productID), uint(productLangID), updates)
 	if err != nil {
 		return c.Status(responseErrors.GetErrorStatus(err)).
 			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, err)))
@@ -108,7 +108,7 @@ func (h *ProductDescriptionHandler) SaveProductDescription(c fiber.Ctx) error {
 }

 // TranslateProductDescription returns translated product description
-func (h *ProductDescriptionHandler) TranslateProductDescription(c fiber.Ctx) error {
+func (h *ProductTranslationHandler) TranslateProductDescription(c fiber.Ctx) error {
 	userID, ok := c.Locals("userID").(uint)
 	if !ok {
 		return c.Status(responseErrors.GetErrorStatus(responseErrors.ErrInvalidBody)).
@@ -142,7 +142,7 @@ func (h *ProductDescriptionHandler) TranslateProductDescription(c fiber.Ctx) err
 			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, responseErrors.ErrBadAttribute)))
 	}

-	description, err := h.productDescriptionService.TranslateProductDescription(userID, uint(productID), uint(productFromLangID), uint(productToLangID), aiModel)
+	description, err := h.productTranslationService.TranslateProductDescription(userID, uint(productID), uint(productFromLangID), uint(productToLangID), aiModel)
 	if err != nil {
 		return c.Status(responseErrors.GetErrorStatus(err)).
 			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, err)))
--- a/app/delivery/web/init.go
+++ b/app/delivery/web/init.go
@@ -89,9 +89,9 @@ func (s *Server) Setup() error {
 	auth := s.public.Group("/auth")
 	public.AuthHandlerRoutes(auth)

-	// product description routes (restricted)
-	productDescription := s.restricted.Group("/product-description")
-	restricted.ProductDescriptionHandlerRoutes(productDescription)
+	// product translation routes (restricted)
+	productTranslation := s.restricted.Group("/product-translation")
+	restricted.ProductTranslationHandlerRoutes(productTranslation)

 	// listing products routes (restricted)
 	listProducts := s.restricted.Group("/list-products")
--- a/app/model/countries.go
+++ b/app/model/countries.go
@@ -6,8 +6,8 @@ type Country struct {
 	Name            string `gorm:"column:name" json:"name"`
 	Flag            string `gorm:"size:16;not null;column:flag" json:"flag"`
 	CurrencyID      uint   `gorm:"column:id_currency" json:"currency_id"`
-	CurrencyISOCode string `gorm:"column:iso_code" json:"currency_iso_code"`
-	CurrencyName    string `gorm:"column:name" json:"currency_name"`
+	CurrencyISOCode string `gorm:"column:currency_iso_code" json:"currency_iso_code"`
+	CurrencyName    string `gorm:"column:currency_name" json:"currency_name"`
 }

 func (Country) TableName() string {
--- a/app/model/product.go
+++ b/app/model/product.go
@@ -85,7 +85,7 @@ type ProductFilters struct {
 }

 type ScannedCategory struct {
-	CategoryID  uint   `gorm:"column:ID;primaryKey"`
+	CategoryID  uint   `gorm:"column:category_id;primaryKey"`
 	Name        string `gorm:"column:name"`
 	Active      uint   `gorm:"column:active"`
 	Position    uint   `gorm:"column:position"`
--- a/app/repos/categoriesRepo/categoriesRepo.go
+++ b/app/repos/categoriesRepo/categoriesRepo.go
@@ -22,7 +22,7 @@ func (repo *CategoriesRepo) GetAllCategories(id_lang uint) ([]model.ScannedCateg
 	err := db.DB.
 		Table("ps_category").
 		Select(`
-			ps_category.id_category AS id,
+			ps_category.id_category AS category_id,
 			ps_category_lang.name AS name,
 			ps_category.active AS active,
 			ps_category_shop.position AS position,
--- a/app/repos/localeSelectorRepo/localeSelectorRepo.go
+++ b/app/repos/localeSelectorRepo/localeSelectorRepo.go
@@ -28,8 +28,9 @@ func (repo *LocaleSelectorRepo) GetCountriesAndCurrencies() ([]model.Country, er
 	var countries []model.Country

 	err := db.DB.
+		Table("b2b_countries").
 		Select("b2b_countries.id, b2b_countries.name, b2b_countries.flag, ps_currency.id_currency as id_currency, ps_currency.name as currency_name, ps_currency.iso_code as currency_iso_code").
-		Joins("JOIN ps_currency ON ps_currency.id_currency = b2b_countries.currency").
+		Joins("LEFT JOIN ps_currency ON ps_currency.id_currency = b2b_countries.currency_id").
 		Scan(&countries).Error

 	return countries, err
--- a/app/service/meiliService/meiliService.go
+++ b/app/service/meiliService/meiliService.go
@@ -34,7 +34,7 @@ func New() *MeiliService {
 	}
 }

-// ====================================   FOR SUPERADMIN ONLY   ====================================
+// ====================================   FOR TESTING ONLY   ====================================
 func (s *MeiliService) CreateIndex(id_lang uint) error {
 	indexName := "meili_products_shop" + strconv.FormatInt(constdata.SHOP_ID, 10) + "_lang" + strconv.FormatInt(int64(id_lang), 10)

@@ -130,7 +130,7 @@ func (s *MeiliService) CreateIndex(id_lang uint) error {
 	return err
 }

-// ====================================   FOR DEBUG ONLY   ====================================
+// ====================================   FOR TESTING ONLY   ====================================
 func (s *MeiliService) Test(id_lang uint) (meilisearch.SearchResponse, error) {
 	indexName := "meili_products_shop" + strconv.FormatInt(constdata.SHOP_ID, 10) + "_lang" + strconv.FormatInt(int64(id_lang), 10)

--- a/app/service/menuService/menuService.go
+++ b/app/service/menuService/menuService.go
@@ -1,6 +1,7 @@
 package menuService

 import (
+	"fmt"
 	"sort"

 	"git.ma-al.com/goc_daniel/b2b/app/model"
@@ -27,6 +28,10 @@ func (s *MenuService) GetMenu(id_lang uint) (*model.Category, error) {
 		return &model.Category{}, err
 	}

+	fmt.Printf("all_categories: %v\n", all_categories)
+
+	fmt.Printf("id_lang: %v\n", id_lang)
+
 	// find the root
 	root_index := 0
 	root_found := false
--- a/app/service/productTranslationService/google_out.txt
+++ b/app/service/productTranslationService/google_out.txt
--- a/app/service/productTranslationService/openai_out.txt
+++ b/app/service/productTranslationService/openai_out.txt
--- a/app/service/productTranslationService/productTranslationService.go
+++ b/app/service/productTranslationService/productTranslationService.go
@@ -1,4 +1,4 @@
-package productDescriptionService
+package productTranslationService

 import (
 	"context"
@@ -26,7 +26,7 @@ import (
 	googleopt "google.golang.org/api/option"
 )

-type ProductDescriptionService struct {
+type ProductTranslationService struct {
 	productDescriptionRepo productDescriptionRepo.UIProductDescriptionRepo
 	ctx                    context.Context
 	googleCli              translate.TranslationClient
@@ -34,7 +34,7 @@ type ProductDescriptionService struct {
 	openAIClient           openai.Client
 }

-// New creates a ProductDescriptionService and authenticates against the
+// New creates a ProductTranslationService and authenticates against the
 // Google Cloud Translation API using a service account key file.
 //
 // Required configuration (set in .env or environment):
@@ -44,14 +44,14 @@ type ProductDescriptionService struct {
 //
 // The service account must have the "Cloud Translation API User" role
 // (roles/cloudtranslate.user) granted in Google Cloud IAM.
-func New() *ProductDescriptionService {
+func New() *ProductTranslationService {
 	ctx := context.Background()
 	cfg := config.Get()

 	// Read the service account key file whose path comes from config / env.
 	data, err := os.ReadFile(cfg.GoogleTranslate.CredentialsFile)
 	if err != nil {
-		log.Fatalf("productDescriptionService: cannot read credentials file %q: %v",
+		log.Fatalf("ProductTranslationService: cannot read credentials file %q: %v",
 			cfg.GoogleTranslate.CredentialsFile, err)
 	}

@@ -62,18 +62,18 @@ func New() *ProductDescriptionService {
 		CredentialsJSON: data,
 	})
 	if err != nil {
-		log.Fatalf("productDescriptionService: cannot build Google credentials: %v", err)
+		log.Fatalf("ProductTranslationService: cannot build Google credentials: %v", err)
 	}

 	googleCli, err := translate.NewTranslationClient(ctx, googleopt.WithAuthCredentials(creds))
 	if err != nil {
-		log.Fatalf("productDescriptionService: cannot create Translation client: %v", err)
+		log.Fatalf("ProductTranslationService: cannot create Translation client: %v", err)
 	}

 	openAIClient := openai.NewClient(option.WithAPIKey(os.Getenv("OPENAI_KEY")),
 		option.WithHTTPClient(&http.Client{Timeout: 300 * time.Second})) // five minutes timeout

-	return &ProductDescriptionService{
+	return &ProductTranslationService{
 		productDescriptionRepo: productDescriptionRepo.New(),
 		ctx:                    ctx,
 		openAIClient:           openAIClient,
@@ -82,12 +82,12 @@ func New() *ProductDescriptionService {
 	}
 }

-func (s *ProductDescriptionService) GetProductDescription(userID uint, productID uint, productLangID uint) (*model.ProductDescription, error) {
+func (s *ProductTranslationService) GetProductDescription(userID uint, productID uint, productLangID uint) (*model.ProductDescription, error) {
 	return s.productDescriptionRepo.GetProductDescription(productID, productLangID)
 }

 // Updates relevant fields with the "updates" map
-func (s *ProductDescriptionService) SaveProductDescription(userID uint, productID uint, productLangID uint, updates map[string]string) error {
+func (s *ProductTranslationService) SaveProductDescription(userID uint, productID uint, productLangID uint, updates map[string]string) error {
 	// only some fields can be affected
 	allowedFields := []string{"description", "description_short", "meta_description", "meta_title", "name", "available_now", "available_later", "usage"}
 	for key := range updates {
@@ -120,7 +120,7 @@ func (s *ProductDescriptionService) SaveProductDescription(userID uint, productI
 //
 // The Google Cloud project must have the Cloud Translation API enabled and the
 // service account must hold the "Cloud Translation API User" role.
-func (s *ProductDescriptionService) TranslateProductDescription(userID uint, productID uint, productFromLangID uint, productToLangID uint, aiModel string) (*model.ProductDescription, error) {
+func (s *ProductTranslationService) TranslateProductDescription(userID uint, productID uint, productFromLangID uint, productToLangID uint, aiModel string) (*model.ProductDescription, error) {

 	productDescription, err := s.productDescriptionRepo.GetProductDescription(productID, productFromLangID)
 	if err != nil {
--- a/app/service/productTranslationService/test_in.txt
+++ b/app/service/productTranslationService/test_in.txt
--- a/i18n/migrations/20260302163122_create_tables.sql
+++ b/i18n/migrations/20260302163122_create_tables.sql
@@ -126,13 +126,13 @@ CREATE INDEX IF NOT EXISTS idx_refresh_tokens_customer_id ON b2b_refresh_tokens
 CREATE TABLE IF NOT EXISTS b2b_countries (
  id          INT AUTO_INCREMENT PRIMARY KEY,
  name        VARCHAR(128) NOT NULL,
-  currency    INT UNSIGNED NOT NULL,
+  currency_id INT UNSIGNED NOT NULL,
  flag        VARCHAR(16) NOT NULL,
-  CONSTRAINT fk_countries_currency FOREIGN KEY (currency) REFERENCES ps_currency(id_currency) ON DELETE RESTRICT ON UPDATE RESTRICT
+  CONSTRAINT fk_countries_currency FOREIGN KEY (currency_id) REFERENCES ps_currency(id_currency) ON DELETE RESTRICT ON UPDATE RESTRICT
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;

 INSERT IGNORE INTO b2b_countries
-  (id, name, currency, flag)
+  (id, name, currency_id, flag)
 VALUES
  (1, 'Polska', 1, '🇵🇱'),
  (2, 'England', 2, '🇬🇧'),