goc_marek/ps_shop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

lang

Browse Source
This commit is contained in:
Marek Goc
2026-05-12 05:08:39 +02:00
parent ee054955b9
commit 4c454de1c2
28 changed files with 2045 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/http/handlers/category.go
+33 -43
View File
@@ -8,44 +8,43 @@ import (
"github.com/labstack/echo/v4"
"gorm.io/gorm"
appmiddleware "prestaproxy/internal/http/middleware"
pscart "prestaproxy/internal/prestashop/cart"
pscatalog "prestaproxy/internal/prestashop/catalog"
psconfig "prestaproxy/internal/prestashop/config"
pscustomer "prestaproxy/internal/prestashop/customer"
psroutes "prestaproxy/internal/prestashop/routes"
"prestaproxy/internal/render"
"prestaproxy/internal/viewmodel"
appmiddleware "git.ma-al.com/goc_marek/ps_shop/internal/http/middleware"
pscart "git.ma-al.com/goc_marek/ps_shop/internal/prestashop/cart"
pscatalog "git.ma-al.com/goc_marek/ps_shop/internal/prestashop/catalog"
psconfig "git.ma-al.com/goc_marek/ps_shop/internal/prestashop/config"
pscustomer "git.ma-al.com/goc_marek/ps_shop/internal/prestashop/customer"
psroutes "git.ma-al.com/goc_marek/ps_shop/internal/prestashop/routes"
"git.ma-al.com/goc_marek/ps_shop/internal/render"
"git.ma-al.com/goc_marek/ps_shop/internal/viewmodel"
)
const categorySlugContextKey = "category_slug"
const categoryIDContextKey = "category_id"
type CategoryHandler struct {
catalog *pscatalog.Service
customers *pscustomer.Service
carts *pscart.Service
renderer *render.Engine
config psconfig.Config
products *psroutes.ProductRoute
catalog *pscatalog.Service
customers *pscustomer.Service
carts *pscart.Service
renderer *render.Engine
config psconfig.Config
products *psroutes.ProductRoute
categories *psroutes.CategoryRoute
}
func NewCategoryHandler(catalog *pscatalog.Service, customers *pscustomer.Service, carts *pscart.Service, renderer *render.Engine, cfg psconfig.Config, products *psroutes.ProductRoute) *CategoryHandler {
func NewCategoryHandler(catalog *pscatalog.Service, customers *pscustomer.Service, carts *pscart.Service, renderer *render.Engine, cfg psconfig.Config, products *psroutes.ProductRoute, categories *psroutes.CategoryRoute) *CategoryHandler {
return &CategoryHandler{
catalog: catalog,
customers: customers,
carts: carts,
renderer: renderer,
config: cfg,
products: products,
catalog: catalog,
customers: customers,
carts: carts,
renderer: renderer,
config: cfg,
products: products,
categories: categories,
}
}
func (h *CategoryHandler) Show(c echo.Context) error {
session := appmiddleware.GetSession(c)
if session == nil {
session = appmiddleware.GetSession(c)
}
if h == nil || h.catalog == nil || h.renderer == nil {
return echo.NewHTTPError(http.StatusInternalServerError, "category handler is not initialized")
}
@@ -91,6 +90,16 @@ func (h *CategoryHandler) Show(c echo.Context) error {
ShopBaseURL: h.config.PrestaShopBaseURL,
}
assignCategoryProductLinks(c.Request(), h.products, &page)
menu, err := loadMenu(c.Request(), h.catalog, h.categories, languageID, shopID)
if err != nil {
return echo.NewHTTPError(http.StatusInternalServerError, "menu query failed: "+err.Error())
}
page.Menu = menu
locale, err := loadHeaderLocale(c.Request(), h.catalog, session, languageID)
if err != nil {
return echo.NewHTTPError(http.StatusInternalServerError, "locale query failed: "+err.Error())
}
page.Locale = locale
if err := h.renderer.Category(c.Response(), c.Request(), page); err != nil {
return echo.NewHTTPError(http.StatusInternalServerError, "category render failed: "+err.Error())
@@ -141,22 +150,3 @@ func assignCategoryProductLinks(req *http.Request, route *psroutes.ProductRoute,
})
}
}
func requestLanguagePrefix(req *http.Request) string {
if req == nil || req.URL == nil {
return ""
}
path := strings.Trim(req.URL.Path, "/")
if path == "" {
return ""
}
first := path
if idx := strings.IndexByte(path, '/'); idx >= 0 {
first = path[:idx]
}
first = strings.TrimSpace(first)
if len(first) < 2 || len(first) > 5 {
return ""
}
return "/" + first
}
internal/http/handlers/navigation.go
+151
View File
@@ -0,0 +1,151 @@
package handlers
import (
"net/http"
"net/url"
"strconv"
"strings"
pscatalog "git.ma-al.com/goc_marek/ps_shop/internal/prestashop/catalog"
pscookie "git.ma-al.com/goc_marek/ps_shop/internal/prestashop/cookie"
psroutes "git.ma-al.com/goc_marek/ps_shop/internal/prestashop/routes"
)
func loadMenu(req *http.Request, catalog *pscatalog.Service, route *psroutes.CategoryRoute, languageID int64, shopID int64) ([]pscatalog.MenuItem, error) {
if catalog == nil || route == nil {
return nil, nil
}
menu, err := catalog.GetCategoryMenu(req.Context(), languageID, shopID)
if err != nil {
return nil, err
}
assignMenuLinks(req, route, menu)
return menu, nil
}
func assignMenuLinks(req *http.Request, route *psroutes.CategoryRoute, items []pscatalog.MenuItem) {
langPrefix := requestLanguagePrefix(req)
for i := range items {
items[i].URL = route.BuildPath(psroutes.CategoryURLData{
ID: items[i].ID,
Slug: items[i].Slug,
LanguagePrefix: langPrefix,
})
if len(items[i].Children) > 0 {
assignMenuLinks(req, route, items[i].Children)
}
}
}
func loadHeaderLocale(req *http.Request, catalog *pscatalog.Service, session *pscookie.SessionContext, languageID int64) (pscatalog.HeaderLocaleData, error) {
if catalog == nil || req == nil {
return pscatalog.HeaderLocaleData{}, nil
}
var currencyID int64
countryISO := ""
if session != nil {
currencyID = int64Default(session.CurrencyID, 0)
countryISO = strings.TrimSpace(session.Values["iso_code_country"])
}
locale, err := catalog.GetHeaderLocale(req.Context(), languageID, currencyID, countryISO)
if err != nil {
return pscatalog.HeaderLocaleData{}, err
}
assignLanguageSwitchLinks(req, &locale)
assignMarketSwitchLinks(req, &locale)
return locale, nil
}
func assignLanguageSwitchLinks(req *http.Request, locale *pscatalog.HeaderLocaleData) {
if req == nil || req.URL == nil || locale == nil || len(locale.Languages) == 0 {
return
}
basePath := stripLanguagePrefix(req.URL.Path, locale.Languages)
rawQuery := req.URL.RawQuery
for i := range locale.Languages {
code := strings.ToLower(strings.TrimSpace(locale.Languages[i].Code))
path := "/" + code
if basePath != "/" {
path += basePath
}
if rawQuery != "" {
path += "?" + rawQuery
}
locale.Languages[i].URL = path
}
}
func assignMarketSwitchLinks(req *http.Request, locale *pscatalog.HeaderLocaleData) {
if req == nil || req.URL == nil || locale == nil || len(locale.Countries) == 0 {
return
}
for i := range locale.Countries {
marketCode := strings.ToUpper(strings.TrimSpace(locale.Countries[i].Code))
if marketCode == "" || locale.Countries[i].CurrencyID == 0 {
continue
}
query := req.URL.Query()
query.Set("market", strconv.FormatInt(locale.Countries[i].ID, 10)+":"+marketCode+":"+strconv.FormatInt(locale.Countries[i].CurrencyID, 10))
locale.Countries[i].URL = rebuildURL(req.URL.Path, query)
}
}
func requestLanguagePrefix(req *http.Request) string {
if req == nil || req.URL == nil {
return ""
}
path := strings.Trim(req.URL.Path, "/")
if path == "" {
return ""
}
first := path
if idx := strings.IndexByte(path, '/'); idx >= 0 {
first = path[:idx]
}
first = strings.TrimSpace(first)
if len(first) < 2 || len(first) > 5 {
return ""
}
return "/" + first
}
func stripLanguagePrefix(path string, languages []pscatalog.LocaleOption) string {
if path == "" {
return "/"
}
codes := make(map[string]struct{}, len(languages))
for _, language := range languages {
code := strings.ToLower(strings.TrimSpace(language.Code))
if code != "" {
codes[code] = struct{}{}
}
}
trimmed := strings.Trim(path, "/")
if trimmed == "" {
return "/"
}
parts := strings.Split(trimmed, "/")
if _, ok := codes[strings.ToLower(parts[0])]; ok {
parts = parts[1:]
}
if len(parts) == 0 {
return "/"
}
return "/" + strings.Join(parts, "/")
}
func rebuildURL(path string, query url.Values) string {
if path == "" {
path = "/"
}
encoded := query.Encode()
if encoded == "" {
return path
}
return path + "?" + encoded
}
internal/http/handlers/product.go
+18 -11
View File
@@ -8,14 +8,14 @@ import (
"github.com/labstack/echo/v4"
"gorm.io/gorm"
appmiddleware "prestaproxy/internal/http/middleware"
pscart "prestaproxy/internal/prestashop/cart"
pscatalog "prestaproxy/internal/prestashop/catalog"
psconfig "prestaproxy/internal/prestashop/config"
pscustomer "prestaproxy/internal/prestashop/customer"
psroutes "prestaproxy/internal/prestashop/routes"
"prestaproxy/internal/render"
"prestaproxy/internal/viewmodel"
appmiddleware "git.ma-al.com/goc_marek/ps_shop/internal/http/middleware"
pscart "git.ma-al.com/goc_marek/ps_shop/internal/prestashop/cart"
pscatalog "git.ma-al.com/goc_marek/ps_shop/internal/prestashop/catalog"
psconfig "git.ma-al.com/goc_marek/ps_shop/internal/prestashop/config"
pscustomer "git.ma-al.com/goc_marek/ps_shop/internal/prestashop/customer"
psroutes "git.ma-al.com/goc_marek/ps_shop/internal/prestashop/routes"
"git.ma-al.com/goc_marek/ps_shop/internal/render"
"git.ma-al.com/goc_marek/ps_shop/internal/viewmodel"
)
const productSlugContextKey = "product_slug"
@@ -43,9 +43,6 @@ func NewProductHandler(products *pscatalog.Service, customers *pscustomer.Servic
func (h *ProductHandler) Show(c echo.Context) error {
session := appmiddleware.GetSession(c)
if session == nil {
session = appmiddleware.GetSession(c)
}
if h == nil || h.products == nil || h.renderer == nil {
return echo.NewHTTPError(http.StatusInternalServerError, "product handler is not initialized")
}
@@ -91,6 +88,16 @@ func (h *ProductHandler) Show(c echo.Context) error {
CartSummary: cartSummary,
ShopBaseURL: h.config.PrestaShopBaseURL,
}
menu, err := loadMenu(c.Request(), h.products, h.categories, languageID, shopID)
if err != nil {
return echo.NewHTTPError(http.StatusInternalServerError, "menu query failed: "+err.Error())
}
page.Menu = menu
locale, err := loadHeaderLocale(c.Request(), h.products, session, languageID)
if err != nil {
return echo.NewHTTPError(http.StatusInternalServerError, "locale query failed: "+err.Error())
}
page.Locale = locale
return h.renderer.Product(c.Response(), c.Request(), page)
}