fix: currency/county

.env

@@ -48,10 +48,6 @@ EMAIL_FROM=test@ma-al.com
 EMAIL_FROM_NAME=Gitea Manager
 EMAIL_ADMIN=goc_marek@ma-al.pl
 
-# STORAGE
-STORAGE_ROOT=./storage
-
-
 I18N_LANGS=en,pl,cs
 
 PDF_SERVER_URL=http://localhost:8000

.gitignore

@@ -5,6 +5,4 @@ bin/
 i18n/*.json
 *_templ.go
 tmp/main
-test.go
-storage/*
-!storage/.gitkeep
+test.go

.vscode/launch.json

@@ -1,14 +0,0 @@
-{
-    "version": "0.2.0",
-    "configurations": [
-        {
-            "name": "Launch Package",
-            "type": "go",
-            "request": "launch",
-            "mode": "auto",
-            "program": "./app/cmd/main.go",
-            "cwd": "${workspaceFolder}",
-            "envFile": "${workspaceFolder}/.env"
-        }
-    ]
-}

app/config/config.go

@@ -2,10 +2,8 @@ package config
 
 import (
 	"fmt"
-	"log"
 	"log/slog"
 	"os"
-	"path/filepath"
 	"reflect"
 	"strconv"
 	"strings"
@@ -26,8 +24,7 @@ type Config struct {
 	GoogleTranslate GoogleTranslateConfig
 	Image           ImageConfig
 	Cors            CorsConfig
-	MeiliSearch     MeiliSearchConfig
-	Storage         StorageConfig
+	MailiSearch     MeiliSearchConfig
 }
 
 type I18n struct {
@@ -98,10 +95,6 @@ type EmailConfig struct {
 	Enabled      bool   `env:"EMAIL_ENABLED,false"`
 }
 
-type StorageConfig struct {
-	RootFolder string `env:"STORAGE_ROOT"`
-}
-
 type PdfPrinter struct {
 	ServerUrl string `env:"PDF_SERVER_URL,http://localhost:8000"`
 }
@@ -162,7 +155,7 @@ func load() *Config {
 
 	err = loadEnv(&cfg.OAuth.Google)
 	if err != nil {
-		slog.Error("not possible to load env variables for oauth google : ", err.Error(), "")
+		slog.Error("not possible to load env variables for outh google : ", err.Error(), "")
 	}
 
 	err = loadEnv(&cfg.App)
@@ -177,12 +170,12 @@ func load() *Config {
 
 	err = loadEnv(&cfg.I18n)
 	if err != nil {
-		slog.Error("not possible to load env variables for i18n : ", err.Error(), "")
+		slog.Error("not possible to load env variables for email : ", err.Error(), "")
 	}
 
 	err = loadEnv(&cfg.Pdf)
 	if err != nil {
-		slog.Error("not possible to load env variables for pdf : ", err.Error(), "")
+		slog.Error("not possible to load env variables for email : ", err.Error(), "")
 	}
 
 	err = loadEnv(&cfg.GoogleTranslate)
@@ -192,25 +185,19 @@ func load() *Config {
 
 	err = loadEnv(&cfg.Image)
 	if err != nil {
-		slog.Error("not possible to load env variables for image : ", err.Error(), "")
+		slog.Error("not possible to load env variables for google translate : ", err.Error(), "")
 	}
 
 	err = loadEnv(&cfg.Cors)
 	if err != nil {
-		slog.Error("not possible to load env variables for cors : ", err.Error(), "")
+		slog.Error("not possible to load env variables for google translate : ", err.Error(), "")
 	}
 
-	err = loadEnv(&cfg.MeiliSearch)
+	err = loadEnv(&cfg.MailiSearch)
 	if err != nil {
-		slog.Error("not possible to load env variables for meili search : ", err.Error(), "")
+		slog.Error("not possible to load env variables for google translate : ", err.Error(), "")
 	}
 
-	err = loadEnv(&cfg.Storage)
-	if err != nil {
-		slog.Error("not possible to load env variables for storage : ", err.Error(), "")
-	}
-	cfg.Storage.RootFolder = ResolveRelativePath(cfg.Storage.RootFolder)
-
 	return cfg
 }
 
@@ -321,22 +308,6 @@ func setValue(field reflect.Value, val string, key string) error {
 	return nil
 }
 
-func ResolveRelativePath(relativePath string) string {
-	// get working directory (where program was started)
-	wd, err := os.Getwd()
-	if err != nil {
-		log.Fatal(err)
-	}
-
-	// convert to absolute path
-	absPath := relativePath
-	if !filepath.IsAbs(absPath) {
-		absPath = filepath.Join(wd, absPath)
-	}
-
-	return filepath.Clean(absPath)
-}
-
 func parseEnvTag(tag string) (key string, def *string) {
 	if tag == "" {
 		return "", nil

app/delivery/middleware/auth.go

@@ -1,16 +1,12 @@
 package middleware
 
 import (
-	"encoding/base64"
-	"strconv"
 	"strings"
-	"time"
 
 	"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/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"
 )
@@ -64,52 +60,9 @@ func AuthMiddleware() fiber.Handler {
 			})
 		}
 
-		// Create locale. LangID is overwritten by auth Token
-		var userLocale model.UserLocale
-		userLocale.OriginalUser = user
-
-		// Check if target user is present
-		targetUserIDAttribute := c.Query("target_user_id")
-
-		if targetUserIDAttribute == "" {
-			userLocale.User = user
-			c.Locals(constdata.USER_LOCALE, &userLocale)
-
-			return c.Next()
-		}
-
-		// We now populate the target user
-		if model.CustomerRole(user.Role.Name) != model.RoleAdmin {
-			return c.Status(fiber.StatusForbidden).JSON(fiber.Map{
-				"error": "admin access required",
-			})
-		}
-
-		targetUserID, err := strconv.Atoi(targetUserIDAttribute)
-		if err != nil {
-			return c.Status(fiber.StatusInternalServerError).JSON(fiber.Map{
-				"error": "invalid target user id attribute",
-			})
-		}
-
-		// to verify target user, we use the same functionality as for verifying original user
-		// Get target user from database
-		user, err = authService.GetUserByID(uint(targetUserID))
-		if err != nil {
-			return c.Status(fiber.StatusUnauthorized).JSON(fiber.Map{
-				"error": "target user not found",
-			})
-		}
-
-		// Check if target user is active
-		if !user.IsActive {
-			return c.Status(fiber.StatusForbidden).JSON(fiber.Map{
-				"error": "target user account is inactive",
-			})
-		}
-
-		userLocale.User = user
-		c.Locals(constdata.USER_LOCALE, &userLocale)
+		// Set user in context
+		c.Locals(constdata.USER_LOCALES_NAME, user.ToSession())
+		c.Locals(constdata.USER_LOCALES_ID, user.ID)
 
 		return c.Next()
 	}
@@ -118,14 +71,21 @@ 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 {
+		user := c.Locals("user")
+		if user == nil {
 			return c.Status(fiber.StatusUnauthorized).JSON(fiber.Map{
 				"error": "not authenticated",
 			})
 		}
 
-		if model.CustomerRole(originalUserRole.Name) != model.RoleAdmin {
+		userSession, ok := user.(*model.UserSession)
+		if !ok {
+			return c.Status(fiber.StatusInternalServerError).JSON(fiber.Map{
+				"error": "invalid user session",
+			})
+		}
+
+		if userSession.Role != model.RoleAdmin {
 			return c.Status(fiber.StatusForbidden).JSON(fiber.Map{
 				"error": "admin access required",
 			})
@@ -135,70 +95,22 @@ func RequireAdmin() fiber.Handler {
 	}
 }
 
-// Webdav
-func Webdav() fiber.Handler {
-	authService := authService.NewAuthService()
-
-	return func(c fiber.Ctx) error {
-		authHeader := c.Get("Authorization")
-		if authHeader == "" {
-			c.Set("WWW-Authenticate", `Basic realm="webdav"`)
-			return c.Status(fiber.StatusUnauthorized).JSON(fiber.Map{
-				"error": "authorization token required",
-			})
-		}
-
-		if !strings.HasPrefix(authHeader, "Basic ") {
-			c.Set("WWW-Authenticate", `Basic realm="webdav"`)
-			return c.Status(fiber.StatusUnauthorized).JSON(fiber.Map{
-				"error": "invalid authorization token",
-			})
-		}
-
-		encoded := strings.TrimPrefix(authHeader, "Basic ")
-		decoded, err := base64.StdEncoding.DecodeString(encoded)
-		if err != nil {
-			c.Set("WWW-Authenticate", `Basic realm="webdav"`)
-			return c.Status(fiber.StatusUnauthorized).JSON(fiber.Map{
-				"error": "invalid authorization token",
-			})
-		}
-
-		credentials := strings.SplitN(string(decoded), ":", 2)
-		rawToken := ""
-		if len(credentials) == 1 {
-			rawToken = credentials[0]
-		} else if len(credentials) == 2 {
-			rawToken = credentials[1]
-		}
-		if len(rawToken) != constdata.NBYTES_IN_WEBDAV_TOKEN*2 {
-			c.Set("WWW-Authenticate", `Basic realm="webdav"`)
-			return c.Status(fiber.StatusUnauthorized).JSON(fiber.Map{
-				"error": "invalid authorization token",
-			})
-		}
-
-		// we identify user based on this token.
-		user, err := authService.GetUserByWebdavToken(rawToken)
-		if err != nil {
-			return c.Status(fiber.StatusUnauthorized).JSON(fiber.Map{
-				"error": "user not found",
-			})
-		}
-
-		if user.WebdavExpires != nil && user.WebdavExpires.Before(time.Now()) {
-			return c.Status(fiber.StatusUnauthorized).JSON(fiber.Map{
-				"error": "invalid or expired token",
-			})
-		}
-
-		var userLocale model.UserLocale
-		userLocale.OriginalUser = user
-		userLocale.User = user
-		c.Locals(constdata.USER_LOCALE, &userLocale)
-
-		return c.Next()
+// GetUserID extracts user ID from context
+func GetUserID(c fiber.Ctx) uint {
+	userID, ok := c.Locals("userID").(uint)
+	if !ok {
+		return 0
 	}
+	return userID
+}
+
+// GetUser extracts user from context
+func GetUser(c fiber.Ctx) *model.UserSession {
+	user, ok := c.Locals("user").(*model.UserSession)
+	if !ok {
+		return nil
+	}
+	return user
 }
 
 // GetConfig returns the app config

app/delivery/middleware/language.go

@@ -4,9 +4,7 @@ import (
 	"strconv"
 	"strings"
 
-	"git.ma-al.com/goc_daniel/b2b/app/model"
 	"git.ma-al.com/goc_daniel/b2b/app/service/langsService"
-	constdata "git.ma-al.com/goc_daniel/b2b/app/utils/const_data"
 	"github.com/gofiber/fiber/v3"
 )
 
@@ -24,8 +22,12 @@ func LanguageMiddleware() fiber.Handler {
 			if id, err := strconv.ParseUint(langIDStr, 10, 32); err == nil {
 				langID = uint(id)
 				if langID > 0 {
-					c.Locals(constdata.USER_LOCALE, returnNewLocale(langID))
-					return c.Next()
+					lang, err := langService.GetLanguageById(langID)
+					if err == nil {
+						c.Locals("langID", langID)
+						c.Locals("lang", lang)
+						return c.Next()
+					}
 				}
 			}
 		}
@@ -36,8 +38,12 @@ func LanguageMiddleware() fiber.Handler {
 			if id, err := strconv.ParseUint(cookieLang, 10, 32); err == nil {
 				langID = uint(id)
 				if langID > 0 {
-					c.Locals(constdata.USER_LOCALE, returnNewLocale(langID))
-					return c.Next()
+					lang, err := langService.GetLanguageById(langID)
+					if err == nil {
+						c.Locals("langID", langID)
+						c.Locals("lang", lang)
+						return c.Next()
+					}
 				}
 			}
 		}
@@ -51,7 +57,8 @@ func LanguageMiddleware() fiber.Handler {
 				lang, err := langService.GetLanguageByISOCode(isoCode)
 				if err == nil && lang != nil {
 					langID = uint(lang.ID)
-					c.Locals(constdata.USER_LOCALE, returnNewLocale(langID))
+					c.Locals("langID", langID)
+					c.Locals("lang", lang)
 					return c.Next()
 				}
 			}
@@ -61,7 +68,8 @@ func LanguageMiddleware() fiber.Handler {
 		defaultLang, err := langService.GetDefaultLanguage()
 		if err == nil && defaultLang != nil {
 			langID = uint(defaultLang.ID)
-			c.Locals(constdata.USER_LOCALE, returnNewLocale(langID))
+			c.Locals("langID", langID)
+			c.Locals("lang", defaultLang)
 		}
 
 		return c.Next()
@@ -96,9 +104,11 @@ func parseAcceptLanguage(header string) string {
 	return strings.ToLower(first)
 }
 
-func returnNewLocale(lang_id uint) *model.UserLocale {
-	newLocale := model.UserLocale{}
-	newLocale.OriginalUser = &model.Customer{}
-	newLocale.OriginalUser.LangID = lang_id
-	return &newLocale
+// GetLanguageID extracts language ID from context
+func GetLanguageID(c fiber.Ctx) uint {
+	langID, ok := c.Locals("langID").(uint)
+	if !ok {
+		return 0
+	}
+	return langID
 }

app/delivery/middleware/permissions.go

@@ -1,28 +0,0 @@
-package middleware
-
-import (
-	"git.ma-al.com/goc_daniel/b2b/app/delivery/middleware/perms"
-	"git.ma-al.com/goc_daniel/b2b/app/model"
-	"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)
-		if !ok {
-			return c.SendStatus(fiber.StatusInternalServerError)
-		}
-
-		for _, perm := range user.Permissions {
-			if perm == p {
-				return c.Next()
-			}
-		}
-		return c.SendStatus(fiber.StatusForbidden)
-	}
-}

app/delivery/middleware/perms/permissions.go

@@ -1,10 +0,0 @@
-package perms
-
-type Permission string
-
-const (
-	UserReadAny   Permission = "user.read.any"
-	UserWriteAny  Permission = "user.write.any"
-	UserDeleteAny Permission = "user.delete.any"
-	CurrencyWrite Permission = "currency.write"
-)

app/delivery/web/api/public/auth.go

@@ -268,15 +268,15 @@ func (h *AuthHandler) RefreshToken(c fiber.Ctx) error {
 
 // Me returns the current user info
 func (h *AuthHandler) Me(c fiber.Ctx) error {
-	userLocale := c.Locals(constdata.USER_LOCALE).(*model.UserLocale)
-	if userLocale.OriginalUser == nil {
+	user := c.Locals("user")
+	if user == nil {
 		return c.Status(fiber.StatusUnauthorized).JSON(fiber.Map{
 			"error": responseErrors.GetErrorCode(c, responseErrors.ErrNotAuthenticated),
 		})
 	}
 
 	return c.JSON(fiber.Map{
-		"user": *userLocale.OriginalUser,
+		"user": user,
 	})
 }
 
@@ -351,12 +351,21 @@ func (h *AuthHandler) CompleteRegistration(c fiber.Ctx) error {
 
 // Updates JWT Tokens. Requires authentication and updates access token only
 func (h *AuthHandler) UpdateJWTToken(c fiber.Ctx) error {
-	userLocale, ok := c.Locals(constdata.USER_LOCALE).(*model.UserLocale)
+	userLocals, ok := c.Locals(constdata.USER_LOCALES_NAME).(*model.UserSession)
 	if !ok {
 		return c.Status(fiber.StatusUnauthorized).
 			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, responseErrors.ErrNotAuthenticated)))
 	}
 
+	user := model.Customer{
+		ID:        userLocals.UserID,
+		Email:     userLocals.Email,
+		Role:      userLocals.Role,
+		LangID:    userLocals.LangID,
+		CountryID: userLocals.CountryID,
+		IsActive:  userLocals.IsActive,
+	}
+
 	// Parse language and country_id from query params
 	langIDStr := c.Query("lang_id")
 
@@ -366,7 +375,7 @@ func (h *AuthHandler) UpdateJWTToken(c fiber.Ctx) error {
 			return c.Status(fiber.StatusBadRequest).
 				JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, responseErrors.ErrBadLangID)))
 		}
-		userLocale.OriginalUser.LangID = uint(parsedID)
+		user.LangID = uint(parsedID)
 	}
 
 	countryIDStr := c.Query("country_id")
@@ -377,10 +386,10 @@ func (h *AuthHandler) UpdateJWTToken(c fiber.Ctx) error {
 			return c.Status(fiber.StatusBadRequest).
 				JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, responseErrors.ErrBadCountryID)))
 		}
-		userLocale.OriginalUser.CountryID = uint(parsedID)
+		user.CountryID = uint(parsedID)
 	}
 
-	newAccessToken, err := h.authService.UpdateJWTToken(userLocale.OriginalUser)
+	newAccessToken, err := h.authService.UpdateJWTToken(&user)
 
 	if err != nil {
 		return c.Status(responseErrors.GetErrorStatus(err)).JSON(fiber.Map{

app/delivery/web/api/public/routing.go

@@ -3,7 +3,6 @@ package public
 import (
 	"git.ma-al.com/goc_daniel/b2b/app/service/menuService"
 	"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"
@@ -31,7 +30,7 @@ func RoutingHandlerRoutes(r fiber.Router) fiber.Router {
 }
 
 func (h *RoutingHandler) GetRouting(c fiber.Ctx) error {
-	lang_id, ok := localeExtractor.GetLangID(c)
+	lang_id, ok := c.Locals("langID").(uint)
 	if !ok {
 		return c.Status(responseErrors.GetErrorStatus(responseErrors.ErrBadAttribute)).
 			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, responseErrors.ErrBadAttribute)))

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

@@ -5,7 +5,6 @@ import (
 
 	"git.ma-al.com/goc_daniel/b2b/app/service/cartsService"
 	"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"
@@ -38,7 +37,7 @@ func CartsHandlerRoutes(r fiber.Router) fiber.Router {
 }
 
 func (h *CartsHandler) AddNewCart(c fiber.Ctx) error {
-	userID, ok := localeExtractor.GetUserID(c)
+	userID, ok := c.Locals("userID").(uint)
 	if !ok {
 		return c.Status(responseErrors.GetErrorStatus(responseErrors.ErrInvalidBody)).
 			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, responseErrors.ErrInvalidBody)))
@@ -54,7 +53,7 @@ func (h *CartsHandler) AddNewCart(c fiber.Ctx) error {
 }
 
 func (h *CartsHandler) ChangeCartName(c fiber.Ctx) error {
-	userID, ok := localeExtractor.GetUserID(c)
+	userID, ok := c.Locals("userID").(uint)
 	if !ok {
 		return c.Status(responseErrors.GetErrorStatus(responseErrors.ErrInvalidBody)).
 			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, responseErrors.ErrInvalidBody)))
@@ -79,7 +78,7 @@ func (h *CartsHandler) ChangeCartName(c fiber.Ctx) error {
 }
 
 func (h *CartsHandler) RetrieveCartsInfo(c fiber.Ctx) error {
-	userID, ok := localeExtractor.GetUserID(c)
+	userID, ok := c.Locals("userID").(uint)
 	if !ok {
 		return c.Status(responseErrors.GetErrorStatus(responseErrors.ErrInvalidBody)).
 			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, responseErrors.ErrInvalidBody)))
@@ -95,7 +94,7 @@ func (h *CartsHandler) RetrieveCartsInfo(c fiber.Ctx) error {
 }
 
 func (h *CartsHandler) RetrieveCart(c fiber.Ctx) error {
-	userID, ok := localeExtractor.GetUserID(c)
+	userID, ok := c.Locals("userID").(uint)
 	if !ok {
 		return c.Status(responseErrors.GetErrorStatus(responseErrors.ErrInvalidBody)).
 			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, responseErrors.ErrInvalidBody)))
@@ -118,7 +117,7 @@ func (h *CartsHandler) RetrieveCart(c fiber.Ctx) error {
 }
 
 func (h *CartsHandler) AddProduct(c fiber.Ctx) error {
-	userID, ok := localeExtractor.GetUserID(c)
+	userID, ok := c.Locals("userID").(uint)
 	if !ok {
 		return c.Status(responseErrors.GetErrorStatus(responseErrors.ErrInvalidBody)).
 			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, responseErrors.ErrInvalidBody)))

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

@@ -1,70 +0,0 @@
-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/currencyService"
-	"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 CurrencyHandler struct {
-	CurrencyService *currencyService.CurrencyService
-	config          *config.Config
-}
-
-func NewCurrencyHandler() *CurrencyHandler {
-	currencyService := currencyService.New()
-	return &CurrencyHandler{
-		CurrencyService: currencyService,
-		config:          config.Get(),
-	}
-}
-
-func CurrencyHandlerRoutes(r fiber.Router) fiber.Router {
-	handler := NewCurrencyHandler()
-
-	r.Post("/currency-rate", middleware.Require(perms.CurrencyWrite), handler.PostCurrencyRate)
-	r.Get("/currency-rate/:id", handler.GetCurrencyRate)
-	return r
-}
-
-func (h *CurrencyHandler) PostCurrencyRate(c fiber.Ctx) error {
-	var currencyRate model.CurrencyRate
-	if err := c.Bind().Body(&currencyRate); err != nil {
-		return c.Status(responseErrors.GetErrorStatus(responseErrors.ErrJSONBody)).
-			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, responseErrors.ErrJSONBody)))
-	}
-
-	err := h.CurrencyService.CreateCurrencyRate(&currencyRate)
-	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(""), 1, i18n.T_(c, response.Message_OK)))
-}
-
-func (h *CurrencyHandler) GetCurrencyRate(c fiber.Ctx) error {
-	idStr := c.Params("id")
-	id, err := strconv.Atoi(idStr)
-	if err != nil {
-		return c.Status(responseErrors.GetErrorStatus(err)).JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, err)))
-
-	}
-
-	currency, err := h.CurrencyService.GetCurrency(uint(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(currency, 0, i18n.T_(c, response.Message_OK)))
-}

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

@@ -1,111 +0,0 @@
-package restricted
-
-import (
-	"strconv"
-
-	"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/customerService"
-	"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/query/query_params"
-	"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 customerHandler struct {
-	service *customerService.CustomerService
-}
-
-func NewCustomerHandler() *customerHandler {
-	customerService := customerService.New()
-	return &customerHandler{
-		service: customerService,
-	}
-}
-
-func CustomerHandlerRoutes(r fiber.Router) fiber.Router {
-	handler := NewCustomerHandler()
-
-	r.Get("", handler.customerData)
-	r.Get("/list", handler.listCustomers)
-	return r
-}
-
-func (h *customerHandler) customerData(fc fiber.Ctx) error {
-	var customerId uint
-
-	user, ok := localeExtractor.GetCustomer(fc)
-	if !ok || user == nil {
-		return fc.Status(responseErrors.GetErrorStatus(responseErrors.ErrBadAttribute)).
-			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(fc, responseErrors.ErrBadAttribute)))
-	}
-
-	customerIdStr := fc.Query("id")
-	if customerIdStr != "" {
-		id, err := strconv.ParseUint(customerIdStr, 10, 64)
-		if err != nil {
-			return fiber.ErrBadRequest
-		}
-
-		if user.ID != uint(id) && !user.HasPermission(perms.UserReadAny) {
-			return fc.Status(fiber.StatusForbidden).
-				JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(fc, responseErrors.ErrForbidden)))
-		}
-
-		customerId = uint(id)
-	} else {
-		customerId = user.ID
-	}
-
-	customer, err := h.service.GetById(customerId)
-	if err != nil {
-		return fc.Status(responseErrors.GetErrorStatus(err)).
-			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(fc, err)))
-	}
-
-	return fc.JSON(response.Make(&customer, 0, i18n.T_(fc, response.Message_OK)))
-}
-
-func (h *customerHandler) listCustomers(fc fiber.Ctx) error {
-	user, ok := localeExtractor.GetCustomer(fc)
-	if !ok || user == nil {
-		return fc.Status(responseErrors.GetErrorStatus(responseErrors.ErrBadAttribute)).
-			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(fc, responseErrors.ErrBadAttribute)))
-	}
-	if !user.HasPermission(perms.UserReadAny) {
-		return fc.Status(fiber.StatusForbidden).
-			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(fc, responseErrors.ErrForbidden)))
-	}
-
-	p, filt, err := query_params.ParseFilters[model.Customer](fc, columnMappingListUsers)
-	if err != nil {
-		return fc.Status(responseErrors.GetErrorStatus(err)).
-			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(fc, err)))
-	}
-
-	search := fc.Query("search")
-	if search != "" {
-		if !user.HasPermission(perms.UserReadAny) {
-			return fc.Status(fiber.StatusForbidden).
-				JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(fc, responseErrors.ErrForbidden)))
-		}
-	}
-
-	customer, err := h.service.Find(user.LangID, p, filt, search)
-	if err != nil {
-		return fc.Status(responseErrors.GetErrorStatus(err)).
-			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(fc, err)))
-	}
-
-	return fc.JSON(response.Make(&customer, 0, i18n.T_(fc, response.Message_OK)))
-}
-
-var columnMappingListUsers map[string]string = map[string]string{
-	"user_id":    "users.id",
-	"email":      "users.email",
-	"first_name": "users.first_name",
-	"last_name":  "users.last_name",
-}

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

@@ -1,13 +1,10 @@
 package restricted
 
 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/service/productService"
+	"git.ma-al.com/goc_daniel/b2b/app/service/listService"
 	"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/query/query_params"
 	"git.ma-al.com/goc_daniel/b2b/app/utils/response"
@@ -15,88 +12,50 @@ import (
 	"github.com/gofiber/fiber/v3"
 )
 
-type ProductsHandler struct {
-	productService *productService.ProductService
-	config         *config.Config
+// ListHandler handles endpoints that list various things (e.g. products or users)
+type ListHandler struct {
+	listService *listService.ListService
+	config      *config.Config
 }
 
-// NewListProductsHandler creates a new ListProductsHandler instance
-func NewProductsHandler() *ProductsHandler {
-	productService := productService.New()
-	return &ProductsHandler{
-		productService: productService,
-		config:         config.Get(),
+// NewListHandler creates a new ListHandler instance
+func NewListHandler() *ListHandler {
+	listService := listService.New()
+	return &ListHandler{
+		listService: listService,
+		config:      config.Get(),
 	}
 }
 
-func ProductsHandlerRoutes(r fiber.Router) fiber.Router {
-	handler := NewProductsHandler()
+func ListHandlerRoutes(r fiber.Router) fiber.Router {
+	handler := NewListHandler()
 
-	r.Get("/:id/:country_id/:quantity", handler.GetProductJson)
-	r.Get("/list", handler.ListProducts)
+	r.Get("/list-products", handler.ListProducts)
+	r.Get("/list-users", handler.ListUsers)
 
 	return r
 }
 
-func (h *ProductsHandler) GetProductJson(c fiber.Ctx) error {
-	idStr := c.Params("id")
-
-	p_id_product, err := strconv.Atoi(idStr)
-	if err != nil {
-		return c.Status(responseErrors.GetErrorStatus(err)).
-			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, err)))
-	}
-
-	country_idStr := c.Params("country_id")
-
-	b2b_id_country, err := strconv.Atoi(country_idStr)
-	if err != nil {
-		return c.Status(responseErrors.GetErrorStatus(err)).
-			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, err)))
-	}
-
-	quantityStr := c.Params("quantity")
-
-	p_quantity, err := strconv.Atoi(quantityStr)
-	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)))
-	}
-	productJson, err := h.productService.GetJSON(p_id_product, int(customer.LangID), int(customer.ID), b2b_id_country, p_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(&productJson, 1, i18n.T_(c, response.Message_OK)))
-}
-
-func (h *ProductsHandler) ListProducts(c fiber.Ctx) error {
+func (h *ListHandler) ListProducts(c fiber.Ctx) error {
 	paging, filters, err := query_params.ParseFilters[model.Product](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)
+	id_lang, ok := c.Locals("langID").(uint)
 	if !ok {
 		return c.Status(responseErrors.GetErrorStatus(responseErrors.ErrBadAttribute)).
 			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, responseErrors.ErrBadAttribute)))
 	}
 
-	list, err := h.productService.Find(id_lang, paging, filters)
+	listing, err := h.listService.ListProducts(id_lang, paging, filters)
 	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.Items, int(list.Count), i18n.T_(c, response.Message_OK)))
+	return c.JSON(response.Make(&listing.Items, int(listing.Count), i18n.T_(c, response.Message_OK)))
 }
 
 var columnMappingListProducts map[string]string = map[string]string{
@@ -107,3 +66,33 @@ var columnMappingListProducts map[string]string = map[string]string{
 	"category_id":   "cp.id_category",
 	"quantity":      "sa.quantity",
 }
+
+func (h *ListHandler) ListUsers(c fiber.Ctx) error {
+	paging, filters, err := query_params.ParseFilters[model.Customer](c, columnMappingListUsers)
+	if err != nil {
+		return c.Status(responseErrors.GetErrorStatus(err)).
+			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, err)))
+	}
+
+	id_lang, ok := c.Locals("langID").(uint)
+	if !ok {
+		return c.Status(responseErrors.GetErrorStatus(responseErrors.ErrBadAttribute)).
+			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, responseErrors.ErrBadAttribute)))
+	}
+
+	listing, err := h.listService.ListUsers(id_lang, paging, filters)
+	if err != nil {
+		return c.Status(responseErrors.GetErrorStatus(err)).
+			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, err)))
+	}
+
+	return c.JSON(response.Make(&listing.Items, int(listing.Count), i18n.T_(c, response.Message_OK)))
+}
+
+var columnMappingListUsers map[string]string = map[string]string{
+	"user_id":     "users.id",
+	"email":       "users.email",
+	"first_name":  "users.first_name",
+	"second_name": "users.second_name",
+	"role":        "users.role",
+}

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

@@ -5,7 +5,6 @@ import (
 
 	"git.ma-al.com/goc_daniel/b2b/app/service/menuService"
 	"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"
@@ -34,7 +33,7 @@ func MenuHandlerRoutes(r fiber.Router) fiber.Router {
 }
 
 func (h *MenuHandler) GetCategoryTree(c fiber.Ctx) error {
-	lang_id, ok := localeExtractor.GetLangID(c)
+	lang_id, ok := c.Locals("langID").(uint)
 	if !ok {
 		return c.Status(responseErrors.GetErrorStatus(responseErrors.ErrBadAttribute)).
 			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, responseErrors.ErrBadAttribute)))
@@ -57,7 +56,7 @@ func (h *MenuHandler) GetCategoryTree(c fiber.Ctx) error {
 }
 
 func (h *MenuHandler) GetBreadcrumb(c fiber.Ctx) error {
-	lang_id, ok := localeExtractor.GetLangID(c)
+	lang_id, ok := c.Locals("langID").(uint)
 	if !ok {
 		return c.Status(responseErrors.GetErrorStatus(responseErrors.ErrBadAttribute)).
 			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, responseErrors.ErrBadAttribute)))
@@ -87,12 +86,12 @@ func (h *MenuHandler) GetBreadcrumb(c fiber.Ctx) error {
 }
 
 func (h *MenuHandler) GetTopMenu(c fiber.Ctx) error {
-	customer, ok := localeExtractor.GetCustomer(c)
-	if !ok || customer == nil {
+	lang_id, ok := c.Locals("langID").(uint)
+	if !ok {
 		return c.Status(responseErrors.GetErrorStatus(responseErrors.ErrBadAttribute)).
 			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, responseErrors.ErrBadAttribute)))
 	}
-	menu, err := h.menuService.GetTopMenu(customer.LangID, customer.RoleID)
+	menu, err := h.menuService.GetTopMenu(lang_id)
 	if err != nil {
 		return c.Status(responseErrors.GetErrorStatus(err)).
 			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, err)))

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

@@ -4,10 +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/service/productTranslationService"
 	"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"
@@ -43,7 +41,7 @@ func ProductTranslationHandlerRoutes(r fiber.Router) fiber.Router {
 
 // GetProductDescription returns the product description for a given product ID
 func (h *ProductTranslationHandler) GetProductDescription(c fiber.Ctx) error {
-	userID, ok := localeExtractor.GetUserID(c)
+	userID, ok := c.Locals("userID").(uint)
 	if !ok {
 		return c.Status(responseErrors.GetErrorStatus(responseErrors.ErrInvalidBody)).
 			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, responseErrors.ErrInvalidBody)))
@@ -74,18 +72,12 @@ func (h *ProductTranslationHandler) GetProductDescription(c fiber.Ctx) error {
 
 // SaveProductDescription saves the description for a given product ID, in given language
 func (h *ProductTranslationHandler) SaveProductDescription(c fiber.Ctx) error {
-	userID, ok := localeExtractor.GetUserID(c)
+	userID, ok := c.Locals("userID").(uint)
 	if !ok {
 		return c.Status(responseErrors.GetErrorStatus(responseErrors.ErrInvalidBody)).
 			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 {
@@ -117,18 +109,12 @@ func (h *ProductTranslationHandler) SaveProductDescription(c fiber.Ctx) error {
 
 // TranslateProductDescription returns translated product description
 func (h *ProductTranslationHandler) TranslateProductDescription(c fiber.Ctx) error {
-	userID, ok := localeExtractor.GetUserID(c)
+	userID, ok := c.Locals("userID").(uint)
 	if !ok {
 		return c.Status(responseErrors.GetErrorStatus(responseErrors.ErrInvalidBody)).
 			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 {

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

@@ -4,11 +4,9 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"git.ma-al.com/goc_daniel/b2b/app/model"
 	"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"
-	"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"
@@ -38,18 +36,12 @@ func MeiliSearchHandlerRoutes(r fiber.Router) fiber.Router {
 }
 
 func (h *MeiliSearchHandler) CreateIndex(c fiber.Ctx) error {
-	id_lang, ok := localeExtractor.GetLangID(c)
+	id_lang, ok := c.Locals("langID").(uint)
 	if !ok {
 		return c.Status(responseErrors.GetErrorStatus(responseErrors.ErrBadAttribute)).
 			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)
@@ -57,11 +49,12 @@ func (h *MeiliSearchHandler) CreateIndex(c fiber.Ctx) error {
 			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, err)))
 	}
 
-	return c.JSON(response.Make(nullable.GetNil(""), 0, i18n.T_(c, response.Message_OK)))
+	nothing := ""
+	return c.JSON(response.Make(&nothing, 0, i18n.T_(c, response.Message_OK)))
 }
 
 func (h *MeiliSearchHandler) Search(c fiber.Ctx) error {
-	id_lang, ok := localeExtractor.GetLangID(c)
+	id_lang, ok := c.Locals("langID").(uint)
 	if !ok {
 		return c.Status(responseErrors.GetErrorStatus(responseErrors.ErrBadAttribute)).
 			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, responseErrors.ErrBadAttribute)))
@@ -95,7 +88,7 @@ func (h *MeiliSearchHandler) Search(c fiber.Ctx) error {
 }
 
 func (h *MeiliSearchHandler) GetSettings(c fiber.Ctx) error {
-	id_lang, ok := localeExtractor.GetLangID(c)
+	id_lang, ok := c.Locals("langID").(uint)
 	if !ok {
 		return c.Status(responseErrors.GetErrorStatus(responseErrors.ErrBadAttribute)).
 			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, responseErrors.ErrBadAttribute)))

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

@@ -1,100 +0,0 @@
-package restricted
-
-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/service/storageService"
-	"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 StorageHandler struct {
-	storageService *storageService.StorageService
-	config         *config.Config
-}
-
-func NewStorageHandler() *StorageHandler {
-	return &StorageHandler{
-		storageService: storageService.New(),
-		config:         config.Get(),
-	}
-}
-
-func StorageHandlerRoutes(r fiber.Router) fiber.Router {
-	handler := NewStorageHandler()
-
-	// for all users
-	r.Get("/list-content/*", handler.ListContent)
-	r.Get("/download-file/*", handler.DownloadFile)
-
-	// for admins only
-	r.Get("/create-new-webdav-token", handler.CreateNewWebdavToken)
-
-	return r
-}
-
-// accepted path looks like e.g. "/folder1/" or "folder1"
-func (h *StorageHandler) ListContent(c fiber.Ctx) error {
-	// relative path defaults to root directory
-	abs_path, err := h.storageService.AbsPath(h.config.Storage.RootFolder, c.Params("*"))
-	if err != nil {
-		return c.Status(responseErrors.GetErrorStatus(err)).
-			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, err)))
-	}
-
-	entries_in_list, err := h.storageService.ListContent(abs_path)
-
-	if err != nil {
-		return c.Status(responseErrors.GetErrorStatus(err)).
-			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, err)))
-	}
-
-	return c.JSON(response.Make(entries_in_list, 0, i18n.T_(c, response.Message_OK)))
-}
-
-func (h *StorageHandler) DownloadFile(c fiber.Ctx) error {
-	abs_path, err := h.storageService.AbsPath(h.config.Storage.RootFolder, c.Params("*"))
-	if err != nil {
-		return c.Status(responseErrors.GetErrorStatus(err)).
-			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, err)))
-	}
-
-	f, filename, filesize, err := h.storageService.DownloadFilePrep(abs_path)
-	if err != nil {
-		return c.Status(responseErrors.GetErrorStatus(err)).
-			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, err)))
-	}
-
-	c.Attachment(filename)
-	c.Set("Content-Length", strconv.FormatInt(filesize, 10))
-	c.Set("Content-Type", "application/octet-stream")
-	return c.SendStream(f, int(filesize))
-}
-
-func (h *StorageHandler) CreateNewWebdavToken(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)))
-	}
-
-	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)).
-			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, err)))
-	}
-
-	return c.JSON(response.Make(&new_token, 0, i18n.T_(c, response.Message_OK)))
-}

app/delivery/web/api/webdav/storage.go

@@ -1,198 +0,0 @@
-package webdav
-
-import (
-	"bytes"
-	"io"
-	"net/http"
-	"strconv"
-
-	"git.ma-al.com/goc_daniel/b2b/app/config"
-	"git.ma-al.com/goc_daniel/b2b/app/service/storageService"
-	"git.ma-al.com/goc_daniel/b2b/app/utils/responseErrors"
-	"github.com/gofiber/fiber/v3"
-)
-
-type StorageHandler struct {
-	storageService *storageService.StorageService
-	config         *config.Config
-}
-
-func NewStorageHandler() *StorageHandler {
-	return &StorageHandler{
-		storageService: storageService.New(),
-		config:         config.Get(),
-	}
-}
-
-func StorageHandlerRoutes(r fiber.Router) fiber.Router {
-	handler := NewStorageHandler()
-
-	// for webdav use only
-	r.Get("/*", handler.Get)
-	r.Head("/*", handler.Get)
-	r.Put("/*", handler.Put)
-	r.Delete("/*", handler.Delete)
-	r.Add([]string{"MKCOL"}, "/*", handler.Mkcol)
-	r.Add([]string{"PROPFIND"}, "/*", handler.Propfind)
-	r.Add([]string{"PROPPATCH"}, "/*", handler.Proppatch)
-	r.Add([]string{"MOVE"}, "/*", handler.Move)
-	r.Add([]string{"COPY"}, "/*", handler.Copy)
-
-	return r
-}
-
-func (h *StorageHandler) Get(c fiber.Ctx) error {
-	// fmt.Println("GET")
-	absPath, err := h.storageService.AbsPath(h.config.Storage.RootFolder, c.Params("*"))
-	if err != nil {
-		return c.SendStatus(responseErrors.GetErrorStatus(err))
-	}
-
-	info, err := h.storageService.EntryInfo(absPath)
-	if err != nil {
-		return c.SendStatus(responseErrors.GetErrorStatus(err))
-	}
-
-	if info.IsDir() {
-		xml, err := h.storageService.Propfind(h.config.Storage.RootFolder, absPath, "1")
-		if err != nil {
-			return c.SendStatus(responseErrors.GetErrorStatus(err))
-		}
-
-		c.Set("Content-Type", `application/xml; charset="utf-8"`)
-		return c.Status(http.StatusMultiStatus).SendString(xml)
-
-	} else {
-		f, filename, filesize, err := h.storageService.DownloadFilePrep(absPath)
-		if err != nil {
-			return c.SendStatus(responseErrors.GetErrorStatus(err))
-		}
-
-		c.Attachment(filename)
-		c.Set("Content-Length", strconv.FormatInt(filesize, 10))
-		c.Set("Content-Type", "application/octet-stream")
-		return c.SendStream(f, int(filesize))
-	}
-}
-
-func (h *StorageHandler) Put(c fiber.Ctx) error {
-	// fmt.Println("PUT")
-	absPath, err := h.storageService.AbsPath(h.config.Storage.RootFolder, c.Params("*"))
-	if err != nil {
-		return c.SendStatus(responseErrors.GetErrorStatus(err))
-	}
-
-	var src io.Reader
-	if bodyStream := c.Request().BodyStream(); bodyStream != nil {
-		defer c.Request().CloseBodyStream()
-		src = bodyStream
-	} else {
-		src = bytes.NewReader(c.Body())
-	}
-
-	err = h.storageService.Put(absPath, src)
-	if err != nil {
-		return c.SendStatus(responseErrors.GetErrorStatus(err))
-	}
-
-	return c.SendStatus(http.StatusCreated)
-}
-
-func (h *StorageHandler) Delete(c fiber.Ctx) error {
-	// fmt.Println("DELETE")
-	absPath, err := h.storageService.AbsPath(h.config.Storage.RootFolder, c.Params("*"))
-	if err != nil {
-		return c.SendStatus(responseErrors.GetErrorStatus(err))
-	}
-	if absPath == h.config.Storage.RootFolder {
-		return c.SendStatus(responseErrors.GetErrorStatus(responseErrors.ErrAccessDenied))
-	}
-
-	err = h.storageService.Delete(absPath)
-	if err != nil {
-		return c.SendStatus(responseErrors.GetErrorStatus(err))
-	}
-
-	return c.SendStatus(http.StatusNoContent)
-}
-
-func (h *StorageHandler) Mkcol(c fiber.Ctx) error {
-	// fmt.Println("Mkcol")
-	absPath, err := h.storageService.AbsPath(h.config.Storage.RootFolder, c.Params("*"))
-	if err != nil {
-		return c.SendStatus(responseErrors.GetErrorStatus(err))
-	}
-
-	err = h.storageService.Mkcol(absPath)
-	if err != nil {
-		return c.SendStatus(responseErrors.GetErrorStatus(err))
-	}
-
-	return c.SendStatus(http.StatusCreated)
-}
-
-func (h *StorageHandler) Propfind(c fiber.Ctx) error {
-	// fmt.Println("PROPFIND")
-	absPath, err := h.storageService.AbsPath(h.config.Storage.RootFolder, c.Params("*"))
-	if err != nil {
-		return c.SendStatus(responseErrors.GetErrorStatus(err))
-	}
-
-	xml, err := h.storageService.Propfind(h.config.Storage.RootFolder, absPath, "1")
-	if err != nil {
-		return c.SendStatus(responseErrors.GetErrorStatus(err))
-	}
-
-	c.Set("Content-Type", `application/xml; charset="utf-8"`)
-	return c.Status(http.StatusMultiStatus).SendString(xml)
-}
-
-func (h *StorageHandler) Proppatch(c fiber.Ctx) error {
-	return c.SendStatus(http.StatusNotImplemented) // 501
-}
-
-func (h *StorageHandler) Move(c fiber.Ctx) error {
-	// fmt.Println("MOVE")
-	srcAbsPath, err := h.storageService.AbsPath(h.config.Storage.RootFolder, c.Params("*"))
-	if err != nil {
-		return c.SendStatus(responseErrors.GetErrorStatus(err))
-	}
-
-	dest := c.Get("Destination")
-	if dest == "" {
-		return c.SendStatus(http.StatusBadRequest)
-	}
-	destAbsPath, err := h.storageService.ObtainDestPath(h.config.Storage.RootFolder, dest)
-	if err != nil {
-		return c.SendStatus(responseErrors.GetErrorStatus(err))
-	}
-
-	err = h.storageService.Move(srcAbsPath, destAbsPath)
-	if err != nil {
-		return c.SendStatus(responseErrors.GetErrorStatus(err))
-	}
-	return c.SendStatus(http.StatusCreated)
-}
-
-func (h *StorageHandler) Copy(c fiber.Ctx) error {
-	// fmt.Println("COPY")
-	srcAbsPath, err := h.storageService.AbsPath(h.config.Storage.RootFolder, c.Params("*"))
-	if err != nil {
-		return c.SendStatus(responseErrors.GetErrorStatus(err))
-	}
-
-	dest := c.Get("Destination")
-	if dest == "" {
-		return c.SendStatus(http.StatusBadRequest)
-	}
-	destAbsPath, err := h.storageService.ObtainDestPath(h.config.Storage.RootFolder, dest)
-	if err != nil {
-		return c.SendStatus(responseErrors.GetErrorStatus(err))
-	}
-
-	err = h.storageService.Copy(srcAbsPath, destAbsPath)
-	if err != nil {
-		return c.SendStatus(responseErrors.GetErrorStatus(err))
-	}
-	return c.SendStatus(http.StatusCreated)
-}

app/delivery/web/init.go

@@ -14,7 +14,6 @@ import (
 	"git.ma-al.com/goc_daniel/b2b/app/delivery/web/api"
 	"git.ma-al.com/goc_daniel/b2b/app/delivery/web/api/public"
 	"git.ma-al.com/goc_daniel/b2b/app/delivery/web/api/restricted"
-	"git.ma-al.com/goc_daniel/b2b/app/delivery/web/api/webdav"
 	"git.ma-al.com/goc_daniel/b2b/app/delivery/web/general"
 
 	"github.com/gofiber/fiber/v3"
@@ -26,7 +25,6 @@ import (
 type Server struct {
 	app        *fiber.App
 	cfg        *config.Config
-	webdav     fiber.Router
 	api        fiber.Router
 	public     fiber.Router
 	restricted fiber.Router
@@ -44,23 +42,12 @@ func (s *Server) Cfg() *config.Config {
 
 // New creates a new server instance
 func New() *Server {
-	var s Server
-
-	app :=
-		fiber.New(fiber.Config{
-			ErrorHandler:      customErrorHandler,
-			BodyLimit:         50 * 1024 * 1024, // 50 MB
-			StreamRequestBody: true,
-			RequestMethods: []string{
-				fiber.MethodGet, fiber.MethodHead, fiber.MethodPost, fiber.MethodPut,
-				fiber.MethodDelete, fiber.MethodConnect, fiber.MethodOptions,
-				fiber.MethodTrace, fiber.MethodPatch, "MKCOL", "PROPFIND", "PROPPATCH", "MOVE", "COPY",
-			},
-		})
-
-	s.app = app
-	s.cfg = config.Get()
-	return &s
+	return &Server{
+		app: fiber.New(fiber.Config{
+			ErrorHandler: customErrorHandler,
+		}),
+		cfg: config.Get(),
+	}
 }
 
 // Setup configures the server with routes and middleware
@@ -89,8 +76,6 @@ func (s *Server) Setup() error {
 	s.public = s.api.Group("/public")
 	s.restricted = s.api.Group("/restricted")
 	s.restricted.Use(middleware.AuthMiddleware())
-	s.webdav = s.api.Group("/webdav")
-	s.webdav.Use(middleware.Webdav())
 
 	// initialize language endpoints (general)
 	api.NewLangHandler().InitLanguage(s.api, s.cfg)
@@ -105,15 +90,13 @@ func (s *Server) Setup() error {
 	menuRouting := s.public.Group("/menu")
 	public.RoutingHandlerRoutes(menuRouting)
 
-	pCustomer := s.restricted.Group("/customer")
-	restricted.CustomerHandlerRoutes(pCustomer)
-
 	// product translation routes (restricted)
 	productTranslation := s.restricted.Group("/product-translation")
 	restricted.ProductTranslationHandlerRoutes(productTranslation)
 
-	product := s.restricted.Group("/product")
-	restricted.ProductsHandlerRoutes(product)
+	// lists of things routes (restricted)
+	list := s.restricted.Group("/list")
+	restricted.ListHandlerRoutes(list)
 
 	// locale selector (restricted)
 	// this is basically for changing user's selected language and country
@@ -132,14 +115,6 @@ func (s *Server) Setup() error {
 	carts := s.restricted.Group("/carts")
 	restricted.CartsHandlerRoutes(carts)
 
-	// storage (uses various authorization means)
-	restrictedStorage := s.restricted.Group("/storage")
-	webdavStorage := s.webdav.Group("/storage")
-	restricted.StorageHandlerRoutes(restrictedStorage)
-	webdav.StorageHandlerRoutes(webdavStorage)
-
-	restricted.CurrencyHandlerRoutes(s.restricted)
-
 	s.api.All("*", func(c fiber.Ctx) error {
 		return c.SendStatus(fiber.StatusNotFound)
 	})

app/model/currency.go

@@ -1,25 +0,0 @@
-package model
-
-import "time"
-
-type Currency struct {
-	ID             int      `json:"id"`
-	PsIDCurrency   uint     `json:"ps_id_currency"`
-	IsDefault      bool     `json:"is_default"`
-	IsActive       bool     `json:"is_active"`
-	ConversionRate *float64 `json:"conversion_rate,omitempty"`
-}
-
-func (Currency) TableName() string {
-	return "b2b_currencies"
-}
-
-type CurrencyRate struct {
-	B2bIdCurrency  uint      `json:"b2b_id_currency"`
-	CreatedAt      time.Time `json:"created_at"`
-	ConversionRate *float64  `json:"conversion_rate,omitempty"`
-}
-
-func (CurrencyRate) TableName() string {
-	return "b2b_currency_rates"
-}

app/model/customer.go

@@ -3,7 +3,6 @@ package model
 import (
 	"time"
 
-	"git.ma-al.com/goc_daniel/b2b/app/delivery/middleware/perms"
 	"gorm.io/gorm"
 )
 
@@ -14,8 +13,7 @@ type Customer struct {
 	Password                 string         `gorm:"size:255" json:"-"` // Hashed password, not exposed in JSON
 	FirstName                string         `gorm:"size:100" json:"first_name"`
 	LastName                 string         `gorm:"size:100" json:"last_name"`
-	RoleID                   uint           `gorm:"column:role_id;not null;default:1" json:"-"`
-	Role                     *Role          `gorm:"foreignKey:RoleID" json:"role,omitempty"`
+	Role                     CustomerRole   `gorm:"type:varchar(20);default:'user'" json:"role"`
 	Provider                 AuthProvider   `gorm:"type:varchar(20);default:'local'" json:"provider"`
 	ProviderID               string         `gorm:"size:255" json:"provider_id,omitempty"` // ID from OAuth provider
 	AvatarURL                string         `gorm:"size:500" json:"avatar_url,omitempty"`
@@ -25,8 +23,6 @@ type Customer struct {
 	EmailVerificationExpires *time.Time     `json:"-"`
 	PasswordResetToken       string         `gorm:"size:255" json:"-"`
 	PasswordResetExpires     *time.Time     `json:"-"`
-	WebdavToken              string         `gorm:"size:255" json:"-"`
-	WebdavExpires            *time.Time     `json:"-"`
 	LastPasswordResetRequest *time.Time     `json:"-"`
 	LastLoginAt              *time.Time     `json:"last_login_at,omitempty"`
 	LangID                   uint           `gorm:"default:2" json:"lang_id"`    // User's preferred language
@@ -36,14 +32,13 @@ type Customer struct {
 	DeletedAt                gorm.DeletedAt `gorm:"index" json:"-"`
 }
 
-func (u *Customer) HasPermission(permission perms.Permission) bool {
-	for _, p := range u.Role.Permissions {
-		if p.Name == permission {
-			return true
-		}
-	}
-	return false
-}
+// CustomerRole represents the role of a user
+type CustomerRole string
+
+const (
+	RoleUser  CustomerRole = "user"
+	RoleAdmin CustomerRole = "admin"
+)
 
 // AuthProvider represents the authentication provider
 type AuthProvider string
@@ -58,6 +53,16 @@ func (Customer) TableName() string {
 	return "b2b_customers"
 }
 
+// IsAdmin checks if the user has admin role
+func (u *Customer) IsAdmin() bool {
+	return u.Role == RoleAdmin
+}
+
+// CanManageUsers checks if the user can manage other users
+func (u *Customer) CanManageUsers() bool {
+	return u.Role == RoleAdmin
+}
+
 // FullName returns the user's full name
 func (u *Customer) FullName() string {
 	if u.FirstName == "" && u.LastName == "" {
@@ -68,65 +73,31 @@ func (u *Customer) FullName() string {
 
 // UserSession represents a user session for JWT claims
 type UserSession struct {
-	UserID      uint               `json:"user_id"`
-	Email       string             `json:"email"`
-	Username    string             `json:"username"`
-	RoleID      uint               `json:"role_id"`
-	RoleName    string             `json:"role_name"`
-	LangID      uint               `json:"lang_id"`
-	CountryID   uint               `json:"country_id"`
-	IsActive    bool               `json:"is_active"`
-	Permissions []perms.Permission `json:"permissions"`
-}
-
-func (us *UserSession) HasPermission(permission perms.Permission) bool {
-	for _, p := range us.Permissions {
-		if p == permission {
-			return true
-		}
-	}
-	return false
-}
-
-type UserLocale struct {
-	// User is the Target user if present, otherwise same as Original.
-	// User ought to be used in applications
-	User *Customer
-	// Original user is the one associated with auth token
-	OriginalUser *Customer
-	// Importantly, lang_id used in application is stored as OriginalUser.LangID
+	UserID    uint         `json:"user_id"`
+	Email     string       `json:"email"`
+	Username  string       `json:"username"`
+	Role      CustomerRole `json:"role"`
+	LangID    uint         `json:"lang_id"`
+	CountryID uint         `json:"country_id"`
+	IsActive  bool         `json:"is_active"`
 }
 
 // ToSession converts User to UserSession
 func (u *Customer) ToSession() *UserSession {
-
 	return &UserSession{
-		UserID:      u.ID,
-		Email:       u.Email,
-		RoleID:      u.Role.ID,
-		RoleName:    u.Role.Name,
-		Permissions: BuildPermissionSlice(u),
-		LangID:      u.LangID,
-		CountryID:   u.CountryID,
-		IsActive:    u.IsActive,
+		UserID:    u.ID,
+		Email:     u.Email,
+		Role:      u.Role,
+		LangID:    u.LangID,
+		CountryID: u.CountryID,
+		IsActive:  u.IsActive,
 	}
 }
 
-func BuildPermissionSlice(user *Customer) []perms.Permission {
-	var perms []perms.Permission
-
-	for _, p := range user.Role.Permissions {
-		perms = append(perms, p.Name)
-	}
-
-	return perms
-}
-
 // LoginRequest represents the login form data
 type LoginRequest struct {
 	Email    string `json:"email" form:"email"`
 	Password string `json:"password" form:"password"`
-	LangID   *uint  `json:"lang_id" form:"lang_id"`
 }
 
 // RegisterRequest represents the initial registration form data
@@ -179,4 +150,5 @@ type UserInList struct {
 	Email     string `gorm:"column:email" json:"email"`
 	FirstName string `gorm:"column:first_name" json:"first_name"`
 	LastName  string `gorm:"column:last_name" json:"last_name"`
+	Role      string `gorm:"column:role" json:"role"`
 }

app/model/entry.go

@@ -1,6 +0,0 @@
-package model
-
-type EntryInList struct {
-	Name     string
-	IsFolder bool
-}

app/model/model.go

@@ -1,18 +0,0 @@
-package model
-
-import (
-	"time"
-
-	"gorm.io/gorm"
-)
-
-type Model struct {
-	ID        uint           `gorm:"primarykey;autoIncrement" swaggerignore:"true" json:"id,omitempty" hidden:"true"`
-	CreatedAt time.Time      `gorm:"not null;autoCreateTime" swaggerignore:"true" json:"-"`
-	UpdatedAt time.Time      `gorm:"autoUpdateTime" swaggerignore:"true" json:"-"`
-	DeletedAt gorm.DeletedAt `gorm:"index" swaggerignore:"true" json:"-"`
-}
-
-// Makes all objects embedding db.Model implementators of ModelWithID interface
-func (m Model) ModelWithID() {
-}

app/model/permission.go

@@ -1,12 +0,0 @@
-package model
-
-import "git.ma-al.com/goc_daniel/b2b/app/delivery/middleware/perms"
-
-type Permission struct {
-	ID   uint
-	Name perms.Permission
-}
-
-func (Permission) TableName() string {
-	return "b2b_permissions"
-}

app/model/productDescription.go

@@ -20,8 +20,7 @@ type ProductDescription struct {
 	DeliveryOutStock string `gorm:"column:delivery_out_stock;type:varchar(255)" json:"delivery_out_stock" form:"delivery_out_stock"`
 	Usage            string `gorm:"column:usage;type:text" json:"usage" form:"usage"`
 
-	ImageLink        string `gorm:"column:image_link" json:"image_link"`
-	ExistsInDatabase bool   `gorm:"-" json:"exists_in_database"`
+	ExistsInDatabase bool `gorm:"-" json:"exists_in_database"`
 }
 
 type ProductRow struct {

app/model/role.go

@@ -1,19 +0,0 @@
-package model
-
-type Role struct {
-	ID          uint         `gorm:"primaryKey" json:"id"`
-	Name        string       `gorm:"size:64" json:"name"`
-	Permissions []Permission `gorm:"many2many:b2b_role_permissions;" json:"permissions"`
-}
-
-func (Role) TableName() string {
-	return "b2b_roles"
-}
-
-type CustomerRole string
-
-const (
-	RoleUser       CustomerRole = "user"
-	RoleAdmin      CustomerRole = "admin"
-	RoleSuperAdmin CustomerRole = "super_admin"
-)

app/repos/currencyRepo/currencyRepo.go

@@ -1,53 +0,0 @@
-package currencyRepo
-
-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/utils/query/filters"
-	"git.ma-al.com/goc_daniel/b2b/app/utils/query/find"
-)
-
-type UICurrencyRepo interface {
-	CreateConversionRate(currencyRate *model.CurrencyRate) error
-	Get(id uint) (*model.Currency, error)
-}
-
-type CurrencyRepo struct{}
-
-func New() UICurrencyRepo {
-	return &CurrencyRepo{}
-}
-
-func (repo *CurrencyRepo) CreateConversionRate(currencyRate *model.CurrencyRate) error {
-	return db.DB.Create(currencyRate).Error
-}
-
-func (repo *CurrencyRepo) Get(id uint) (*model.Currency, error) {
-	var currency model.Currency
-
-	err := db.DB.Table("b2b_currencies c").
-		Select("c.*, r.conversion_rate").
-		Joins(`
-		LEFT JOIN b2b_currency_rates r 
-		ON r.b2b_id_currency = c.id 
-		AND r.created_at = (
-			SELECT MAX(created_at) 
-			FROM b2b_currency_rates 
-			WHERE b2b_id_currency = c.id
-		)
-	`).
-		Where("c.id = ?", id).
-		Scan(&currency).Error
-
-	return &currency, err
-}
-
-func (repo *CurrencyRepo) Find(langId uint, p find.Paging, filt *filters.FiltersList) (*find.Found[model.Currency], error) {
-
-	found, err := find.Paginate[model.Currency](langId, p, db.DB.
-		Model(&model.Currency{}).
-		Scopes(filt.All()...),
-	)
-
-	return &found, err
-}

app/repos/customerRepo/customerRepo.go

@@ -1,197 +0,0 @@
-package customerRepo
-
-import (
-	"strings"
-
-	"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/utils/query/filters"
-	"git.ma-al.com/goc_daniel/b2b/app/utils/query/find"
-)
-
-type UICustomerRepo interface {
-	Get(id uint) (*model.Customer, error)
-	GetByEmail(email string) (*model.Customer, error)
-	GetByExternalProviderId(provider model.AuthProvider, id string) (*model.Customer, error)
-	Find(langId uint, p find.Paging, filt *filters.FiltersList, search string) (*find.Found[model.UserInList], error)
-	Save(customer *model.Customer) error
-	Create(customer *model.Customer) error
-}
-
-type CustomerRepo struct{}
-
-func New() UICustomerRepo {
-	return &CustomerRepo{}
-}
-
-func (repo *CustomerRepo) Get(id uint) (*model.Customer, error) {
-	var customer model.Customer
-
-	err := db.DB.
-		Preload("Role.Permissions").
-		First(&customer, id).
-		Error
-
-	return &customer, err
-}
-
-func (repo *CustomerRepo) GetByEmail(email string) (*model.Customer, error) {
-	var customer model.Customer
-
-	err := db.DB.
-		Preload("Role.Permissions").
-		Where("email = ?", email).
-		First(&customer).
-		Error
-
-	return &customer, err
-}
-
-func (repo *CustomerRepo) GetByExternalProviderId(provider model.AuthProvider, id string) (*model.Customer, error) {
-	var customer model.Customer
-
-	err := db.DB.
-		Preload("Role.Permissions").
-		Where("provider = ? AND provider_id = ?", provider, id).
-		First(&customer).
-		Error
-
-	return &customer, err
-}
-
-func (repo *CustomerRepo) Find(langId uint, p find.Paging, filt *filters.FiltersList, search string) (*find.Found[model.UserInList], error) {
-
-	query := db.DB.
-		Table("b2b_customers AS users").
-		Select(`
-			users.id AS id,
-			users.email AS email,
-			users.first_name AS first_name,
-			users.last_name AS last_name
-		`)
-
-	if search != "" {
-		words := strings.Fields(search)
-		if len(words) > 5 {
-			words = words[:5]
-		}
-		var conditions []string
-		var args []interface{}
-		for _, word := range words {
-
-			conditions = append(conditions, `
-			(LOWER(first_name) LIKE ? OR
-			 LOWER(last_name) LIKE ? OR
-			 LOWER(email) LIKE ?)
-		`)
-
-			for range 3 {
-				args = append(args, "%"+strings.ToLower(word)+"%")
-			}
-		}
-
-		conditionsQuery := strings.Join(conditions, " AND ")
-
-		query = query.Where(conditionsQuery, args...)
-
-	}
-
-	query = query.Scopes(filt.All()...)
-
-	found, err := find.Paginate[model.UserInList](langId, p, query)
-
-	return &found, err
-}
-
-func (repo *CustomerRepo) Save(customer *model.Customer) error {
-	return db.DB.Save(customer).Error
-}
-
-func (repo *CustomerRepo) Create(customer *model.Customer) error {
-	return db.DB.Create(customer).Error
-}
-
-// func (repo *CustomerRepo) Search(
-// 	customerId uint,
-// 	partnerCode string,
-// 	p find.Paging,
-// 	filt *filters.FiltersList,
-// 	search string,
-// ) (found find.Found[model.UserInList], err error) {
-// 	words := strings.Fields(search)
-// 	if len(words) > 5 {
-// 		words = words[:5]
-// 	}
-
-// 	query := ctx.DB().
-// 		Model(&model.Customer{}).
-// 		Select("customer.id AS id, customer.first_name as first_name, customer.last_name as last_name, customer.phone_number AS phone_number, customer.email AS email, count(distinct investment_plan_contract.id) as iiplan_purchases, count(distinct `order`.id) as single_purchases, entity.name as entity_name").
-// 		Where("customer.id <> ?", customerId).
-// 		Where("(customer.id IN (SELECT id FROM customer WHERE partner_code IN (WITH RECURSIVE partners AS (SELECT code AS dst FROM partner WHERE code = ? UNION SELECT code FROM partner JOIN partners ON partners.dst = partner.superior_code) SELECT dst FROM partners)) OR customer.recommender_code = ?)", partnerCode, partnerCode).
-// 		Scopes(view.CustomerListQuery())
-
-// 	var conditions []string
-// 	var args []interface{}
-// 	for _, word := range words {
-
-// 		conditions = append(conditions, `
-// 			(LOWER(first_name) LIKE ? OR
-// 			 LOWER(last_name) LIKE ? OR
-// 			 phone_number LIKE ? OR
-// 			 LOWER(email) LIKE ?)
-// 		`)
-
-// 		for i := 0; i < 4; i++ {
-// 			args = append(args, "%"+strings.ToLower(word)+"%")
-// 		}
-// 	}
-
-// 	finalQuery := strings.Join(conditions, " AND ")
-
-// 	query = query.Where(finalQuery, args...).
-// 		Scopes(filt.All()...)
-
-// 	found, err = find.Paginate[V](ctx, p, query)
-
-// 	return found, errs.Recorded(span, err)
-// }
-
-// func (repo *ListRepo) ListUsers(id_lang uint, p find.Paging, filt *filters.FiltersList) (find.Found[model.UserInList], error) {
-// 	var list []model.UserInList
-// 	var total int64
-
-// 	query := db.Get().
-// 		Table("b2b_customers AS users").
-// 		Select(`
-// 			users.id AS id,
-// 			users.email AS email,
-// 			users.first_name AS first_name,
-// 			users.last_name AS last_name,
-// 			users.role AS role
-// 		`)
-
-// 	// Apply all filters
-// 	if filt != nil {
-// 		filt.ApplyAll(query)
-// 	}
-
-// 	//  run counter first as query is without limit and offset
-// 	err := query.Count(&total).Error
-// 	if err != nil {
-// 		return find.Found[model.UserInList]{}, err
-// 	}
-
-// 	err = query.
-// 		Order("users.id DESC").
-// 		Limit(p.Limit()).
-// 		Offset(p.Offset()).
-// 		Find(&list).Error
-// 	if err != nil {
-// 		return find.Found[model.UserInList]{}, err
-// 	}
-
-// 	return find.Found[model.UserInList]{
-// 		Items: list,
-// 		Count: uint(total),
-// 	}, nil
-// }

app/repos/listRepo/listRepo.go

@@ -1,9 +1,6 @@
-package productsRepo
+package listRepo
 
 import (
-	"encoding/json"
-	"fmt"
-
 	"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"
@@ -14,39 +11,18 @@ import (
 	"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 uint, p find.Paging, filt *filters.FiltersList) (find.Found[model.ProductInList], error)
+type UIListRepo interface {
+	ListProducts(id_lang uint, p find.Paging, filt *filters.FiltersList) (find.Found[model.ProductInList], error)
+	ListUsers(id_lang uint, p find.Paging, filt *filters.FiltersList) (find.Found[model.UserInList], error)
 }
 
-type ProductsRepo struct{}
+type ListRepo struct{}
 
-func New() UIProductsRepo {
-	return &ProductsRepo{}
+func New() UIListRepo {
+	return &ListRepo{}
 }
 
-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
-
-	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
-
-	if err != nil {
-		return nil, err
-	}
-
-	// Optional: validate it's valid JSON
-	if !json.Valid([]byte(productStr)) {
-		return nil, fmt.Errorf("invalid json returned from stored procedure")
-	}
-
-	raw := json.RawMessage(productStr)
-	return &raw, nil
-}
-
-func (repo *ProductsRepo) Find(id_lang uint, p find.Paging, filt *filters.FiltersList) (find.Found[model.ProductInList], error) {
+func (repo *ListRepo) ListProducts(id_lang uint, p find.Paging, filt *filters.FiltersList) (find.Found[model.ProductInList], error) {
 	var list []model.ProductInList
 	var total int64
 
@@ -76,8 +52,7 @@ func (repo *ProductsRepo) Find(id_lang uint, p find.Paging, filt *filters.Filter
 				Name:     "variants",
 				Subquery: exclause.Subquery{DB: db.Get().Model(&dbmodel.PsProductAttributeShop{}).Select("id_product", "COUNT(*) AS variants_number").Group("id_product")},
 			},
-		}}).
-		Order("ps.id_product DESC")
+		}})
 
 	// Apply all filters
 	if filt != nil {
@@ -91,6 +66,7 @@ func (repo *ProductsRepo) Find(id_lang uint, p find.Paging, filt *filters.Filter
 	}
 
 	err = query.
+		Order("ps.id_product DESC").
 		Limit(p.Limit()).
 		Offset(p.Offset()).
 		Find(&list).Error
@@ -103,3 +79,43 @@ func (repo *ProductsRepo) Find(id_lang uint, p find.Paging, filt *filters.Filter
 		Count: uint(total),
 	}, nil
 }
+
+func (repo *ListRepo) ListUsers(id_lang uint, p find.Paging, filt *filters.FiltersList) (find.Found[model.UserInList], error) {
+	var list []model.UserInList
+	var total int64
+
+	query := db.Get().
+		Table("b2b_customers AS users").
+		Select(`
+			users.id AS id,
+			users.email AS email,
+			users.first_name AS first_name,
+			users.last_name AS last_name,
+			users.role AS role
+		`)
+
+	// Apply all filters
+	if filt != nil {
+		filt.ApplyAll(query)
+	}
+
+	//  run counter first as query is without limit and offset
+	err := query.Count(&total).Error
+	if err != nil {
+		return find.Found[model.UserInList]{}, err
+	}
+
+	err = query.
+		Order("users.id DESC").
+		Limit(p.Limit()).
+		Offset(p.Offset()).
+		Find(&list).Error
+	if err != nil {
+		return find.Found[model.UserInList]{}, err
+	}
+
+	return find.Found[model.UserInList]{
+		Items: list,
+		Count: uint(total),
+	}, nil
+}

app/repos/productDescriptionRepo/productDescriptionRepo.go

@@ -4,7 +4,6 @@ import (
 	"errors"
 	"fmt"
 
-	"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"
@@ -37,27 +36,6 @@ func (r *ProductDescriptionRepo) GetProductDescription(productID uint, productid
 			IDShop:    int32(constdata.SHOP_ID),
 			IDLang:    int32(productid_lang),
 		}).
-		Select(`
-			`+dbmodel.PsProductLangCols.IDProduct.TabCol()+` AS id_product,
-			`+dbmodel.PsProductLangCols.IDShop.TabCol()+` AS id_shop,
-			`+dbmodel.PsProductLangCols.IDLang.TabCol()+` AS id_lang,
-			`+dbmodel.PsProductLangCols.Description.TabCol()+` AS description,
-			`+dbmodel.PsProductLangCols.DescriptionShort.TabCol()+` AS description_short,
-			`+dbmodel.PsProductLangCols.LinkRewrite.TabCol()+` AS link_rewrite,
-			`+dbmodel.PsProductLangCols.MetaDescription.TabCol()+` AS meta_description,
-			`+dbmodel.PsProductLangCols.MetaKeywords.TabCol()+` AS meta_keywords,
-			`+dbmodel.PsProductLangCols.MetaTitle.TabCol()+` AS meta_title,
-			`+dbmodel.PsProductLangCols.Name.TabCol()+` AS name,
-			`+dbmodel.PsProductLangCols.AvailableNow.TabCol()+` AS available_now,
-			`+dbmodel.PsProductLangCols.AvailableLater.TabCol()+` AS available_later,
-			`+dbmodel.PsProductLangCols.DeliveryInStock.TabCol()+` AS delivery_in_stock,
-			`+dbmodel.PsProductLangCols.DeliveryOutStock.TabCol()+` AS delivery_out_stock,
-			`+dbmodel.PsProductLangCols.Usage.TabCol()+` AS `+"`usage`"+`,
-			CONCAT(?, '/', `+dbmodel.PsImageShopCols.IDImage.TabCol()+`, '-large_default/', `+dbmodel.PsProductLangCols.LinkRewrite.TabCol()+`, '.webp') AS image_link
-		`, config.Get().Image.ImagePrefix).
-		Joins("JOIN " + dbmodel.TableNamePsImageShop +
-			" ON " + dbmodel.PsImageShopCols.IDProduct.TabCol() + "=" + dbmodel.PsProductLangCols.IDProduct.TabCol() +
-			" AND " + dbmodel.PsImageShopCols.Cover.TabCol() + " = 1").
 		First(&ProductDescription).Error
 
 	if errors.Is(err, gorm.ErrRecordNotFound) {
@@ -74,10 +52,10 @@ func (r *ProductDescriptionRepo) GetProductDescription(productID uint, productid
 
 // If it doesn't exist, returns an error.
 func (r *ProductDescriptionRepo) CreateIfDoesNotExist(productID uint, productid_lang uint) error {
-	record := dbmodel.PsProductLang{
-		IDProduct: int32(productID),
-		IDShop:    int32(constdata.SHOP_ID),
-		IDLang:    int32(productid_lang),
+	record := model.ProductDescription{
+		ProductID: productID,
+		ShopID:    constdata.SHOP_ID,
+		LangID:    productid_lang,
 	}
 
 	err := db.Get().

app/repos/rolesRepo/rolesRepo.go

@@ -1,22 +0,0 @@
-package roleRepo
-
-import (
-	"git.ma-al.com/goc_daniel/b2b/app/db"
-	"git.ma-al.com/goc_daniel/b2b/app/model"
-)
-
-type UIRolesRepo interface {
-	Get(id uint) (*model.Role, error)
-}
-
-type RolesRepo struct{}
-
-func New() UIRolesRepo {
-	return &RolesRepo{}
-}
-
-func (r *RolesRepo) Get(id uint) (*model.Role, error) {
-	var role model.Role
-	err := db.DB.First(&role, id).Error
-	return &role, err
-}

app/repos/routesRepo/routesRepo.go

@@ -8,7 +8,7 @@ import (
 
 type UIRoutesRepo interface {
 	GetRoutes(langId uint) ([]model.Route, error)
-	GetTopMenu(id uint, roleId uint) ([]model.B2BTopMenu, error)
+	GetTopMenu(id uint) ([]model.B2BTopMenu, error)
 }
 
 type RoutesRepo struct{}
@@ -26,16 +26,12 @@ func (p *RoutesRepo) GetRoutes(langId uint) ([]model.Route, error) {
 	return routes, nil
 }
 
-func (p *RoutesRepo) GetTopMenu(langId uint, roleId uint) ([]model.B2BTopMenu, error) {
+func (p *RoutesRepo) GetTopMenu(id uint) ([]model.B2BTopMenu, error) {
 	var menus []model.B2BTopMenu
 
-	err := db.
-		Get().
-		Model(model.B2BTopMenu{}).
-		Joins("JOIN b2b_top_menu_roles tmr ON tmr.top_menu_id = b2b_top_menu.menu_id").
-		Where(model.B2BTopMenu{Active: 1}).
-		Where("tmr.role_id = ?", roleId).
-		Order("b2b_top_menu.parent_id ASC, b2b_top_menu.position ASC").
+	err := db.Get().
+		Where("active = ?", 1).
+		Order("parent_id ASC, position ASC").
 		Find(&menus).Error
 
 	return menus, err

app/repos/searchRepo/searchRepo.go

@@ -32,12 +32,12 @@ func New() UISearchRepo {
 }
 
 func (r *SearchRepo) Search(index string, body []byte) (*SearchProxyResponse, error) {
-	url := fmt.Sprintf("%s/indexes/%s/search", r.cfg.MeiliSearch.ServerURL, index)
+	url := fmt.Sprintf("%s/indexes/%s/search", r.cfg.MailiSearch.ServerURL, index)
 	return r.doRequest(http.MethodPost, url, body)
 }
 
 func (r *SearchRepo) GetIndexSettings(index string) (*SearchProxyResponse, error) {
-	url := fmt.Sprintf("%s/indexes/%s/settings", r.cfg.MeiliSearch.ServerURL, index)
+	url := fmt.Sprintf("%s/indexes/%s/settings", r.cfg.MailiSearch.ServerURL, index)
 	return r.doRequest(http.MethodGet, url, nil)
 }
 
@@ -55,8 +55,8 @@ func (r *SearchRepo) doRequest(method, url string, body []byte) (*SearchProxyRes
 	}
 
 	req.Header.Set("Content-Type", "application/json")
-	if r.cfg.MeiliSearch.ApiKey != "" {
-		req.Header.Set("Authorization", fmt.Sprintf("Bearer %s", r.cfg.MeiliSearch.ApiKey))
+	if r.cfg.MailiSearch.ApiKey != "" {
+		req.Header.Set("Authorization", fmt.Sprintf("Bearer %s", r.cfg.MailiSearch.ApiKey))
 	}
 
 	client := &http.Client{}

app/repos/storageRepo/storageRepo.go

@@ -1,178 +0,0 @@
-package storageRepo
-
-import (
-	"io"
-	"os"
-	"path/filepath"
-	"time"
-
-	"git.ma-al.com/goc_daniel/b2b/app/db"
-	"git.ma-al.com/goc_daniel/b2b/app/model"
-)
-
-type UIStorageRepo interface {
-	SaveWebdavToken(user_id uint, hash_token string, expires_at *time.Time) error
-	EntryInfo(abs_path string) (os.FileInfo, error)
-	ListContent(abs_path string) (*[]model.EntryInList, error)
-	OpenFile(abs_path string) (*os.File, error)
-	Put(abs_path string, src io.Reader) error
-	Delete(abs_path string) error
-	Mkcol(abs_path string) error
-	Move(src_abs_path string, dest_abs_path string) error
-	Copy(src_abs_path string, dest_abs_path string) error
-}
-
-type StorageRepo struct{}
-
-func New() UIStorageRepo {
-	return &StorageRepo{}
-}
-
-func (r *StorageRepo) SaveWebdavToken(user_id uint, hash_token string, expires_at *time.Time) error {
-	return db.DB.
-		Table("b2b_customers").
-		Where("id = ?", user_id).
-		Updates(map[string]interface{}{
-			"webdav_token":   hash_token,
-			"webdav_expires": expires_at,
-		}).
-		Error
-}
-
-func (r *StorageRepo) EntryInfo(abs_path string) (os.FileInfo, error) {
-	return os.Stat(abs_path)
-}
-
-func (r *StorageRepo) ListContent(abs_path string) (*[]model.EntryInList, error) {
-	entries, err := os.ReadDir(abs_path)
-	if err != nil {
-		return nil, err
-	}
-
-	var entries_in_list []model.EntryInList
-
-	for _, entry := range entries {
-		var next_entry_in_list model.EntryInList
-		next_entry_in_list.Name = entry.Name()
-		next_entry_in_list.IsFolder = entry.IsDir()
-
-		entries_in_list = append(entries_in_list, next_entry_in_list)
-	}
-
-	return &entries_in_list, nil
-}
-
-func (r *StorageRepo) OpenFile(abs_path string) (*os.File, error) {
-	return os.Open(abs_path)
-}
-
-func (r *StorageRepo) Put(abs_path string, src io.Reader) error {
-	// Write to a temp file in the same directory, then atomically rename.
-	tmp, err := os.CreateTemp(filepath.Dir(abs_path), ".put-*")
-	if err != nil {
-		return err
-	}
-	tmp_name := tmp.Name()
-	cleanup_tmp := true
-	defer func() {
-		_ = tmp.Close()
-		if cleanup_tmp {
-			_ = os.Remove(tmp_name)
-		}
-	}()
-
-	_, err = io.Copy(tmp, src)
-	if err != nil {
-		return err
-	}
-
-	err = tmp.Sync()
-	if err != nil {
-		return err
-	}
-	err = tmp.Close()
-	if err != nil {
-		return err
-	}
-
-	err = os.Chmod(tmp_name, 0o644)
-	if err != nil {
-		return err
-	}
-
-	err = os.Rename(tmp_name, abs_path)
-	if err != nil {
-		return err
-	}
-
-	cleanup_tmp = false
-	return nil
-}
-
-func (r *StorageRepo) Delete(abs_path string) error {
-	return os.RemoveAll(abs_path)
-}
-
-func (r *StorageRepo) Mkcol(abs_path string) error {
-	return os.Mkdir(abs_path, 0755)
-}
-
-func (r *StorageRepo) Move(src_abs_path string, dest_abs_path string) error {
-	return os.Rename(src_abs_path, dest_abs_path)
-}
-
-func (r *StorageRepo) Copy(src_abs_path string, dest_abs_path string) error {
-	info, err := os.Stat(src_abs_path)
-	if err != nil {
-		return err
-	}
-
-	if info.IsDir() {
-		return r.copyDir(src_abs_path, dest_abs_path)
-	} else {
-		return r.copyFile(src_abs_path, dest_abs_path)
-	}
-}
-
-func (r *StorageRepo) copyFile(src_abs_path string, dest_abs_path string) error {
-	f, err := os.Open(src_abs_path)
-	if err != nil {
-		return err
-	}
-	defer f.Close()
-
-	err = r.Put(dest_abs_path, f)
-	return err
-}
-
-func (r *StorageRepo) copyDir(src_abs_path string, dest_abs_path string) error {
-	if err := os.Mkdir(dest_abs_path, 0755); err != nil {
-		return err
-	}
-
-	entries, err := os.ReadDir(src_abs_path)
-	if err != nil {
-		return err
-	}
-
-	for _, entry := range entries {
-
-		entity_src_path := filepath.Join(src_abs_path, entry.Name())
-		entity_dst_Path := filepath.Join(dest_abs_path, entry.Name())
-
-		if entry.IsDir() {
-			err = r.copyDir(entity_src_path, entity_dst_Path)
-			if err != nil {
-				return err
-			}
-
-		} else {
-			err = r.copyFile(entity_src_path, entity_dst_Path)
-			if err != nil {
-				return err
-			}
-		}
-	}
-
-	return nil
-}

app/service/authService/auth.go

@@ -11,8 +11,6 @@ import (
 	"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/repos/customerRepo"
-	roleRepo "git.ma-al.com/goc_daniel/b2b/app/repos/rolesRepo"
 	"git.ma-al.com/goc_daniel/b2b/app/service/emailService"
 	constdata "git.ma-al.com/goc_daniel/b2b/app/utils/const_data"
 	"git.ma-al.com/goc_daniel/b2b/app/utils/responseErrors"
@@ -25,33 +23,29 @@ import (
 
 // JWTClaims represents the JWT claims
 type JWTClaims struct {
-	UserID    uint   `json:"user_id"`
-	Email     string `json:"email"`
-	Username  string `json:"username"`
-	Role      string `json:"customer_role"`
-	CartsIDs  []uint `json:"carts_ids"`
-	LangID    uint   `json:"lang_id"`
-	CountryID uint   `json:"country_id"`
+	UserID    uint               `json:"user_id"`
+	Email     string             `json:"email"`
+	Username  string             `json:"username"`
+	Role      model.CustomerRole `json:"customer_role"`
+	CartsIDs  []uint             `json:"carts_ids"`
+	LangID    uint               `json:"lang_id"`
+	CountryID uint               `json:"country_id"`
 	jwt.RegisteredClaims
 }
 
 // AuthService handles authentication operations
 type AuthService struct {
-	db           *gorm.DB
-	config       *config.AuthConfig
-	email        *emailService.EmailService
-	customerRepo customerRepo.UICustomerRepo
-	roleRepo     roleRepo.UIRolesRepo
+	db     *gorm.DB
+	config *config.AuthConfig
+	email  *emailService.EmailService
 }
 
 // NewAuthService creates a new AuthService instance
 func NewAuthService() *AuthService {
 	svc := &AuthService{
-		db:           db.Get(),
-		config:       &config.Get().Auth,
-		email:        emailService.NewEmailService(),
-		customerRepo: customerRepo.New(),
-		roleRepo:     roleRepo.New(),
+		db:     db.Get(),
+		config: &config.Get().Auth,
+		email:  emailService.NewEmailService(),
 	}
 	// Auto-migrate the refresh_tokens table
 	if svc.db != nil {
@@ -65,7 +59,7 @@ func (s *AuthService) Login(req *model.LoginRequest) (*model.AuthResponse, strin
 	var user model.Customer
 
 	// Find user by email
-	if err := s.db.Preload("Role.Permissions").Where("email = ?", req.Email).First(&user).Error; err != nil {
+	if err := s.db.Where("email = ?", req.Email).First(&user).Error; err != nil {
 		if errors.Is(err, gorm.ErrRecordNotFound) {
 			return nil, "", responseErrors.ErrInvalidCredentials
 		}
@@ -89,15 +83,6 @@ func (s *AuthService) Login(req *model.LoginRequest) (*model.AuthResponse, strin
 	// Update last login time
 	now := time.Now()
 	user.LastLoginAt = &now
-
-	if req.LangID != nil {
-		_, err := s.GetLangISOCode(*req.LangID)
-		if err != nil {
-			return nil, "", responseErrors.ErrBadLangID
-		}
-		user.LangID = *req.LangID
-	}
-
 	s.db.Save(&user)
 
 	// Generate access token (JWT)
@@ -159,6 +144,7 @@ func (s *AuthService) Register(req *model.RegisterRequest) error {
 		Password:                 string(hashedPassword),
 		FirstName:                req.FirstName,
 		LastName:                 req.LastName,
+		Role:                     model.RoleUser,
 		Provider:                 model.ProviderLocal,
 		IsActive:                 false,
 		EmailVerified:            false,
@@ -436,7 +422,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.First(&user, userID).Error; err != nil {
 		if errors.Is(err, gorm.ErrRecordNotFound) {
 			return nil, responseErrors.ErrUserNotFound
 		}
@@ -457,19 +443,6 @@ func (s *AuthService) GetUserByEmail(email string) (*model.Customer, error) {
 	return &user, nil
 }
 
-func (s *AuthService) GetUserByWebdavToken(rawToken string) (*model.Customer, error) {
-	tokenHash := hashToken(rawToken)
-
-	var user model.Customer
-	if err := s.db.Where("webdav_token = ?", tokenHash).First(&user).Error; err != nil {
-		if errors.Is(err, gorm.ErrRecordNotFound) {
-			return nil, responseErrors.ErrUserNotFound
-		}
-		return nil, fmt.Errorf("database error: %w", err)
-	}
-	return &user, nil
-}
-
 // createRefreshToken generates a random opaque token, stores its hash in the DB, and returns the raw token.
 func (s *AuthService) createRefreshToken(userID uint) (string, error) {
 	// Generate 32 random bytes → 64-char hex string
@@ -516,7 +489,7 @@ func (s *AuthService) generateAccessToken(user *model.Customer) (string, error)
 		UserID:    user.ID,
 		Email:     user.Email,
 		Username:  user.Email,
-		Role:      user.Role.Name,
+		Role:      user.Role,
 		CartsIDs:  []uint{},
 		LangID:    user.LangID,
 		CountryID: user.CountryID,

app/service/authService/google_oauth.go

@@ -108,32 +108,26 @@ func (s *AuthService) HandleGoogleCallback(code string) (*model.AuthResponse, st
 // findOrCreateGoogleUser finds an existing user by Google provider ID or email,
 // or creates a new one.
 func (s *AuthService) findOrCreateGoogleUser(info *view.GoogleUserInfo) (*model.Customer, error) {
-	var user *model.Customer
+	var user model.Customer
 
 	// Try to find by provider + provider_id
-	user, err := s.customerRepo.GetByExternalProviderId(model.ProviderGoogle, info.ID)
+	err := s.db.Where("provider = ? AND provider_id = ?", model.ProviderGoogle, info.ID).First(&user).Error
 	if err == nil {
 		// Update avatar in case it changed
 		user.AvatarURL = info.Picture
-		err = s.customerRepo.Save(user)
-		if err != nil {
-			return nil, err
-		}
-		return user, nil
+		s.db.Save(&user)
+		return &user, nil
 	}
 
 	// Try to find by email (user may have registered locally before)
-	user, err = s.customerRepo.GetByEmail(info.Email)
+	err = s.db.Where("email = ?", info.Email).First(&user).Error
 	if err == nil {
 		// Link Google provider to existing account
 		user.Provider = model.ProviderGoogle
 		user.ProviderID = info.ID
 		user.AvatarURL = info.Picture
 		user.IsActive = true
-		err = s.customerRepo.Save(user)
-		if err != nil {
-			return nil, err
-		}
+		s.db.Save(&user)
 
 		// If email has not been verified yet, send email to admin.
 		if !user.EmailVerified {
@@ -145,7 +139,7 @@ func (s *AuthService) findOrCreateGoogleUser(info *view.GoogleUserInfo) (*model.
 		}
 		user.EmailVerified = true
 
-		return user, nil
+		return &user, nil
 	}
 
 	// Create new user
@@ -154,16 +148,16 @@ func (s *AuthService) findOrCreateGoogleUser(info *view.GoogleUserInfo) (*model.
 		FirstName:     info.GivenName,
 		LastName:      info.FamilyName,
 		Provider:      model.ProviderGoogle,
-		RoleID:        1, // user
 		ProviderID:    info.ID,
 		AvatarURL:     info.Picture,
+		Role:          model.RoleUser,
 		IsActive:      true,
 		EmailVerified: true,
 		LangID:        2, // default is english
 		CountryID:     2, // default is England
 	}
 
-	if err := s.customerRepo.Create(&newUser); err != nil {
+	if err := s.db.Create(&newUser).Error; err != nil {
 		return nil, fmt.Errorf("failed to create user: %w", err)
 	}
 
@@ -176,13 +170,6 @@ func (s *AuthService) findOrCreateGoogleUser(info *view.GoogleUserInfo) (*model.
 		}
 	}
 
-	var role *model.Role
-	role, err = s.roleRepo.Get(newUser.RoleID)
-	if err != nil {
-		return nil, err
-	}
-	newUser.Role = role
-
 	return &newUser, nil
 }
 

app/service/currencyService/currencyService.go

@@ -1,25 +0,0 @@
-package currencyService
-
-import (
-	"git.ma-al.com/goc_daniel/b2b/app/model"
-	"git.ma-al.com/goc_daniel/b2b/app/repos/currencyRepo"
-)
-
-type CurrencyService struct {
-	repo currencyRepo.UICurrencyRepo
-}
-
-func (s *CurrencyService) GetCurrency(id uint) (*model.Currency, error) {
-	return s.repo.Get(id)
-}
-
-func (s *CurrencyService) CreateCurrencyRate(currency *model.CurrencyRate) error {
-	return s.repo.CreateConversionRate(currency)
-}
-
-func New() *CurrencyService {
-	repo := currencyRepo.New()
-	return &CurrencyService{
-		repo: repo,
-	}
-}

app/service/customerService/customerService.go

@@ -1,26 +0,0 @@
-package customerService
-
-import (
-	"git.ma-al.com/goc_daniel/b2b/app/model"
-	"git.ma-al.com/goc_daniel/b2b/app/repos/customerRepo"
-	"git.ma-al.com/goc_daniel/b2b/app/utils/query/filters"
-	"git.ma-al.com/goc_daniel/b2b/app/utils/query/find"
-)
-
-type CustomerService struct {
-	repo customerRepo.UICustomerRepo
-}
-
-func New() *CustomerService {
-	return &CustomerService{
-		repo: customerRepo.New(),
-	}
-}
-
-func (s *CustomerService) GetById(id uint) (*model.Customer, error) {
-	return s.repo.Get(id)
-}
-
-func (s *CustomerService) Find(langId uint, p find.Paging, filt *filters.FiltersList, search string) (*find.Found[model.UserInList], error) {
-	return s.repo.Find(langId, p, filt, search)
-}

app/service/emailService/email.go

@@ -10,7 +10,6 @@ import (
 	"git.ma-al.com/goc_daniel/b2b/app/config"
 	"git.ma-al.com/goc_daniel/b2b/app/service/langsService"
 	"git.ma-al.com/goc_daniel/b2b/app/templ/emails"
-	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/view"
 )
@@ -134,6 +133,6 @@ func (s *EmailService) passwordResetEmailTemplate(name, resetURL string, langID
 // newUserAdminNotificationTemplate returns the HTML template for admin notification
 func (s *EmailService) newUserAdminNotificationTemplate(userEmail, userName, baseURL string) string {
 	buf := bytes.Buffer{}
-	emails.EmailAdminNotificationWrapper(view.EmailLayout[view.EmailAdminNotificationData]{LangID: constdata.ADMIN_NOTIFICATION_LANGUAGE, Data: view.EmailAdminNotificationData{UserEmail: userEmail, UserName: userName, BaseURL: baseURL}}).Render(context.Background(), &buf)
+	emails.EmailAdminNotificationWrapper(view.EmailLayout[view.EmailAdminNotificationData]{LangID: 2, Data: view.EmailAdminNotificationData{UserEmail: userEmail, UserName: userName, BaseURL: baseURL}}).Render(context.Background(), &buf)
 	return buf.String()
 }

app/service/listService/listService.go

@@ -0,0 +1,26 @@
+package listService
+
+import (
+	"git.ma-al.com/goc_daniel/b2b/app/model"
+	"git.ma-al.com/goc_daniel/b2b/app/repos/listRepo"
+	"git.ma-al.com/goc_daniel/b2b/app/utils/query/filters"
+	"git.ma-al.com/goc_daniel/b2b/app/utils/query/find"
+)
+
+type ListService struct {
+	listRepo listRepo.UIListRepo
+}
+
+func New() *ListService {
+	return &ListService{
+		listRepo: listRepo.New(),
+	}
+}
+
+func (s *ListService) ListProducts(id_lang uint, p find.Paging, filters *filters.FiltersList) (find.Found[model.ProductInList], error) {
+	return s.listRepo.ListProducts(id_lang, p, filters)
+}
+
+func (s *ListService) ListUsers(id_lang uint, p find.Paging, filters *filters.FiltersList) (find.Found[model.UserInList], error) {
+	return s.listRepo.ListUsers(id_lang, p, filters)
+}

app/service/meiliService/meiliService.go

@@ -27,8 +27,8 @@ type MeiliService struct {
 func New() *MeiliService {
 
 	client := meilisearch.New(
-		config.Get().MeiliSearch.ServerURL,
-		meilisearch.WithAPIKey(config.Get().MeiliSearch.ApiKey),
+		config.Get().MailiSearch.ServerURL,
+		meilisearch.WithAPIKey(config.Get().MailiSearch.ApiKey),
 	)
 
 	return &MeiliService{

app/service/menuService/menuService.go

@@ -176,8 +176,8 @@ func (s *MenuService) GetBreadcrumb(root_category_id uint, start_category_id uin
 	return breadcrumb, nil
 }
 
-func (s *MenuService) GetTopMenu(languageId uint, roleId uint) ([]*model.B2BTopMenu, error) {
-	items, err := s.routesRepo.GetTopMenu(languageId, roleId)
+func (s *MenuService) GetTopMenu(id uint) ([]*model.B2BTopMenu, error) {
+	items, err := s.routesRepo.GetTopMenu(id)
 	if err != nil {
 		return nil, err
 	}

app/service/productService/productService.go

@@ -1,34 +0,0 @@
-package productService
-
-import (
-	"encoding/json"
-
-	"git.ma-al.com/goc_daniel/b2b/app/model"
-	"git.ma-al.com/goc_daniel/b2b/app/repos/productsRepo"
-	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"
-)
-
-type ProductService struct {
-	productsRepo productsRepo.UIProductsRepo
-}
-
-func New() *ProductService {
-	return &ProductService{
-		productsRepo: productsRepo.New(),
-	}
-}
-
-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)
-	if err != nil {
-		return products, err
-	}
-
-	return products, nil
-}
-
-func (s *ProductService) Find(id_lang uint, p find.Paging, filters *filters.FiltersList) (find.Found[model.ProductInList], error) {
-	return s.productsRepo.Find(id_lang, p, filters)
-}

app/service/productTranslationService/productTranslationService.go

@@ -89,24 +89,13 @@ func (s *ProductTranslationService) GetProductDescription(userID uint, productID
 // Updates relevant fields with the "updates" map
 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", "link_rewrite", "meta_description", "meta_keywords", "meta_title", "name",
-		"available_now", "available_later", "delivery_in_stock", "delivery_out_stock", "usage"}
+	allowedFields := []string{"description", "description_short", "meta_description", "meta_title", "name", "available_now", "available_later", "usage"}
 	for key := range updates {
 		if !slices.Contains(allowedFields, key) {
 			return responseErrors.ErrBadField
 		}
 	}
 
-	if text, exists := updates["link_rewrite"]; exists {
-		// sanitize and check that link_rewrite is a valid url slug
-		sanitized := SanitizeSlug(text)
-		if !IsValidSlug(sanitized) {
-			return responseErrors.ErrInvalidURLSlug
-		}
-
-		updates["link_rewrite"] = sanitized
-	}
-
 	// check that fields description, description_short and usage, if they exist, have a valid html format
 	mustBeHTML := []string{"description", "description_short", "usage"}
 	for i := 0; i < len(mustBeHTML); i++ {
@@ -147,28 +136,20 @@ func (s *ProductTranslationService) TranslateProductDescription(userID uint, pro
 
 	fields := []*string{&productDescription.Description,
 		&productDescription.DescriptionShort,
-		&productDescription.LinkRewrite,
 		&productDescription.MetaDescription,
-		&productDescription.MetaKeywords,
 		&productDescription.MetaTitle,
 		&productDescription.Name,
 		&productDescription.AvailableNow,
 		&productDescription.AvailableLater,
-		&productDescription.DeliveryInStock,
-		&productDescription.DeliveryOutStock,
 		&productDescription.Usage,
 	}
 	keys := []string{"translation_of_product_description",
 		"translation_of_product_short_description",
-		"translation_of_product_url_link",
 		"translation_of_product_meta_description",
-		"translation_of_product_meta_keywords",
 		"translation_of_product_meta_title",
 		"translation_of_product_name",
-		"translation_of_product_available_now_message",
-		"translation_of_product_available_later_message",
-		"translation_of_product_delivery_in_stock_message",
-		"translation_of_product_delivery_out_stock_message",
+		"translation_of_product_available_now",
+		"translation_of_product_available_later",
 		"translation_of_product_usage",
 	}
 

app/service/productTranslationService/sanitizeURLSlug.go

@@ -1,69 +0,0 @@
-package productTranslationService
-
-import (
-	"strings"
-	"unicode"
-
-	constdata "git.ma-al.com/goc_daniel/b2b/app/utils/const_data"
-	"github.com/dlclark/regexp2"
-	"golang.org/x/text/runes"
-	"golang.org/x/text/transform"
-	"golang.org/x/text/unicode/norm"
-)
-
-func IsValidSlug(s string) bool {
-	var slug_regex2 = regexp2.MustCompile(constdata.SLUG_REGEX, regexp2.None)
-
-	ok, _ := slug_regex2.MatchString(s)
-	return ok
-}
-
-func SanitizeSlug(s string) string {
-	s = strings.TrimSpace(strings.ToLower(s))
-
-	// First apply explicit transliteration for language-specific letters.
-	s = transliterateWithTable(s)
-
-	// Then normalize and strip any remaining combining marks.
-	s = removeDiacritics(s)
-
-	// Replace all non-alphanumeric runs with "-"
-	var non_alphanum_regex2 = regexp2.MustCompile(constdata.NON_ALNUM_REGEX, regexp2.None)
-	s, _ = non_alphanum_regex2.Replace(s, "-", -1, -1)
-
-	// Collapse repeated "-" and trim edges
-	var multi_dash_regex2 = regexp2.MustCompile(constdata.MULTI_DASH_REGEX, regexp2.None)
-	s, _ = multi_dash_regex2.Replace(s, "-", -1, -1)
-
-	s = strings.Trim(s, "-")
-
-	return s
-}
-
-func transliterateWithTable(s string) string {
-	var b strings.Builder
-	b.Grow(len(s))
-
-	for _, r := range s {
-		if repl, ok := constdata.TRANSLITERATION_TABLE[r]; ok {
-			b.WriteString(repl)
-		} else {
-			b.WriteRune(r)
-		}
-	}
-
-	return b.String()
-}
-
-func removeDiacritics(s string) string {
-	t := transform.Chain(
-		norm.NFD,
-		runes.Remove(runes.In(unicode.Mn)),
-		norm.NFC,
-	)
-	out, _, err := transform.String(t, s)
-	if err != nil {
-		return s
-	}
-	return out
-}

app/service/storageService/storageService.go

@@ -1,283 +0,0 @@
-package storageService
-
-import (
-	"crypto/rand"
-	"crypto/sha256"
-	"encoding/hex"
-	"encoding/xml"
-	"io"
-	"net/http"
-	"net/url"
-	"os"
-	"path"
-	"path/filepath"
-	"strconv"
-	"strings"
-	"time"
-
-	"git.ma-al.com/goc_daniel/b2b/app/model"
-	"git.ma-al.com/goc_daniel/b2b/app/repos/storageRepo"
-	constdata "git.ma-al.com/goc_daniel/b2b/app/utils/const_data"
-	"git.ma-al.com/goc_daniel/b2b/app/utils/responseErrors"
-)
-
-type StorageService struct {
-	storageRepo storageRepo.UIStorageRepo
-}
-
-func New() *StorageService {
-	return &StorageService{
-		storageRepo: storageRepo.New(),
-	}
-}
-
-func (s *StorageService) EntryInfo(abs_path string) (os.FileInfo, error) {
-	return s.storageRepo.EntryInfo(abs_path)
-}
-
-func (s *StorageService) NewWebdavToken(user_id uint) (string, error) {
-	b := make([]byte, constdata.NBYTES_IN_WEBDAV_TOKEN)
-
-	_, err := rand.Read(b)
-	if err != nil {
-		return "", err
-	}
-
-	raw_token := hex.EncodeToString(b)
-	hash_token_bytes := sha256.Sum256([]byte(raw_token))
-	hash_token := hex.EncodeToString(hash_token_bytes[:])
-	expires_at := time.Now().Add(24 * time.Hour)
-
-	return raw_token, s.storageRepo.SaveWebdavToken(user_id, hash_token, &expires_at)
-}
-
-func (s *StorageService) DownloadFilePrep(abs_path string) (*os.File, string, int64, error) {
-	info, err := s.storageRepo.EntryInfo(abs_path)
-	if err != nil || info.IsDir() {
-		return nil, "", 0, responseErrors.ErrFileDoesNotExist
-	}
-
-	f, err := s.storageRepo.OpenFile(abs_path)
-	if err != nil {
-		return nil, "", 0, err
-	}
-
-	return f, filepath.Base(abs_path), info.Size(), nil
-}
-
-func (s *StorageService) ListContent(abs_path string) (*[]model.EntryInList, error) {
-	info, err := s.storageRepo.EntryInfo(abs_path)
-	if err != nil || !info.IsDir() {
-		return nil, responseErrors.ErrFolderDoesNotExist
-	}
-
-	entries_in_list, err := s.storageRepo.ListContent(abs_path)
-	return entries_in_list, err
-}
-
-func (s *StorageService) Propfind(root string, abs_path string, depth string) (string, error) {
-	href := href(root, abs_path)
-
-	max_depth := 0
-	switch depth {
-	case "0":
-		max_depth = 0
-	case "1":
-		max_depth = 1
-	case "infinity":
-		max_depth = 32
-	default:
-		max_depth = 0
-	}
-
-	info, err := s.storageRepo.EntryInfo(abs_path)
-	if err != nil {
-		return "", err
-	}
-
-	xml := `<?xml version="1.0" encoding="utf-8"?>` +
-		`<D:multistatus xmlns:D="DAV:">`
-
-	if info.IsDir() {
-		href = ensureTrailingSlash(href)
-		next_xml, err := buildDirPropResponse(abs_path, href, info, max_depth)
-		if err != nil {
-			return "", err
-		}
-		xml += next_xml
-	} else {
-		xml += buildFilePropResponse(href, info)
-	}
-
-	xml += `</D:multistatus>`
-
-	return xml, nil
-}
-
-func (s *StorageService) Put(abs_path string, src io.Reader) error {
-	return s.storageRepo.Put(abs_path, src)
-}
-
-func (s *StorageService) Delete(abs_path string) error {
-	return s.storageRepo.Delete(abs_path)
-}
-
-func (s *StorageService) Mkcol(abs_path string) error {
-	_, err := s.storageRepo.EntryInfo(abs_path)
-	if err == nil {
-		return responseErrors.ErrNameTaken
-	} else if os.IsNotExist(err) {
-		return s.storageRepo.Mkcol(abs_path)
-	} else {
-		return err
-	}
-}
-
-func (s *StorageService) Move(src_abs_path string, dest_abs_path string) error {
-	return s.storageRepo.Move(src_abs_path, dest_abs_path)
-}
-
-func (s *StorageService) Copy(src_abs_path string, dest_abs_path string) error {
-	return s.storageRepo.Copy(src_abs_path, dest_abs_path)
-}
-
-func buildFilePropResponse(href string, info os.FileInfo) string {
-	name := info.Name()
-	return "" +
-		"<D:response>" +
-		"<D:href>" + xmlEscape(href) + "</D:href>" +
-		"<D:propstat>" +
-		"<D:prop>" +
-		"<D:displayname>" + xmlEscape(name) + "</D:displayname>" +
-		"<D:getcontentlength>" + strconv.FormatInt(info.Size(), 10) + "</D:getcontentlength>" +
-		"<D:getlastmodified>" + xmlEscape(info.ModTime().UTC().Format(http.TimeFormat)) + "</D:getlastmodified>" +
-		"<D:resourcetype/>" +
-		"</D:prop>" +
-		"<D:status>HTTP/1.1 200 OK</D:status>" +
-		"</D:propstat>" +
-		"</D:response>"
-}
-
-func buildDirPropResponse(abs_path string, href string, info os.FileInfo, max_depth int) (string, error) {
-	name := info.Name()
-
-	xml := "" +
-		"<D:response>" +
-		"<D:href>" + xmlEscape(ensureTrailingSlash(href)) + "</D:href>" +
-		"<D:propstat>" +
-		"<D:prop>" +
-		"<D:displayname>" + xmlEscape(name) + "</D:displayname>" +
-		"<D:resourcetype><D:collection/></D:resourcetype>" +
-		"<D:getlastmodified>" + xmlEscape(info.ModTime().UTC().Format(http.TimeFormat)) + "</D:getlastmodified>" +
-		"</D:prop>" +
-		"<D:status>HTTP/1.1 200 OK</D:status>" +
-		"</D:propstat>" +
-		"</D:response>"
-
-	if max_depth <= 0 {
-		return xml, nil
-	}
-
-	entries, err := os.ReadDir(abs_path)
-	if err != nil {
-		return "", err
-	}
-
-	for _, entry := range entries {
-		child_abs_path := filepath.Join(abs_path, entry.Name())
-		child_href := path.Join(href, entry.Name())
-
-		child_info, err := entry.Info()
-		if err != nil {
-			return "", err
-		}
-
-		var xml_next string
-		if entry.IsDir() {
-			xml_next, err = buildDirPropResponse(child_abs_path, ensureTrailingSlash(child_href), child_info, max_depth-1)
-		} else {
-			xml_next = buildFilePropResponse(child_href, child_info)
-		}
-
-		if err != nil {
-			return "", err
-		}
-		xml += xml_next
-	}
-
-	return xml, nil
-}
-
-func ensureTrailingSlash(s string) string {
-	if s == "/" {
-		return s
-	}
-	if !strings.HasSuffix(s, "/") {
-		return s + "/"
-	}
-	return s
-}
-
-func xmlEscape(s string) string {
-	var b strings.Builder
-	xml.EscapeText(&b, []byte(s))
-	return b.String()
-}
-
-// Returns href based on file's absolute path. Doesn't validate abs_path
-func href(root string, abs_path string) string {
-	rel, _ := filepath.Rel(root, abs_path)
-
-	if rel == "." {
-		return constdata.WEBDAV_HREF_ROOT + "/"
-	}
-
-	rel = filepath.ToSlash(rel)
-
-	parts := strings.Split(rel, "/")
-	for i, p := range parts {
-		parts[i] = url.PathEscape(p)
-	}
-
-	return strings.TrimRight(constdata.WEBDAV_HREF_ROOT, "/") + "/" + strings.Join(parts, "/")
-}
-
-// AbsPath extracts an absolute path and validates it
-func (s *StorageService) AbsPath(root string, relative_path string) (string, error) {
-	decoded, err := url.PathUnescape(relative_path)
-	if err != nil {
-		return "", err
-	}
-
-	clean_name := filepath.Clean(decoded)
-	full_path := filepath.Join(root, clean_name)
-
-	if full_path != root && !strings.HasPrefix(full_path, root+"/") {
-		return "", responseErrors.ErrAccessDenied
-	}
-
-	return full_path, nil
-}
-
-// ObtainDestPath extracts the absolute path based on URL absolute path
-func (s *StorageService) ObtainDestPath(root string, dest_path string) (string, error) {
-	idx := strings.Index(dest_path, constdata.WEBDAV_TRIMMED_ROOT)
-	if idx == -1 {
-		return "", responseErrors.ErrAccessDenied
-	}
-	prefix_removed := dest_path[idx+len(constdata.WEBDAV_TRIMMED_ROOT):]
-
-	decoded, err := url.PathUnescape(prefix_removed)
-	if err != nil {
-		return "", err
-	}
-
-	clean_dest_path := filepath.Clean(decoded)
-	if clean_dest_path == "" {
-		return root, nil
-	} else if strings.HasPrefix(clean_dest_path, "/") {
-		return root + "/" + strings.TrimPrefix(clean_dest_path, "/"), nil
-	} else {
-		return "", responseErrors.ErrAccessDenied
-	}
-}

app/utils/const_data/consts.go

@@ -4,7 +4,6 @@ package constdata
 const PASSWORD_VALIDATION_REGEX = `^(?=.*[a-z])(?=.*[A-Z])(?=.*\d).{10,}$`
 const SHOP_ID = 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
@@ -12,34 +11,5 @@ const CATEGORY_TREE_ROOT_ID = 2
 const MAX_AMOUNT_OF_CARTS_PER_USER = 10
 const DEFAULT_NEW_CART_NAME = "new cart"
 
-const USER_LOCALE = "user"
-
-// WEBDAV
-const NBYTES_IN_WEBDAV_TOKEN = 32
-const WEBDAV_HREF_ROOT = "http://localhost:3000/api/v1/webdav/storage"
-const WEBDAV_TRIMMED_ROOT = "localhost:3000/api/v1/webdav/storage"
-
-// Slug sanitization
-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",
-}
+const USER_LOCALES_NAME = "user"
+const USER_LOCALES_ID = "userID"

app/utils/i18n/i18n.go

@@ -8,7 +8,6 @@ import (
 	"sync"
 
 	"git.ma-al.com/goc_daniel/b2b/app/model"
-	"git.ma-al.com/goc_daniel/b2b/app/utils/localeExtractor"
 	"github.com/gofiber/fiber/v3"
 )
 
@@ -178,7 +177,7 @@ func (s *TranslationsStore) ReloadTranslations(translations []model.Translation)
 
 // T_ is meant to be used to translate error messages and other system communicates.
 func T_[T ~string](c fiber.Ctx, key T, params ...interface{}) string {
-	if langID, ok := localeExtractor.GetLangID(c); ok {
+	if langID, ok := c.Locals("langID").(uint); ok {
 		parts := strings.Split(string(key), ".")
 
 		if len(parts) >= 2 {

app/utils/localeExtractor/localeExtractor.go

@@ -1,39 +0,0 @@
-package localeExtractor
-
-import (
-	"git.ma-al.com/goc_daniel/b2b/app/model"
-	constdata "git.ma-al.com/goc_daniel/b2b/app/utils/const_data"
-	"github.com/gofiber/fiber/v3"
-)
-
-func GetLangID(c fiber.Ctx) (uint, bool) {
-	user_locale, ok := c.Locals(constdata.USER_LOCALE).(*model.UserLocale)
-	if !ok || user_locale.OriginalUser == nil {
-		return 0, false
-	}
-	return user_locale.OriginalUser.LangID, true
-}
-
-func GetUserID(c fiber.Ctx) (uint, bool) {
-	user_locale, ok := c.Locals(constdata.USER_LOCALE).(*model.UserLocale)
-	if !ok || user_locale.User == nil {
-		return 0, false
-	}
-	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 {
-		return nil, false
-	}
-	return user_locale.User, true
-}

app/utils/query/find/find.go

@@ -1,6 +1,7 @@
 package find
 
 import (
+	"errors"
 	"reflect"
 	"strings"
 
@@ -27,13 +28,18 @@ type Found[T any] struct {
 	Spec  map[string]interface{} `json:"spec,omitempty"`
 }
 
+// Wraps given query adding limit, offset clauses and SQL_CALC_FOUND_ROWS to it
+// and running SELECT FOUND_ROWS() afterwards to fetch the total number
+// (ignoring LIMIT) of results. The final results are wrapped into the
+// [find.Found] type.
 func Paginate[T any](langID uint, paging Paging, stmt *gorm.DB) (Found[T], error) {
 	var items []T
-	var count int64
+	var count uint64
 
-	stmt.Count(&count)
+	// stmt.Debug()
 
 	err := stmt.
+		Clauses(SqlCalcFound()).
 		Offset(paging.Offset()).
 		Limit(paging.Limit()).
 		Find(&items).
@@ -42,14 +48,22 @@ func Paginate[T any](langID uint, paging Paging, stmt *gorm.DB) (Found[T], error
 		return Found[T]{}, err
 	}
 
-	// columnsSpec := GetColumnsSpec[T](langID)
+	countInterface, ok := stmt.Get(FOUND_ROWS_CTX_KEY)
+	if !ok {
+		return Found[T]{}, errors.New(FOUND_ROWS_CTX_KEY + " value was not found in the gorm db context")
+	}
+	if count, ok = countInterface.(uint64); !ok {
+		return Found[T]{}, errors.New("failed to cast value under " + FOUND_ROWS_CTX_KEY + " to uint64")
+	}
+
+	columnsSpec := GetColumnsSpec[T](langID)
 
 	return Found[T]{
 		Items: items,
 		Count: uint(count),
-		// Spec: map[string]interface{}{
-		// 	"columns": columnsSpec,
-		// },
+		Spec: map[string]interface{}{
+			"columns": columnsSpec,
+		},
 	}, err
 }
 

app/utils/responseErrors/responseErrors.go

@@ -9,15 +9,13 @@ import (
 
 var (
 	// Typed errors for request validation and authentication
-	ErrForbidden           = errors.New("forbidden")
-	ErrInvalidBody         = errors.New("invalid request body")
-	ErrNotAuthenticated    = errors.New("not authenticated")
-	ErrUserNotFound        = errors.New("user not found")
-	ErrUserInactive        = errors.New("user account is inactive")
-	ErrInvalidToken        = errors.New("invalid token")
-	ErrTokenExpired        = errors.New("token has expired")
-	ErrTokenRequired       = errors.New("token is required")
-	ErrAdminAccessRequired = errors.New("admin access required")
+	ErrInvalidBody      = errors.New("invalid request body")
+	ErrNotAuthenticated = errors.New("not authenticated")
+	ErrUserNotFound     = errors.New("user not found")
+	ErrUserInactive     = errors.New("user account is inactive")
+	ErrInvalidToken     = errors.New("invalid token")
+	ErrTokenExpired     = errors.New("token has expired")
+	ErrTokenRequired    = errors.New("token is required")
 
 	// Typed errors for logging in and registering
 	ErrInvalidCredentials    = errors.New("invalid email or password")
@@ -44,7 +42,6 @@ var (
 	// Typed errors for product description handler
 	ErrBadAttribute   = errors.New("bad or missing attribute value in header")
 	ErrBadField       = errors.New("this field can not be updated")
-	ErrInvalidURLSlug = errors.New("URL slug does not obey the industry standard")
 	ErrInvalidXHTML   = errors.New("text is not in xhtml format")
 	ErrAIResponseFail = errors.New("AI responded with failure")
 	ErrAIBadOutput    = errors.New("AI response does not obey the format")
@@ -62,16 +59,6 @@ var (
 	ErrMaxAmtOfCartsReached              = errors.New("maximal amount of carts reached")
 	ErrUserHasNoSuchCart                 = errors.New("user does not have cart with given id")
 	ErrProductOrItsVariationDoesNotExist = errors.New("product or its variation with given ids does not exist")
-
-	// Typed errors for storage
-	ErrAccessDenied             = errors.New("access denied!")
-	ErrFolderDoesNotExist       = errors.New("folder does not exist")
-	ErrFileDoesNotExist         = errors.New("file does not exist")
-	ErrNameTaken                = errors.New("name taken")
-	ErrMissingFileFieldDocument = errors.New("missing file field 'document'")
-
-	// Typed errors for data parsing
-	ErrJSONBody = errors.New("invalid JSON body")
 )
 
 // Error represents an error with HTTP status code
@@ -96,8 +83,6 @@ func NewError(err error, status int) *Error {
 // GetErrorCode returns the error code string for HTTP response mapping
 func GetErrorCode(c fiber.Ctx, err error) string {
 	switch {
-	case errors.Is(err, ErrForbidden):
-		return i18n.T_(c, "error.err_forbidden")
 	case errors.Is(err, ErrInvalidBody):
 		return i18n.T_(c, "error.err_invalid_body")
 	case errors.Is(err, ErrInvalidCredentials):
@@ -126,8 +111,6 @@ func GetErrorCode(c fiber.Ctx, err error) string {
 		return i18n.T_(c, "error.err_token_required")
 	case errors.Is(err, ErrRefreshTokenRequired):
 		return i18n.T_(c, "error.err_refresh_token_required")
-	case errors.Is(err, ErrAdminAccessRequired):
-		return i18n.T_(c, "error.err_admin_access_required")
 	case errors.Is(err, ErrBadLangID):
 		return i18n.T_(c, "error.err_bad_lang_id")
 	case errors.Is(err, ErrBadCountryID):
@@ -153,8 +136,6 @@ func GetErrorCode(c fiber.Ctx, err error) string {
 		return i18n.T_(c, "error.err_bad_attribute")
 	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")
 	case errors.Is(err, ErrInvalidXHTML):
 		return i18n.T_(c, "error.err_invalid_html")
 	case errors.Is(err, ErrAIResponseFail):
@@ -181,20 +162,6 @@ func GetErrorCode(c fiber.Ctx, err error) string {
 	case errors.Is(err, ErrProductOrItsVariationDoesNotExist):
 		return i18n.T_(c, "error.product_or_its_variation_does_not_exist")
 
-	case errors.Is(err, ErrAccessDenied):
-		return i18n.T_(c, "error.access_denied")
-	case errors.Is(err, ErrFolderDoesNotExist):
-		return i18n.T_(c, "error.folder_does_not_exist")
-	case errors.Is(err, ErrFileDoesNotExist):
-		return i18n.T_(c, "error.file_does_not_exist")
-	case errors.Is(err, ErrNameTaken):
-		return i18n.T_(c, "error.name_taken")
-	case errors.Is(err, ErrMissingFileFieldDocument):
-		return i18n.T_(c, "error.missing_file_field_document")
-
-	case errors.Is(err, ErrJSONBody):
-		return i18n.T_(c, "error.err_json_body")
-
 	default:
 		return i18n.T_(c, "error.err_internal_server_error")
 	}
@@ -203,8 +170,6 @@ func GetErrorCode(c fiber.Ctx, err error) string {
 // GetErrorStatus returns the HTTP status code for the given error
 func GetErrorStatus(err error) int {
 	switch {
-	case errors.Is(err, ErrForbidden):
-		return fiber.StatusForbidden
 	case errors.Is(err, ErrInvalidCredentials),
 		errors.Is(err, ErrNotAuthenticated),
 		errors.Is(err, ErrInvalidToken),
@@ -219,7 +184,6 @@ func GetErrorStatus(err error) int {
 		errors.Is(err, ErrEmailPasswordRequired),
 		errors.Is(err, ErrTokenRequired),
 		errors.Is(err, ErrRefreshTokenRequired),
-		errors.Is(err, ErrAdminAccessRequired),
 		errors.Is(err, ErrBadLangID),
 		errors.Is(err, ErrBadCountryID),
 		errors.Is(err, ErrPasswordsDoNotMatch),
@@ -231,7 +195,6 @@ func GetErrorStatus(err error) int {
 		errors.Is(err, ErrInvalidPassword),
 		errors.Is(err, ErrBadAttribute),
 		errors.Is(err, ErrBadField),
-		errors.Is(err, ErrInvalidURLSlug),
 		errors.Is(err, ErrInvalidXHTML),
 		errors.Is(err, ErrBadPaging),
 		errors.Is(err, ErrNoRootFound),
@@ -240,13 +203,7 @@ func GetErrorStatus(err error) int {
 		errors.Is(err, ErrRootNeverReached),
 		errors.Is(err, ErrMaxAmtOfCartsReached),
 		errors.Is(err, ErrUserHasNoSuchCart),
-		errors.Is(err, ErrProductOrItsVariationDoesNotExist),
-		errors.Is(err, ErrAccessDenied),
-		errors.Is(err, ErrFolderDoesNotExist),
-		errors.Is(err, ErrFileDoesNotExist),
-		errors.Is(err, ErrNameTaken),
-		errors.Is(err, ErrMissingFileFieldDocument),
-		errors.Is(err, ErrJSONBody):
+		errors.Is(err, ErrProductOrItsVariationDoesNotExist):
 		return fiber.StatusBadRequest
 	case errors.Is(err, ErrEmailExists):
 		return fiber.StatusConflict

bo/components.d.ts

@@ -12,13 +12,14 @@ export {}
 declare module 'vue' {
   export interface GlobalComponents {
     CartDetails: typeof import('./src/components/customer/CartDetails.vue')['default']
-    CategoryMenu: typeof import('./src/components/inner/categoryMenu.vue')['default']
+    CategoryMenu: typeof import('./src/components/inner/CategoryMenu.vue')['default']
     CategoryMenuListing: typeof import('./src/components/inner/categoryMenuListing.vue')['default']
+    CountryCurrencySwitch: typeof import('./src/components/inner/CountryCurrencySwitch.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']
     En_TermsAndConditionsView: typeof import('./src/components/terms/en_TermsAndConditionsView.vue')['default']
-    LangSwitch: typeof import('./src/components/inner/langSwitch.vue')['default']
+    LangSwitch: typeof import('./src/components/inner/LangSwitch.vue')['default']
     PageAddresses: typeof import('./src/components/customer/PageAddresses.vue')['default']
     PageCarts: typeof import('./src/components/customer/PageCarts.vue')['default']
     PageOrders: typeof import('./src/components/customer/PageOrders.vue')['default']
@@ -34,7 +35,7 @@ declare module 'vue' {
     ProductVariants: typeof import('./src/components/customer/components/ProductVariants.vue')['default']
     RouterLink: typeof import('vue-router')['RouterLink']
     RouterView: typeof import('vue-router')['RouterView']
-    ThemeSwitch: typeof import('./src/components/inner/themeSwitch.vue')['default']
+    ThemeSwitch: typeof import('./src/components/inner/ThemeSwitch.vue')['default']
     TopBar: typeof import('./src/components/TopBar.vue')['default']
     TopBarLogin: typeof import('./src/components/TopBarLogin.vue')['default']
     UAlert: typeof import('./node_modules/@nuxt/ui/dist/runtime/components/Alert.vue')['default']

bo/src/components/TopBar.vue

@@ -1,13 +1,49 @@
+<template>
+  <header
+    class="fixed top-0 left-0 right-0 z-50 bg-white/80 dark:bg-(--black) backdrop-blur-md border-b border-(--border-light) dark:border-(--border-dark)">
+    <!-- px-4 sm:px-6 lg:px-8 -->
+    <div class="container mx-auto px-4">
+      <div class="flex items-center justify-between h-14">
+        <!-- Logo -->
+        <RouterLink :to="{ name: 'home' }" class="flex items-center gap-2">
+          <div class="w-8 h-8 rounded-lg bg-primary text-white flex items-center justify-center">
+            <UIcon name="i-heroicons-clock" class="w-5 h-5" />
+          </div>
+          <span class="font-semibold text-gray-900 dark:text-white">TimeTracker</span>
+        </RouterLink>
+
+        <UNavigationMenu :type="'trigger'" :ui="{
+          root: 'justify-center',
+          list: 'gap-4'
+        }" :items="menuItems" class="w-full"></UNavigationMenu>
+        <div class="flex items-center gap-2">
+          <CountryCurrencySwitch />
+          <!-- Language Switcher -->
+          <LangSwitch />
+          <!-- Theme Switcher -->
+          <ThemeSwitch />
+          <!-- Logout Button (only when authenticated) -->
+          <button v-if="authStore.isAuthenticated" @click="authStore.logout()"
+            class="px-3 py-1.5 text-sm font-medium text-black dark:text-white hover:text-black dark:hover:text-white hover:bg-gray-100 dark:hover:bg-gray-600 rounded-lg transition-colors border border-(--border-light) dark:border-(--border-dark)">
+            {{ $t('general.logout') }}
+          </button>
+        </div>
+      </div>
+    </div>
+  </header>
+</template>
+
 <script setup lang="ts">
 import { useFetchJson } from '@/composable/useFetchJson'
-import LangSwitch from './inner/langSwitch.vue'
-import ThemeSwitch from './inner/themeSwitch.vue'
+import LangSwitch from './inner/LangSwitch.vue'
+import ThemeSwitch from './inner/ThemeSwitch.vue'
 import { useAuthStore } from '@/stores/auth'
-import { computed, onMounted, ref } from 'vue'
+import { computed, ref } from 'vue'
 import { currentLang } from '@/router/langs'
 import type { LabelTrans, TopMenuItem } from '@/types'
 import type { NavigationMenuItem } from '@nuxt/ui'
 import { useRoute, useRouter } from 'vue-router'
+import CountryCurrencySwitch from './inner/CountryCurrencySwitch.vue'
 
 const authStore = useAuthStore()
 let menu = ref()
@@ -51,37 +87,3 @@ function transformMenu(items: TopMenuItem[], locale: string | undefined): Naviga
 }
 await getTopMenu()
 </script>
-
-<template>
-  <header
-    class="fixed top-0 left-0 right-0 z-50 bg-white/80 dark:bg-(--black) backdrop-blur-md border-b border-(--border-light) dark:border-(--border-dark)">
-    <!-- px-4 sm:px-6 lg:px-8 -->
-    <div class="container mx-auto px-4">
-      <div class="flex items-center justify-between h-14">
-        <!-- Logo -->
-        <RouterLink :to="{ name: 'home' }" class="flex items-center gap-2">
-          <div class="w-8 h-8 rounded-lg bg-primary text-white flex items-center justify-center">
-            <UIcon name="i-heroicons-clock" class="w-5 h-5" />
-          </div>
-          <span class="font-semibold text-gray-900 dark:text-white">TimeTracker</span>
-        </RouterLink>
-
-        <UNavigationMenu :type="'trigger'" :ui="{
-          root: 'justify-center',
-          list: 'gap-4'
-        }" :items="menuItems" class="w-full"></UNavigationMenu>
-        <div class="flex items-center gap-2">
-          <!-- Language Switcher -->
-          <LangSwitch />
-          <!-- Theme Switcher -->
-          <ThemeSwitch />
-          <!-- Logout Button (only when authenticated) -->
-          <button v-if="authStore.isAuthenticated" @click="authStore.logout()"
-            class="px-3 py-1.5 text-sm font-medium text-black dark:text-white hover:text-black dark:hover:text-white hover:bg-gray-100 dark:hover:bg-gray-600 rounded-lg transition-colors border border-(--border-light) dark:border-(--border-dark)">
-            {{ $t('general.logout') }}
-          </button>
-        </div>
-      </div>
-    </div>
-  </header>
-</template>

bo/src/components/TopBarLogin.vue

@@ -1,6 +1,6 @@
 <script setup lang="ts">
-import LangSwitch from './inner/langSwitch.vue'
-import ThemeSwitch from './inner/themeSwitch.vue'
+import LangSwitch from './inner/LangSwitch.vue'
+import ThemeSwitch from './inner/ThemeSwitch.vue'
 import { useAuthStore } from '@/stores/auth'
 
 const authStore = useAuthStore()

bo/src/components/admin/PageProducts.vue

@@ -7,7 +7,7 @@
                     <UTable :data="productsList" :columns="columns" class="flex-1 w-full" />
                     <UPagination v-model:page="page" :total="total" :items-per-page="perPage" />
                 </div>
-            </div>
+            </div> -->
         </component>
     </suspense>
 </template>
@@ -18,7 +18,7 @@ import { useFetchJson } from '@/composable/useFetchJson'
 import Default from '@/layouts/default.vue'
 import { useRoute, useRouter } from 'vue-router'
 import type { TableColumn } from '@nuxt/ui'
-import CategoryMenu from '../inner/categoryMenu.vue'
+import CategoryMenu from '../inner/CategoryMenu.vue'
 import type { Product } from '@/types/product'
 
 const router = useRouter()

bo/src/components/admin/ProductDetailView.vue

@@ -1,33 +1,61 @@
 <template>
   <component :is="Default || 'div'">
-    <div class="container my-10 mx-auto ">
+    <div class="container my-10 mx-auto">
 
-      <div
-        class="flex items-end justify-between gap-4 mb-6 bg-(--second-light) dark:bg-(--main-dark) border border-(--border-light) dark:border-(--border-dark) p-4 rounded-md">
-        <div class="flex items-end gap-3">
-          <USelect v-model="selectedLanguage" :items="availableLangs" variant="outline" class="w-40!"
-            valueKey="iso_code">
-            <template #default="{ modelValue }">
-              <div class="flex items-center gap-2">
-                <span class="text-md">{{availableLangs.find(x => x.iso_code == modelValue)?.flag}}</span>
-                <span class="font-medium dark:text-white text-black">{{availableLangs.find(x => x.iso_code ==
-                  modelValue)?.name}}</span>
-              </div>
-            </template>
-            <template #item-leading="{ item }">
-              <div class="flex items-center rounded-md cursor-pointer transition-colors">
-                <span class="text-md">{{ item.flag }}</span>
-                <span class="ml-2 dark:text-white text-black font-medium">{{ item.name }}</span>
-              </div>
-            </template>
-          </USelect>
+      <div class="flex items-end justify-between gap-4 mb-6 bg-(--second-light) dark:bg-(--main-dark) border border-(--border-light) dark:border-(--border-dark) p-4 rounded-md">
+        
+        <div class="flex items-center gap-3">
+
+          <template v-if="!isViewingExistingTranslation">
+            <USelectMenu
+              v-model="selectedLangId"
+              :items="langOptions"
+              value-key="id"
+              class="w-40"
+              :search-input="false"
+            >
+              <template #default="{ modelValue }">
+                <span class="dark:text-white text-black">
+                  {{ langOptions.find(l => l.id === modelValue)?.name }}
+                </span>
+              </template>
+
+              <template #item-leading="{ item }">
+                <span class="dark:text-white text-black font-medium">
+                  {{ item.name }}
+                </span>
+              </template>
+            </USelectMenu>
+
+            <UButton
+              @click="translateOrSave"
+              :disabled="selectedLangId === defaultLangId"
+              :loading="translating"
+              class="text-white bg-(--accent-blue-light) dark:bg-(--accent-blue-dark) px-12!"
+            >
+              Translate
+            </UButton>
+          </template>
+
+
+          <template v-else>
+            <UButton
+              @click="goBackToDefault"
+              color="neutral"
+              variant="outline"
+              class="cursor-pointer"
+            >
+              <UIcon name="i-lucide-arrow-left" class="mr-1" />
+              <p class="dark:text-white">Back to Polish</p>
+            </UButton>
+          </template>
         </div>
-        <UButton @click="translateToSelectedLanguage" color="primary" :loading="translating"
-          class="text-white bg-(--accent-blue-light) dark:bg-(--accent-blue-dark) px-12!">
-          Translate
-        </UButton>
       </div>
 
+      <p v-if="noTranslation" class="text-red-500 mt-2">
+        No translation available
+      </p>
+
       <div v-if="translating" class="fixed inset-0 z-50 flex items-center justify-center bg-black/50">
         <div class="flex flex-col items-center gap-4 p-8 bg-(--main-light) dark:bg-(--main-dark) rounded-lg shadow-xl">
           <UIcon name="svg-spinners:ring-resize" class="text-4xl text-primary" />
@@ -38,18 +66,23 @@
       <div v-if="productStore.loading" class="flex items-center justify-center py-20">
         <UIcon name="svg-spinners:ring-resize" class="text-4xl text-primary" />
       </div>
+
       <div v-else-if="productStore.error" class="flex items-center justify-center py-20">
         <p class="text-red-500">{{ productStore.error }}</p>
       </div>
+
       <div v-else-if="productStore.productDescription" class="flex items-start gap-30">
         <div class="w-80 h-80 bg-(--second-light) dark:bg-gray-700 rounded-lg flex items-center justify-center">
           <span class="text-gray-500 dark:text-gray-400">Product Image</span>
         </div>
+
         <div class="flex flex-col gap-2">
           <p class="text-[25px] font-bold text-black dark:text-white">
-            {{ productStore.productDescription.name || 'Product Name' }}
+            {{ productName || 'Product Name' }}
           </p>
-          <p v-html="productStore.productDescription.description_short" class="text-black dark:text-white"></p>
+
+          <p v-html="displayedShortDescription" class="text-black dark:text-white"></p>
+
           <div class="space-y-[10px]">
             <div class="flex items-center gap-1">
               <UIcon name="lets-icons:done-ring-round-fill" class="text-[20px] text-green-600" />
@@ -57,6 +90,7 @@
                 {{ productStore.productDescription.available_now }}
               </p>
             </div>
+
             <div class="flex items-center gap-1">
               <UIcon name="marketeq:car-shipping" class="text-[25px] text-green-600" />
               <p class="text-[18px] font-bold text-black dark:text-white">
@@ -67,63 +101,43 @@
         </div>
       </div>
 
+      <!-- TABS -->
       <div v-if="productStore.productDescription" class="mt-16">
         <div class="flex gap-4 my-6">
-          <UButton @click="activeTab = 'description'"
-            :class="['cursor-pointer', activeTab === 'description' ? 'bg-blue-500 text-white' : '']" color="neutral"
-            variant="outline">
-            <p class="dark:text-white">Description</p>
+          <UButton @click="activeTab = 'description'" :class="btnClass('description')" variant="outline">
+            Description
           </UButton>
 
-          <UButton @click="activeTab = 'usage'"
-            :class="['cursor-pointer', activeTab === 'usage' ? 'bg-blue-500 text-white' : '']" color="neutral"
-            variant="outline">
-            <p class="dark:text-white">Usage</p>
+          <UButton @click="activeTab = 'usage'" :class="btnClass('usage')" variant="outline">
+            Usage
           </UButton>
         </div>
 
-        <div v-if="activeTab === 'usage'"
-          class="px-8 py-4 border border-(--border-light) dark:border-(--border-dark) rounded-md bg-(--second-light) dark:bg-(--main-dark)">
-
-          <div class="flex justify-end items-center gap-3 mb-4">
-            <UButton v-if="!isEditing" @click="enableEdit"
-              class="flex items-center gap-2 m-2 cursor-pointer bg-(--accent-blue-light)! dark:bg-(--accent-blue-dark)!">
-              <p class="text-white">Change Text</p>
-              <UIcon name="material-symbols-light:stylus-note-sharp" class="text-[30px] text-white!" />
-            </UButton>
-            <UButton v-if="isEditing" @click="saveText" color="neutral" variant="outline" class="p-2.5 cursor-pointer">
-              <p class="dark:text-white text-black">Save the edited text</p>
-            </UButton>
-            <UButton v-if="isEditing" @click="cancelEdit" color="neutral" variant="outline"
-              class="p-2.5 cursor-pointer">
-              Cancel
+        <!-- USAGE -->
+        <div v-if="activeTab === 'usage'" class="box">
+          <div class="flex justify-end mb-4 gap-2">
+            <UButton v-if="!isEditing" @click="enableUsageEdit" class="bg-(--accent-blue-light)! dark:bg-(--accent-blue-dark)! text-white px-3 py-1 rounded">
+              Edit Usage
             </UButton>
+            <UButton v-if="isEditing" @click="saveUsage" class="px-3 py-1 border rounded">Save</UButton>
+            <UButton v-if="isEditing" @click="cancelUsageEdit" class="px-3 py-1 border rounded">Cancel</UButton>
           </div>
-          <p ref="usageRef" v-html="productStore.productDescription.usage"
-            class="flex flex-col justify-center w-full text-start dark:text-white! text-black!"></p>
-
+          <p ref="usageRef" v-html="displayedUsage || 'Usage information not available'" class="text-black dark:text-white"></p>
         </div>
 
-        <div v-if="activeTab === 'description'"
-          class="px-8 py-4 border border-(--border-light) dark:border-(--border-dark) rounded-md bg-(--second-light) dark:bg-(--main-dark)">
-          <div class="flex items-center justify-end gap-3 mb-4">
-            <UButton v-if="!descriptionEdit.isEditing.value" @click="enableDescriptionEdit"
-              class="flex items-center gap-2 m-2 cursor-pointer bg-(--accent-blue-light)! dark:bg-(--accent-blue-dark)!">
-              <p class="text-white">Change Text</p>
-              <UIcon name="material-symbols-light:stylus-note-sharp" class="text-[30px] text-white!" />
+        <!-- DESCRIPTION -->
+        <div v-if="activeTab === 'description'" class="box">
+          <div class="flex justify-end mb-4 gap-2">
+            <UButton v-if="!descriptionEdit.isEditing.value" @click="enableDescriptionEdit" class="bg-(--accent-blue-light)! dark:bg-(--accent-blue-dark)! text-white px-3 py-1 rounded">
+              Edit Description
             </UButton>
-            <UButton v-if="descriptionEdit.isEditing.value" @click="saveDescription" color="neutral" variant="outline"
-              class="p-2.5 cursor-pointer">
-              <p class="dark:text-white text-black ">Save the edited text</p>
-            </UButton>
-            <UButton v-if="descriptionEdit.isEditing.value" @click="cancelDescriptionEdit" color="neutral"
-              variant="outline" class="p-2.5 cursor-pointer">Cancel</UButton>
-          </div>
-          <div ref="descriptionRef" v-html="productStore.productDescription.description"
-            class="flex flex-col justify-center dark:text-white text-black">
+            <UButton v-if="descriptionEdit.isEditing.value" @click="saveDescription" class="px-3 py-1 border rounded">Save</UButton>
+            <UButton v-if="descriptionEdit.isEditing.value" @click="cancelDescriptionEdit" class="px-3 py-1 border rounded">Cancel</UButton>
           </div>
+          <div ref="descriptionRef" v-html="displayedDescription || 'Description not available'" class="text-black dark:text-white"></div>
         </div>
       </div>
+
     </div>
   </component>
 </template>
@@ -132,118 +146,175 @@
 import { ref, computed, onMounted, watch } from 'vue'
 import { useRoute } from 'vue-router'
 import { useProductStore } from '@/stores/product'
-import { useEditable } from '@/composable/useConteditable'
+import { useSettingsStore } from '@/stores/settings'
 import { langs } from '@/router/langs'
-import type { Language } from '@/types'
+import { useEditable } from '@/composable/useConteditable'
 import Default from '@/layouts/default.vue'
 
 const route = useRoute()
-const activeTab = ref('description')
 const productStore = useProductStore()
+const settingsStore = useSettingsStore()
+
+const activeTab = ref('description')
 const translating = ref(false)
+const noTranslation = ref(false)
 
-const isEditing = ref(false)
-
-const availableLangs = computed(() => langs)
-
-const selectedLanguage = ref('en')
-
-const currentLangId = ref(2)
-const productID = ref<number>(0)
-
-// Watch for language changes and refetch product description
-watch(selectedLanguage, async (newLang: string) => {
-  if (productID.value) {
-    await fetchForLanguage(newLang)
-  }
-})
-
-const fetchForLanguage = async (langCode: string) => {
-  const lang = langs.find((l: Language) => l.iso_code === langCode)
-  if (lang && productID.value) {
-    await productStore.getProductDescription(lang.id, productID.value)
-    currentLangId.value = lang.id
-  }
-}
-
-const translateToSelectedLanguage = async () => {
-  const targetLang = langs.find((l: Language) => l.iso_code === selectedLanguage.value)
-  if (targetLang && currentLangId.value && productID.value) {
-    translating.value = true
-    try {
-      await productStore.translateProductDescription(productID.value, currentLangId.value, targetLang.id)
-      currentLangId.value = targetLang.id
-    } finally {
-      translating.value = false
-    }
-  }
-}
-
-onMounted(async () => {
-  const id = route.params.product_id
-  if (id) {
-    productID.value = Number(id)
-    await fetchForLanguage(selectedLanguage.value)
-  }
-})
+const defaultLangId = ref(0)
+const selectedLangId = ref(0)
+const activeLangId = ref(0)
+const productID = ref(0)
 
 const descriptionRef = ref<HTMLElement | null>(null)
 const usageRef = ref<HTMLElement | null>(null)
 
 const descriptionEdit = useEditable(descriptionRef)
 const usageEdit = useEditable(usageRef)
+const isEditing = ref(false)
 
-const originalDescription = ref('')
 const originalUsage = ref('')
+const originalDescription = ref('')
 
-const saveDescription = async () => {
-  descriptionEdit.disableEdit()
-  await productStore.saveProductDescription(productID.value)
-}
+const langOptions = computed(() => langs.filter(l => l.active !== false))
 
-const cancelDescriptionEdit = () => {
-  if (descriptionRef.value) {
-    descriptionRef.value.innerHTML = originalDescription.value
+watch(selectedLangId, async (newLang) => {
+  if (!productID.value) return
+
+  if (newLang === defaultLangId.value) {
+    noTranslation.value = false
+    activeLangId.value = defaultLangId.value
+    await productStore.getProductDescription(defaultLangId.value, productID.value)
+    await productStore.getDefaultProductDescription(defaultLangId.value, productID.value)
+    return
   }
-  descriptionEdit.disableEdit()
+
+  await productStore.getProductDescription(newLang, productID.value)
+
+  const desc = productStore.productDescription
+
+  if (!desc || (!desc.description && !desc.description_short && !desc.usage)) {
+    noTranslation.value = true
+    activeLangId.value = defaultLangId.value
+    await productStore.getDefaultProductDescription(defaultLangId.value, productID.value)
+  } else {
+    noTranslation.value = false
+    activeLangId.value = newLang
+  }
+})
+
+const isViewingExistingTranslation = computed(() => activeLangId.value !== defaultLangId.value && !noTranslation.value)
+
+const productName = computed(() => {
+  if (activeLangId.value !== defaultLangId.value && !noTranslation.value) {
+    return productStore.productDescription?.name || ''
+  }
+  return productStore.defaultProductDescription?.name || productStore.productDescription?.name || ''
+})
+
+const displayedDescription = computed(() => {
+  if (activeLangId.value !== defaultLangId.value && !noTranslation.value) {
+    return productStore.productDescription?.description || ''
+  }
+  return productStore.defaultProductDescription?.description || ''
+})
+
+const displayedShortDescription = computed(() => {
+  if (activeLangId.value !== defaultLangId.value && !noTranslation.value) {
+    return productStore.productDescription?.description_short || ''
+  }
+  return productStore.defaultProductDescription?.description_short || ''
+})
+
+const displayedUsage = computed(() => {
+  if (activeLangId.value !== defaultLangId.value && !noTranslation.value) {
+    return productStore.productDescription?.usage || ''
+  }
+  return productStore.defaultProductDescription?.usage || ''
+})
+
+const goBackToDefault = async () => {
+  selectedLangId.value = defaultLangId.value
+  activeLangId.value = defaultLangId.value
+  noTranslation.value = false
+  await productStore.getProductDescription(defaultLangId.value, productID.value)
+  await productStore.getDefaultProductDescription(defaultLangId.value, productID.value)
 }
 
+const translateOrSave = async () => {
+  if (!productID.value || selectedLangId.value === defaultLangId.value) return
+
+  translating.value = true
+  try {
+    const res = await productStore.translateProductDescription(productID.value, defaultLangId.value, selectedLangId.value)
+    if (res) {
+      activeLangId.value = selectedLangId.value
+      noTranslation.value = false
+    }
+  } finally {
+    translating.value = false
+  }
+}
+
+const btnClass = (tab: string) => ['cursor-pointer px-4 py-2', activeTab.value === tab ? 'bg-blue-500 text-white' : '']
+
+/* USAGE EDIT */
+const enableUsageEdit = () => {
+  originalUsage.value = displayedUsage.value
+  usageEdit.enableEdit()
+  isEditing.value = true
+}
+const saveUsage = async () => {
+  if (usageRef.value && productStore.productDescription) {
+    productStore.productDescription.usage = usageRef.value.innerHTML
+  }
+  usageEdit.disableEdit()
+  isEditing.value = false
+  await productStore.saveProductDescription(productID.value, activeLangId.value, 1)
+}
+const cancelUsageEdit = () => {
+  if (usageRef.value) usageRef.value.innerHTML = originalUsage.value
+  if (productStore.productDescription) productStore.productDescription.usage = originalUsage.value
+  usageEdit.disableEdit()
+  isEditing.value = false
+}
+
+/* DESCRIPTION EDIT */
 const enableDescriptionEdit = () => {
-  if (descriptionRef.value) {
-    originalDescription.value = descriptionRef.value.innerHTML
-  }
+  originalDescription.value = displayedDescription.value
   descriptionEdit.enableEdit()
 }
