goc_daniel/b2b
2
0
Fork 0
Code Issues 7 Pull Requests Actions Packages Projects Releases Wiki Activity

fix meilisearch

Browse Source
This commit is contained in:
Marek Goc
2026-03-26 22:00:42 +01:00
parent 29260080c2
commit ec05101037
21 changed files with 545 additions and 294 deletions
Download Patch File Download Diff File Expand all files Collapse all files

219
app/repos/productDescriptionRepo/productDescriptionRepo.go
View File

@@ -9,9 +9,9 @@ import (
)
type UIProductDescriptionRepo interface {
GetProductDescription(productID uint, productLangID uint) (*model.ProductDescription, error)
CreateIfDoesNotExist(productID uint, productLangID uint) error
UpdateFields(productID uint, productLangID uint, updates map[string]string) error
GetProductDescription(productID uint, productid_lang uint) (*model.ProductDescription, error)
CreateIfDoesNotExist(productID uint, productid_lang uint) error
UpdateFields(productID uint, productid_lang uint, updates map[string]string) error
GetMeiliProducts(id_lang uint) ([]model.MeiliSearchProduct, error)
}
@@ -22,12 +22,12 @@ func New() UIProductDescriptionRepo {
}
// We assume that any user has access to all product descriptions
func (r *ProductDescriptionRepo) GetProductDescription(productID uint, productLangID uint) (*model.ProductDescription, error) {
func (r *ProductDescriptionRepo) GetProductDescription(productID uint, productid_lang uint) (*model.ProductDescription, error) {
var ProductDescription model.ProductDescription
err := db.DB.
Table("ps_product_lang").
Where("id_product = ? AND id_shop = ? AND id_lang = ?", productID, constdata.SHOP_ID, productLangID).
Where("id_product = ? AND id_shop = ? AND id_lang = ?", productID, constdata.SHOP_ID, productid_lang).
First(&ProductDescription).Error
if err != nil {
return nil, fmt.Errorf("database error: %w", err)
@@ -37,16 +37,16 @@ func (r *ProductDescriptionRepo) GetProductDescription(productID uint, productLa
}
// If it doesn't exist, returns an error.
func (r *ProductDescriptionRepo) CreateIfDoesNotExist(productID uint, productLangID uint) error {
func (r *ProductDescriptionRepo) CreateIfDoesNotExist(productID uint, productid_lang uint) error {
record := model.ProductDescription{
ProductID: productID,
ShopID: constdata.SHOP_ID,
LangID: productLangID,
LangID: productid_lang,
}
err := db.DB.
Table("ps_product_lang").
Where("id_product = ? AND id_shop = ? AND id_lang = ?", productID, constdata.SHOP_ID, productLangID).
Where("id_product = ? AND id_shop = ? AND id_lang = ?", productID, constdata.SHOP_ID, productid_lang).
FirstOrCreate(&record).Error
if err != nil {
return fmt.Errorf("database error: %w", err)
@@ -55,7 +55,7 @@ func (r *ProductDescriptionRepo) CreateIfDoesNotExist(productID uint, productLan
return nil
}
func (r *ProductDescriptionRepo) UpdateFields(productID uint, productLangID uint, updates map[string]string) error {
func (r *ProductDescriptionRepo) UpdateFields(productID uint, productid_lang uint, updates map[string]string) error {
if len(updates) == 0 {
return nil
}
@@ -66,7 +66,7 @@ func (r *ProductDescriptionRepo) UpdateFields(productID uint, productLangID uint
err := db.DB.
Table("ps_product_lang").
Where("id_product = ? AND id_shop = ? AND id_lang = ?", productID, constdata.SHOP_ID, productLangID).
Where("id_product = ? AND id_shop = ? AND id_lang = ?", productID, constdata.SHOP_ID, productid_lang).
Updates(updatesIface).Error
if err != nil {
return fmt.Errorf("database error: %w", err)
@@ -79,96 +79,123 @@ func (r *ProductDescriptionRepo) UpdateFields(productID uint, productLangID uint
func (r *ProductDescriptionRepo) GetMeiliProducts(id_lang uint) ([]model.MeiliSearchProduct, error) {
var products []model.MeiliSearchProduct
err := db.DB.Debug().
// Select(`
// ps.id_product AS id_product,
// pl.name AS name,
// ps.price AS price,
// pl.description AS description,
// pl.description_short AS description_short,
// pl.usage AS used_for,
// p.ean13 AS ean13,
// p.reference AS reference,
// p.width AS width,
// p.height AS height,
// p.depth AS depth,
// p.weight AS weight,
// ps.id_category_default AS id_category,
// cl.name AS category_name,
// COUNT(DISTINCT pas.id_product_attribute) AS variations
// `).
// Table("ps_product_shop AS ps").
// Joins("LEFT JOIN ps_product_lang AS pl ON ps.id_product = pl.id_product AND pl.id_shop = ? AND pl.id_lang = ?", constdata.SHOP_ID, id_lang).
// Joins("LEFT JOIN ps_product AS p ON p.id_product = ps.id_product").
// Joins("LEFT JOIN ps_category_lang AS cl ON cl.id_category = ps.id_category_default AND cl.id_shop = ? AND cl.id_lang = ?", constdata.SHOP_ID, id_lang).
// Joins("LEFT JOIN ps_product_attribute_shop AS pas ON pas.id_product = ps.id_product AND pas.id_shop = ?", constdata.SHOP_ID).
// Where("ps.id_shop = ? AND ps.active = 1", constdata.SHOP_ID).
// Group("ps.id_product").
Select(`
ps.id_product AS id_product,
pl.name AS name,
pl.description AS description,
pl.description_short AS description_short,
pl.usage AS used_for,
p.ean13 AS ean13,
p.reference AS reference,
query := db.Get().Debug().Raw(`
WITH products_page AS (
SELECT ps.id_product, ps.price
FROM ps_product_shop ps
WHERE ps.id_shop = ? AND ps.active = 1
),
variation_attributes AS (
SELECT pas.id_product, pagl.public_name AS attribute_name,
JSON_ARRAYAGG(DISTINCT pal.name) AS attribute_values
FROM ps_product_attribute_shop pas
JOIN ps_product_attribute_combination ppac
ON ppac.id_product_attribute = pas.id_product_attribute
JOIN ps_attribute_lang pal
ON pal.id_attribute = ppac.id_attribute AND pal.id_lang = ?
JOIN ps_attribute pa
ON pa.id_attribute = ppac.id_attribute
JOIN ps_attribute_group pag
ON pag.id_attribute_group = pa.id_attribute_group
JOIN ps_attribute_group_lang pagl
ON pagl.id_attribute_group = pag.id_attribute_group AND pagl.id_lang = ?
WHERE pas.id_shop = ?
GROUP BY pas.id_product, pagl.public_name
),
variations AS (
SELECT id_product, JSON_OBJECTAGG(attribute_name, attribute_values) AS attributes
FROM variation_attributes
GROUP BY id_product
),
variation_attribute_filters AS (
SELECT pas.id_product,
JSON_ARRAYAGG(
DISTINCT CONCAT(
LOWER(REPLACE(CAST(pagl.public_name AS CHAR) COLLATE utf8mb4_unicode_ci, ' ', '_')),
':',
LOWER(REPLACE(CAST(pal.name AS CHAR) COLLATE utf8mb4_unicode_ci, ' ', '_'))
)
) AS attribute_filters
FROM ps_product_attribute_shop pas
JOIN ps_product_attribute_combination ppac
ON ppac.id_product_attribute = pas.id_product_attribute
JOIN ps_attribute_lang pal
ON pal.id_attribute = ppac.id_attribute AND pal.id_lang = ?
JOIN ps_attribute pa
ON pa.id_attribute = ppac.id_attribute
JOIN ps_attribute_group pag
ON pag.id_attribute_group = pa.id_attribute_group
JOIN ps_attribute_group_lang pagl
ON pagl.id_attribute_group = pag.id_attribute_group AND pagl.id_lang = ?
WHERE pas.id_shop = ?
GROUP BY pas.id_product
),
features AS (
SELECT pfp.id_product, JSON_OBJECTAGG(pfl.name, pfvl.value) AS features
FROM ps_feature_product pfp
JOIN ps_feature_lang pfl
ON pfl.id_feature = pfp.id_feature AND pfl.id_lang = ?
JOIN ps_feature_value_lang pfvl
ON pfvl.id_feature_value = pfp.id_feature_value AND pfvl.id_lang = ?
GROUP BY pfp.id_product
),
images AS (
SELECT id_product, id_image
FROM ps_image_shop
WHERE id_shop = ? AND cover = 1
),
categories AS (
SELECT id_product, JSON_ARRAYAGG(id_category) AS category_ids
FROM ps_category_product
GROUP BY id_product
)
SELECT pp.id_product,
pl.name,
TRIM(REGEXP_REPLACE(REGEXP_REPLACE(pl.description, '<[^>]*>', ' '), '[[:space:]]+', ' ')) AS description,
TRIM(REGEXP_REPLACE(REGEXP_REPLACE(pl.description_short, '<[^>]*>', ' '), '[[:space:]]+', ' ')) AS description_short,
TRIM(REGEXP_REPLACE(REGEXP_REPLACE(pl.usage, '<[^>]*>', ' '), '[[:space:]]+', ' ')) AS used_for,
p.ean13,
p.reference,
pp.price,
ps.id_category_default AS id_category,
cl.name AS category_name,
cl.link_rewrite as link_rewrite,
COUNT(DISTINCT pas.id_product_attribute) AS variations,
pis.id_image AS id_image,
GROUP_CONCAT(DISTINCT pcp.id_category) AS category_ids
`).
Table("ps_product_shop AS ps").
Joins("LEFT JOIN ps_product_lang AS pl ON ps.id_product = pl.id_product AND pl.id_shop = ? AND pl.id_lang = ?", constdata.SHOP_ID, id_lang).
Joins("LEFT JOIN ps_product AS p ON p.id_product = ps.id_product").
Joins("LEFT JOIN ps_category_lang AS cl ON cl.id_category = ps.id_category_default AND cl.id_shop = ? AND cl.id_lang = ?", constdata.SHOP_ID, id_lang).
Joins("LEFT JOIN ps_product_attribute_shop AS pas ON pas.id_product = ps.id_product AND pas.id_shop = ?", constdata.SHOP_ID).
Joins("JOIN ps_image_shop AS pis ON pis.id_product = ps.id_product AND pis.cover = 1").
Joins("JOIN ps_category_product AS pcp ON pcp.id_product = ps.id_product").
Where("ps.id_shop = ? AND ps.active = 1", constdata.SHOP_ID).
Group("pcp.id_product, ps.id_product").
Scan(&products).Error
if err != nil {
cl.link_rewrite,
COALESCE(vary.attributes, JSON_OBJECT()) AS attributes,
COALESCE(vaf.attribute_filters, JSON_ARRAY()) AS attribute_filters,
COALESCE(feat.features, JSON_OBJECT()) AS features,
img.id_image,
cat.category_ids,
(SELECT COUNT(*) FROM ps_product_attribute_shop pas2 WHERE pas2.id_product = pp.id_product AND pas2.id_shop = ?) AS variations
FROM products_page pp
JOIN ps_product_shop ps ON ps.id_product = pp.id_product
JOIN ps_product_lang pl
ON pl.id_product = ps.id_product AND pl.id_shop = ? AND pl.id_lang = ?
JOIN ps_product p ON p.id_product = ps.id_product
JOIN ps_category_lang cl
ON cl.id_category = ps.id_category_default AND cl.id_shop = ? AND cl.id_lang = ?
LEFT JOIN variations vary ON vary.id_product = ps.id_product
LEFT JOIN variation_attribute_filters vaf ON vaf.id_product = ps.id_product
LEFT JOIN features feat ON feat.id_product = ps.id_product
LEFT JOIN images img ON img.id_product = ps.id_product
LEFT JOIN categories cat ON cat.id_product = ps.id_product
ORDER BY ps.id_product
`,
constdata.SHOP_ID, // products_page
id_lang, id_lang, // variation_attributes pal.id_lang, pagl.id_lang
constdata.SHOP_ID, // variation_attributes pas.id_shop
id_lang, id_lang, // variation_attribute_filters pal.id_lang, pagl.id_lang
constdata.SHOP_ID, // variation_attribute_filters pas.id_shop
id_lang, id_lang, // features pfl.id_lang, pfvl.id_lang
constdata.SHOP_ID, // images id_shop
constdata.SHOP_ID, // variation count subquery
constdata.SHOP_ID, // ps_product_lang pl.id_shop
id_lang, // ps_product_lang pl.id_lang
constdata.SHOP_ID, // ps_category_lang cl.id_shop
id_lang, // ps_category_lang cl.id_lang
)
if err := query.Scan(&products).Error; err != nil {
return products, fmt.Errorf("database error: %w", err)
}
// Get all category IDs for each product (including child categories)
for i := range products {
var categoryIDs []uint
// Find all parent categories and their children using nested set
err := db.DB.
Table("ps_category AS c").
Select("c.id_category").
Joins("JOIN ps_category_product AS cp ON cp.id_category = c.id_category").
Joins("JOIN ps_category AS parent ON c.nleft >= parent.nleft AND c.nright <= parent.nright AND parent.id_category = ?", products[i].CategoryID).
Where("cp.id_product = ?", products[i].ProductID).
Group("c.id_category").
Pluck("c.id_category", &categoryIDs).Error
if err != nil {
continue // Skip if error, use default category
}
if len(categoryIDs) > 0 {
products[i].CategoryIDs = categoryIDs
} else {
products[i].CategoryIDs = []uint{products[i].CategoryID}
}
// Get cover image for the product
var imageID int
err = db.DB.
Table("ps_image AS i").
Select("i.id_image").
Joins("LEFT JOIN ps_image_shop AS iss ON iss.id_image = i.id_image AND iss.id_shop = ?", constdata.SHOP_ID).
Where("i.id_product = ? AND (i.cover = 1 OR i.cover IS TRUE)", products[i].ProductID).
Order("i.position ASC").
Limit(1).
Pluck("i.id_image", &imageID).Error
if err == nil && imageID > 0 {
products[i].CoverImage = fmt.Sprintf("%d/%d.jpg", products[i].ProductID, imageID)
}
}
return products, nil
}

3
app/repos/routesRepo/routesRepo.go
View File

@@ -3,6 +3,7 @@ package routesrepo
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/nullable"
)
type UIRoutesRepo interface {
@@ -18,7 +19,7 @@ func New() UIRoutesRepo {
func (p *RoutesRepo) GetRoutes(langId uint) ([]model.Route, error) {
routes := []model.Route{}
err := db.DB.Find(&routes).Error
err := db.DB.Find(&routes, model.Route{Active: nullable.GetNil(true)}).Error
if err != nil {
return nil, err
}