-
-const enableEdit = () => {
-  if (usageRef.value) {
-    originalUsage.value = usageRef.value.innerHTML
+const saveDescription = async () => {
+  if (descriptionRef.value && productStore.productDescription) {
+    productStore.productDescription.description = descriptionRef.value.innerHTML
   }
-  isEditing.value = true
-  usageEdit.enableEdit()
+  descriptionEdit.disableEdit()
+  await productStore.saveProductDescription(productID.value, activeLangId.value, 1)
+}
+const cancelDescriptionEdit = () => {
+  if (descriptionRef.value) descriptionRef.value.innerHTML = originalDescription.value
+  if (productStore.productDescription) productStore.productDescription.description = originalDescription.value
+  descriptionEdit.disableEdit()
 }
 
-const saveText = () => {
-  usageEdit.disableEdit()
-  isEditing.value = false
-  productStore.saveProductDescription(productID.value)
-}
-
-const cancelEdit = () => {
-  if (usageRef.value) {
-    usageRef.value.innerHTML = originalUsage.value
+onMounted(async () => {
+  const settings = await settingsStore.getSettings()
+  if (settings) {
+    defaultLangId.value = settings.app.shop_default_language
+    selectedLangId.value = defaultLangId.value
+    activeLangId.value = defaultLangId.value
   }
-  usageEdit.disableEdit()
-  isEditing.value = false
-}
-
+  const id = route.params.product_id
+  if (id) {
+    productID.value = Number(id)
+    await productStore.getProductDescription(defaultLangId.value, productID.value)
+    await productStore.getDefaultProductDescription(defaultLangId.value, productID.value)
+  }
+})
 </script>
 
 <style>
-.images {
-  display: flex;
-  align-items: center;
-  gap: 70px;
-  margin: 20px 0 20px 0;
+.box {
+  padding: 20px;
+  border: 1px solid var(--border-light);
+  border-radius: 8px;
 }
 </style>

bo/src/components/customer/PageProducts.vue

@@ -46,7 +46,7 @@ import { useFetchJson } from '@/composable/useFetchJson'
 import Default from '@/layouts/default.vue'
 import { useRoute, useRouter } from 'vue-router'
 import type { TableColumn } from '@nuxt/ui'
-import CategoryMenu from '../inner/categoryMenu.vue'
+import CategoryMenu from '../inner/CategoryMenu.vue'
 
 interface Product {
     reference: number

bo/src/components/inner/CountryCurrencySwitch.vue

@@ -0,0 +1,68 @@
+<template>
+  <p>Country: {{ currentCountry?.name }}</p>
+  <p>Currency: {{ currentCountry?.ps_currency.iso_code }}</p>
+  <USelectMenu v-model="country" :items="countries"
+    class="w-40 bg-(--main-light) dark:bg-(--black) rounded-md shadow-sm  hover:none!" valueKey="id"
+    :searchInput="false">
+    <template #default="{ modelValue }">
+      <div class="flex items-center gap-1">
+        <span class="font-medium dark:text-white text-black">{{ modelValue.name }}</span>
+      </div>
+    </template>
+    <template #item-leading="{ item }">
+      <div class="flex items-center rounded-md cursor-pointer transition-colors">
+        <span class="ml-2 dark:text-white text-black font-medium">{{ item.name }}</span>
+      </div>
+    </template>
+  </USelectMenu>
+</template>
+
+<script setup lang="ts">
+import { countries, currentCountry } from '@/router/langs'
+import { useRouter, useRoute } from 'vue-router'
+import { useCookie } from '@/composable/useCookie'
+import { computed, watch } from 'vue'
+import { i18n } from '@/plugins/02_i18n'
+import { useFetchJson } from '@/composable/useFetchJson'
+const router = useRouter()
+const route = useRoute()
+
+const cookie = useCookie()
+
+const country = computed({
+  get() {
+    return currentCountry.value
+  },
+  set(value: string) {
+    // i18n.locale.value = value
+    currentCountry.value = countries.find((x) => x.id == Number(value))
+    cookie.setCookie('country_id', `${countries.find((x) => x.id == Number(value))?.id}`, { days: 60, secure: true, sameSite: 'Lax' })
+
+    // changeLang()
+  },
+})
+
+// async function changeLang() {
+//   try {
+//     const { items } = await useFetchJson('/api/v1/public/auth/update-choice', {
+//       method: 'POST'
+//     })
+
+//   } catch (error) {
+//     console.log(error)
+//   }
+// }
+
+watch(
+  () => country,
+  (newCountry) => {
+    if (newCountry) {
+      console.log(newCountry.value);
+
+      // i18n.locale.value = newLocale  
+      currentCountry.value = countries.find((x) => x.id == Number(newCountry.value?.id))
+    }
+  },
+  { immediate: true },
+)
+</script>

bo/src/plugins/02_i18n.ts

@@ -1,11 +1,12 @@
 
 import { useFetchJson } from '@/composable/useFetchJson'
-import { initLangs, langs } from '@/router/langs'
+import { initCountryCurrency, initLangs, langs } from '@/router/langs'
 import { watch } from 'vue'
 import { createI18n, type PathValue } from 'vue-i18n'
 
 // const x =
 await initLangs()
+await initCountryCurrency()
 export const i18ninstall = createI18n({
   legacy: false, // you must set `false`, to use Composition API
   locale: 'en',

bo/src/router/langs.ts

@@ -1,12 +1,16 @@
 import { useCookie } from "@/composable/useCookie"
 import { useFetchJson } from "@/composable/useFetchJson"
-import type { Language } from "@/types"
+import type { Country, Language } from "@/types"
 import { reactive, ref } from "vue"
 
 export const langs = reactive([] as Language[])
 export const currentLang = ref<Language>()
 
-const deflang = ref<Language>()
+export const countries = reactive([] as Country[])
+export const currentCountry = ref<Country>()
+
+const defLang = ref<Language>()
+const defCountry = ref<Country>()
 const cookie = useCookie()
 // Get available language codes for route matching
 // export const availableLocales = computed(() => langs.map((l) => l.lang_code))
@@ -22,8 +26,27 @@ export async function initLangs() {
         if (cc) {
             idfromcookie = langs.find((x) => x.id == parseInt(cc))
         }
-        deflang.value = items.find((x) => x.is_default == true)
-        currentLang.value = idfromcookie ?? deflang.value
+        defLang.value = items.find((x) => x.is_default == true)
+        currentLang.value = idfromcookie ?? defLang.value
+    } catch (error) {
+        console.error('Failed to fetch languages:', error)
+    }
+}
+
+// Initialize country/currency from API
+
+export async function initCountryCurrency() {
+    try {
+        const { items } = await useFetchJson<Country[]>('/api/v1/restricted/langs-and-countries/get-countries')
+        countries.push(...items)
+
+        let idfromcookie = null
+        const cc = cookie.getCookie('country_id')
+        if (cc) {
+            idfromcookie = langs.find((x) => x.id == parseInt(cc))
+        }
+        defCountry.value = items.find((x) => x.id === defLang.value?.id)
+        currentCountry.value = idfromcookie ?? defCountry.value
     } catch (error) {
         console.error('Failed to fetch languages:', error)
     }

bo/src/stores/product.ts

@@ -23,7 +23,8 @@ export interface ProductResponse {
 }
 
 export const useProductStore = defineStore('product', () => {
-  const productDescription = ref()
+  const productDescription = ref<ProductDescription | null>(null)
+  const defaultProductDescription = ref<ProductDescription | null>(null)
   const currentProduct = ref<Product | null>(null)
   const loading = ref(false)
   const error = ref<string | null>(null)
@@ -37,7 +38,6 @@ export const useProductStore = defineStore('product', () => {
         `/api/v1/restricted/product-translation/get-product-description?productID=${productID}&productLangID=${langId}`
       )
       productDescription.value = response.items
-      
     } catch (e: unknown) {
       error.value = e instanceof Error ? e.message : 'Failed to load product description'
     } finally {
@@ -45,21 +45,31 @@ export const useProductStore = defineStore('product', () => {
     }
   }
 
-  async function saveProductDescription(productID?: number) {
+  async function getDefaultProductDescription(langId: number, productID: number) {
+    try {
+      const response = await useFetchJson<ProductDescription>(
+        `/api/v1/restricted/product-translation/get-product-description?productID=${productID}&productLangID=${langId}`
+      )
+      defaultProductDescription.value = response.items
+    } catch (e: unknown) {
+      console.error('Failed to load default product description:', e)
+    }
+  }
+
+  async function saveProductDescription(productID?: number, langId?: number, shopId = 1) {
     const id = productID || 1
     try {
       const data = await useFetchJson(
-        `/api/v1/restricted/product-description/save-product-description?productID=${id}&productShopID=1&productLangID=1`,
+        `/api/v1/restricted/product-description/save-product-description?productID=${id}&productShopID=${shopId}&productLangID=${langId ?? 1}`,
         {
           method: 'POST',
-          body: JSON.stringify(
-            {
-              description: productDescription.value.description,
-              description_short: productDescription.value.description_short,
-              meta_description: productDescription.value.meta_description,
-              available_now: productDescription.value.available_now,
-              usage: productDescription.value.usage
-            })
+          body: JSON.stringify({
+            description: productDescription.value?.description,
+            description_short: productDescription.value?.description_short,
+            meta_description: productDescription.value?.meta_description,
+            available_now: productDescription.value?.available_now,
+            usage: productDescription.value?.usage
+          })
         }
       )
       return data
@@ -90,10 +100,12 @@ export const useProductStore = defineStore('product', () => {
 
   return {
     productDescription,
+    defaultProductDescription,
     currentProduct,
     loading,
     error,
     getProductDescription,
+    getDefaultProductDescription,
     clearCurrentProduct,
     saveProductDescription,
     translateProductDescription,

bo/src/stores/settings.ts

@@ -2,13 +2,19 @@ import { useFetchJson } from '@/composable/useFetchJson'
 import type { Resp } from '@/types'
 import type { Settings } from '@/types/settings'
 import { defineStore } from 'pinia'
+import { ref } from 'vue'
 
 export const useSettingsStore = defineStore('settings', () => {
-  async function getSettings() {
-    const { items } = await useFetchJson<Resp<Settings>>('/api/v1/settings',)
-    console.log(items);
+  const settings = ref<Settings | null>(null)
+  const loaded = ref(false)
+
+  async function getSettings(): Promise<Settings | null> {
+    if (loaded.value && settings.value) return settings.value
+    const resp = await useFetchJson<Settings>('/api/v1/settings')
+    settings.value = resp.items
+    loaded.value = true
+    return resp.items
   }
 
-  getSettings()
-  return {}
+  return { settings, loaded, getSettings }
 })

bo/src/types/lang.d.ts

@@ -12,3 +12,20 @@ export interface Language {
   active: boolean
   flag: string
 }
+
+export interface Country {
+  id: number
+  name: string
+  flag: string
+  currency_id: string
+  ps_currency: {
+    id_currency: string
+    name: string
+    iso_code: string
+    numeric_iso_code: string
+    precision: number
+    conversion_rate: number
+    deleted: boolean
+    active: boolean
+  }
+}

bo/src/types/product.d.ts

@@ -5,6 +5,7 @@ export interface ProductDescription {
   description_short: string
   meta_description: string
   available_now: string
+  delivery_in_stock?: string
   usage: string
 }
 

bo/src/types/settings.d.ts

@@ -12,6 +12,7 @@ export interface App {
   environment: string
   base_url: string
   password_regex: string
+  shop_default_language: number
 }
 
 export interface Server {

bruno/api_v1/Change Locales.yml

@@ -1,7 +1,7 @@
 info:
   name: Change Locales
   type: http
-  seq: 3
+  seq: 4
 
 http:
   method: POST

bruno/api_v1/Create Search Index.yml

@@ -1,7 +1,7 @@
 info:
   name: Create Search Index
   type: http
-  seq: 1
+  seq: 2
 
 http:
   method: GET

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

bruno/api_v1/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/list/list-products?p=1&elems=30&sort=product_id,asc&category_id_in=243&reference=~62"
   params:
     - name: p
       value: "1"
@@ -25,6 +25,9 @@ http:
   body:
     type: json
     data: ""
+  auth:
+    type: bearer
+    token: "{{token}}"
 
 settings:
   encodeUrl: true

bruno/api_v1/Search Index Settings.yml

@@ -1,7 +1,7 @@
 info:
   name: Search Index Settings
   type: http
-  seq: 4
+  seq: 5
 
 http:
   method: POST

bruno/api_v1/Search Items.yml

@@ -1,7 +1,7 @@
 info:
   name: Search Items
   type: http
-  seq: 2
+  seq: 3
 
 http:
   method: POST

bruno/api_v1/auth/Login.yml

@@ -1,29 +0,0 @@
-info:
-  name: Login
-  type: http
-  seq: 1
-
-http:
-  method: POST
-  url: "{{bas_url}}/public/auth/login"
-  body:
-    type: json
-    data: |-
-      {
-        "email":"{{email}}",
-        "password":"{{password}}"
-      }
-  auth: inherit
-
-runtime:
-  variables:
-    - name: email
-      value: admin@ma-al.com
-    - name: password
-      value: Maal12345678
-
-settings:
-  encodeUrl: true
-  timeout: 0
-  followRedirects: true
-  maxRedirects: 5

bruno/api_v1/auth/folder.yml

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

bruno/api_v1/currency/currency-rate.yml

@@ -1,22 +0,0 @@
-info:
-  name: currency-rate
-  type: http
-  seq: 2
-
-http:
-  method: POST
-  url: "{{bas_url}}/restricted/currency-rate"
-  body:
-    type: json
-    data: |-
-      {
-        "b2b_id_currency" : 1,
-        "conversion_rate": 4.2
-      }
-  auth: inherit
-
-settings:
-  encodeUrl: true
-  timeout: 0
-  followRedirects: true
-  maxRedirects: 5

bruno/api_v1/currency/currency.yml

@@ -1,20 +0,0 @@
-info:
-  name: currency
-  type: http
-  seq: 1
-
-http:
-  method: GET
-  url: "{{bas_url}}/restricted/currency-rate/{{id}}"
-  auth: inherit
-
-runtime:
-  variables:
-    - name: id
-      value: "1"
-
-settings:
-  encodeUrl: true
-  timeout: 0
-  followRedirects: true
-  maxRedirects: 5

bruno/api_v1/currency/folder.yml

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

bruno/api_v1/customer/Customer (me).yml

@@ -1,15 +0,0 @@
-info:
-  name: Customer (me)
-  type: http
-  seq: 2
-
-http:
-  method: GET
-  url: "{{bas_url}}/restricted/customer"
-  auth: inherit
-
-settings:
-  encodeUrl: true
-  timeout: 0
-  followRedirects: true
-  maxRedirects: 5

bruno/api_v1/customer/Customer (other).yml

@@ -1,19 +0,0 @@
-info:
-  name: Customer (other)
-  type: http
-  seq: 9
-
-http:
-  method: GET
-  url: "{{bas_url}}/restricted/customer?id=1"
-  params:
-    - name: id
-      value: "1"
-      type: query
-  auth: inherit
-
-settings:
-  encodeUrl: true
-  timeout: 0
-  followRedirects: true
-  maxRedirects: 5

bruno/api_v1/customer/Customer list.yml

@@ -1,19 +0,0 @@
-info:
-  name: Customer list
-  type: http
-  seq: 3
-
-http:
-  method: GET
-  url: "{{bas_url}}/restricted/customer/list?search="
-  params:
-    - name: search
-      value: ""
-      type: query
-  auth: inherit
-
-settings:
-  encodeUrl: true
-  timeout: 0
-  followRedirects: true
-  maxRedirects: 5

bruno/api_v1/customer/folder.yml

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

bruno/api_v1/product/Get Product.yml

@@ -1,15 +0,0 @@
-info:
-  name: Get Product
-  type: http
-  seq: 1
-
-http:
-  method: GET
-  url: "{{bas_url}}/restricted/product/200/1/5"
-  auth: inherit
-
-settings:
-  encodeUrl: true
-  timeout: 0
-  followRedirects: true
-  maxRedirects: 5

bruno/api_v1/product/folder.yml

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

bruno/b2b-daniel/add-new-cart.yml

@@ -1,7 +1,7 @@
 info:
   name: add-new-cart
   type: http
-  seq: 1
+  seq: 11
 
 http:
   method: GET

bruno/b2b-daniel/add-product-to-cart (1).yml

@@ -1,7 +1,7 @@
 info:
   name: add-product-to-cart (1)
   type: http
-  seq: 1
+  seq: 16
 
 http:
   method: GET

bruno/b2b-daniel/add-product-to-cart.yml

@@ -1,7 +1,7 @@
 info:
   name: add-product-to-cart
   type: http
-  seq: 14
+  seq: 15
 
 http:
   method: GET

bruno/b2b-daniel/change-cart-name.yml

@@ -1,7 +1,7 @@
 info:
   name: change-cart-name
   type: http
-  seq: 1
+  seq: 12
 
 http:
   method: GET

bruno/b2b-daniel/create-index.yml

@@ -1,11 +1,11 @@
 info:
   name: create-index
   type: http
-  seq: 1
+  seq: 7
 
 http:
   method: GET
-  url: http://localhost:3000/api/v1/restricted/search/create-index
+  url: http://localhost:3000/api/v1/restricted/meili-search/create-index
   auth: inherit
 
 settings:

bruno/b2b-daniel/get-breadcrumb.yml

@@ -1,7 +1,7 @@
 info:
   name: get-breadcrumb
   type: http
-  seq: 1
+  seq: 18
 
 http:
   method: GET

bruno/b2b-daniel/get-category-tree.yml

@@ -1,7 +1,7 @@
 info:
   name: get-category-tree
   type: http
-  seq: 1
+  seq: 5
 
 http:
   method: GET

bruno/b2b-daniel/get-indexes.yml

@@ -1,7 +1,7 @@
 info:
   name: get-indexes
   type: http
-  seq: 1
+  seq: 9
 
 http:
   method: GET

bruno/b2b-daniel/get-product-description.yml

@@ -1,7 +1,7 @@
 info:
   name: get-product-description
   type: http
-  seq: 1
+  seq: 17
 
 http:
   method: GET

bruno/b2b-daniel/get_countries.yml

@@ -1,7 +1,7 @@
 info:
   name: get_countries
   type: http
-  seq: 1
+  seq: 4
 
 http:
   method: GET

bruno/b2b-daniel/list-products.yml

@@ -5,7 +5,7 @@ info:
 
 http:
   method: GET
-  url: http://localhost:3000/api/v1/restricted/list/list-products?p=1&elems=10&target_user_id=2
+  url: http://localhost:3000/api/v1/restricted/list/list-products?p=1&elems=10
   params:
     - name: p
       value: "1"
@@ -13,9 +13,6 @@ http:
     - name: elems
       value: "10"
       type: query
-    - name: target_user_id
-      value: "2"
-      type: query
 
 settings:
   encodeUrl: true

bruno/b2b-daniel/list-users.yml

@@ -1,7 +1,7 @@
 info:
   name: list-users
   type: http
-  seq: 1
+  seq: 2
 
 http:
   method: GET