Merge branch 'main' of ssh://git.ma-al.com:8822/goc_daniel/b2b into orders
This commit is contained in:
Daniel Goc
@@ -1,48 +0,0 @@
|
||||
package categoriesRepo
|
||||
|
||||
import (
|
||||
"git.ma-al.com/goc_daniel/b2b/app/db"
|
||||
"git.ma-al.com/goc_daniel/b2b/app/model"
|
||||
"git.ma-al.com/goc_daniel/b2b/app/model/dbmodel"
|
||||
constdata "git.ma-al.com/goc_daniel/b2b/app/utils/const_data"
|
||||
)
|
||||
|
||||
type UICategoriesRepo interface {
|
||||
GetAllCategories(idLang uint) ([]model.ScannedCategory, error)
|
||||
}
|
||||
|
||||
type CategoriesRepo struct{}
|
||||
|
||||
func New() UICategoriesRepo {
|
||||
return &CategoriesRepo{}
|
||||
}
|
||||
|
||||
func (r *CategoriesRepo) GetAllCategories(idLang uint) ([]model.ScannedCategory, error) {
|
||||
var allCategories []model.ScannedCategory
|
||||
|
||||
categoryTbl := (&dbmodel.PsCategory{}).TableName()
|
||||
categoryLangTbl := (&dbmodel.PsCategoryLang{}).TableName()
|
||||
categoryShopTbl := (&dbmodel.PsCategoryShop{}).TableName()
|
||||
langTbl := (&dbmodel.PsLang{}).TableName()
|
||||
|
||||
err := db.Get().
|
||||
Model(dbmodel.PsCategory{}).
|
||||
Select(`
|
||||
ps_category.id_category AS category_id,
|
||||
ps_category_lang.name AS name,
|
||||
ps_category.active AS active,
|
||||
ps_category_shop.position AS position,
|
||||
ps_category.id_parent AS id_parent,
|
||||
ps_category.is_root_category AS is_root_category,
|
||||
ps_category_lang.link_rewrite AS link_rewrite,
|
||||
ps_lang.iso_code AS iso_code
|
||||
`).
|
||||
Joins(`LEFT JOIN `+categoryLangTbl+` ON `+categoryLangTbl+`.id_category = `+categoryTbl+`.id_category AND `+categoryLangTbl+`.id_shop = ? AND `+categoryLangTbl+`.id_lang = ?`,
|
||||
constdata.SHOP_ID, idLang).
|
||||
Joins(`LEFT JOIN `+categoryShopTbl+` ON `+categoryShopTbl+`.id_category = `+categoryTbl+`.id_category AND `+categoryShopTbl+`.id_shop = ?`,
|
||||
constdata.SHOP_ID).
|
||||
Joins(`JOIN ` + langTbl + ` ON ` + langTbl + `.id_lang = ` + categoryLangTbl + `.id_lang`).
|
||||
Scan(&allCategories).Error
|
||||
|
||||
return allCategories, err
|
||||
}
|
||||
@@ -2,11 +2,14 @@ package categoryrepo
|
||||
|
||||
import (
|
||||
"git.ma-al.com/goc_daniel/b2b/app/db"
|
||||
"git.ma-al.com/goc_daniel/b2b/app/model"
|
||||
"git.ma-al.com/goc_daniel/b2b/app/model/dbmodel"
|
||||
constdata "git.ma-al.com/goc_daniel/b2b/app/utils/const_data"
|
||||
)
|
||||
|
||||
type UICategoryRepo interface {
|
||||
GetCategoryTranslations(ids []uint, idLang uint) (map[uint]string, error)
|
||||
RetrieveMenuCategories(idLang uint) ([]model.ScannedCategory, error)
|
||||
}
|
||||
|
||||
type CategoryRepo struct{}
|
||||
@@ -42,3 +45,33 @@ func (r *CategoryRepo) GetCategoryTranslations(ids []uint, idLang uint) (map[uin
|
||||
|
||||
return translations, nil
|
||||
}
|
||||
|
||||
func (r *CategoryRepo) RetrieveMenuCategories(idLang uint) ([]model.ScannedCategory, error) {
|
||||
var allCategories []model.ScannedCategory
|
||||
|
||||
categoryTbl := (&dbmodel.PsCategory{}).TableName()
|
||||
categoryLangTbl := (&dbmodel.PsCategoryLang{}).TableName()
|
||||
categoryShopTbl := (&dbmodel.PsCategoryShop{}).TableName()
|
||||
langTbl := (&dbmodel.PsLang{}).TableName()
|
||||
|
||||
err := db.Get().
|
||||
Model(dbmodel.PsCategory{}).
|
||||
Select(`
|
||||
ps_category.id_category AS category_id,
|
||||
ps_category_lang.name AS name,
|
||||
ps_category.active AS active,
|
||||
ps_category_shop.position AS position,
|
||||
ps_category.id_parent AS id_parent,
|
||||
ps_category.is_root_category AS is_root_category,
|
||||
ps_category_lang.link_rewrite AS link_rewrite,
|
||||
ps_lang.iso_code AS iso_code
|
||||
`).
|
||||
Joins(`LEFT JOIN `+categoryLangTbl+` ON `+categoryLangTbl+`.id_category = `+categoryTbl+`.id_category AND `+categoryLangTbl+`.id_shop = ? AND `+categoryLangTbl+`.id_lang = ?`,
|
||||
constdata.SHOP_ID, idLang).
|
||||
Joins(`LEFT JOIN `+categoryShopTbl+` ON `+categoryShopTbl+`.id_category = `+categoryTbl+`.id_category AND `+categoryShopTbl+`.id_shop = ?`,
|
||||
constdata.SHOP_ID).
|
||||
Joins(`JOIN ` + langTbl + ` ON ` + langTbl + `.id_lang = ` + categoryLangTbl + `.id_lang`).
|
||||
Scan(&allCategories).Error
|
||||
|
||||
return allCategories, err
|
||||
}
|
||||
|
||||
@@ -9,7 +9,6 @@ import (
|
||||
"git.ma-al.com/goc_daniel/b2b/app/model"
|
||||
"git.ma-al.com/goc_daniel/b2b/app/model/dbmodel"
|
||||
constdata "git.ma-al.com/goc_daniel/b2b/app/utils/const_data"
|
||||
"github.com/WinterYukky/gorm-extra-clause-plugin/exclause"
|
||||
"gorm.io/gorm"
|
||||
)
|
||||
|
||||
@@ -17,7 +16,6 @@ type UIProductDescriptionRepo interface {
|
||||
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, offset, limit int) ([]model.MeiliSearchProduct, error)
|
||||
}
|
||||
|
||||
type ProductDescriptionRepo struct{}
|
||||
@@ -118,108 +116,3 @@ func (r *ProductDescriptionRepo) UpdateFields(productID uint, productid_lang uin
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
// GetMeiliProductsBatchedScanned returns a batch of products with LIMIT/OFFSET pagination
|
||||
// The scanning is done inside the repo to keep the service layer cleaner
|
||||
func (r *ProductDescriptionRepo) GetMeiliProducts(id_lang uint, offset, limit int) ([]model.MeiliSearchProduct, error) {
|
||||
|
||||
var products []model.MeiliSearchProduct
|
||||
|
||||
err := db.Get().
|
||||
Table("ps_product_shop ps").
|
||||
Select(`
|
||||
ps.id_product AS id_product,
|
||||
pl.name AS name,
|
||||
TRIM(REGEXP_REPLACE(REGEXP_REPLACE(pl.description_short, '<[^>]*>', ' '), '[[:space:]]+', ' ')) AS description,
|
||||
p.ean13,
|
||||
p.reference,
|
||||
ps.price,
|
||||
ps.id_category_default AS id_category,
|
||||
cl.name AS cat_name,
|
||||
cl.link_rewrite AS l_rew,
|
||||
COALESCE(vary.attributes, JSON_OBJECT()) AS attr,
|
||||
COALESCE(feat.features, JSON_OBJECT()) AS feat,
|
||||
img.id_image,
|
||||
cat.category_ids,
|
||||
(SELECT COUNT(*) FROM ps_product_attribute_shop pas2 WHERE pas2.id_product = ps.id_product AND pas2.id_shop = ?) AS variations
|
||||
`, constdata.SHOP_ID).
|
||||
Joins("JOIN ps_product p ON p.id_product = ps.id_product").
|
||||
Joins("JOIN ps_product_lang pl ON pl.id_product = ps.id_product AND pl.id_shop = ? AND pl.id_lang = ?", constdata.SHOP_ID, id_lang).
|
||||
Joins("JOIN ps_category_lang 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 variations vary ON vary.id_product = ps.id_product").
|
||||
Joins("LEFT JOIN features feat ON feat.id_product = ps.id_product").
|
||||
Joins("LEFT JOIN images img ON img.id_product = ps.id_product").
|
||||
Joins("LEFT JOIN categories cat ON cat.id_product = ps.id_product").
|
||||
Joins("JOIN products_page pp ON pp.id_product = ps.id_product").
|
||||
Where("ps.active = ?", 1).
|
||||
Order("ps.id_product").
|
||||
Clauses(exclause.With{CTEs: []exclause.CTE{
|
||||
{
|
||||
Name: "products_page",
|
||||
Subquery: exclause.Subquery{
|
||||
DB: db.Get().
|
||||
Model(&dbmodel.PsProductShop{}).
|
||||
Select("id_product, price").
|
||||
Where("id_shop = ? AND active = 1", constdata.SHOP_ID).
|
||||
Order("id_product").
|
||||
Limit(limit).
|
||||
Offset(offset),
|
||||
},
|
||||
},
|
||||
{
|
||||
Name: "variation_attributes",
|
||||
Subquery: exclause.Subquery{
|
||||
DB: db.Get().
|
||||
Table("ps_product_attribute_shop pas"). // <- explicit alias here
|
||||
Select(`
|
||||
pas.id_product,
|
||||
pag.id_attribute_group AS attribute_name,
|
||||
JSON_ARRAYAGG(DISTINCT pa.id_attribute) AS attribute_values
|
||||
`).
|
||||
Joins("JOIN ps_product_attribute_combination ppac ON ppac.id_product_attribute = pas.id_product_attribute").
|
||||
Joins("JOIN ps_attribute pa ON pa.id_attribute = ppac.id_attribute").
|
||||
Joins("JOIN ps_attribute_group pag ON pag.id_attribute_group = pa.id_attribute_group").
|
||||
Where("pas.id_shop = ?", constdata.SHOP_ID).
|
||||
Group("pas.id_product, pag.id_attribute_group"),
|
||||
},
|
||||
},
|
||||
{
|
||||
Name: "variations",
|
||||
Subquery: exclause.Subquery{
|
||||
DB: db.Get().
|
||||
Table("variation_attributes").
|
||||
Select("id_product, JSON_OBJECTAGG(attribute_name, attribute_values) AS attributes").
|
||||
Group("id_product"),
|
||||
},
|
||||
},
|
||||
{
|
||||
Name: "features",
|
||||
Subquery: exclause.Subquery{
|
||||
DB: db.Get().
|
||||
Table("ps_feature_product pfp"). // <- explicit alias
|
||||
Select("pfp.id_product, JSON_OBJECTAGG(pfp.id_feature, pfp.id_feature_value) AS features").
|
||||
Group("pfp.id_product"),
|
||||
},
|
||||
},
|
||||
{
|
||||
Name: "images",
|
||||
Subquery: exclause.Subquery{
|
||||
DB: db.Get().
|
||||
Model(&dbmodel.PsImageShop{}).
|
||||
Select("id_product, id_image").
|
||||
Where("id_shop = ? AND cover = 1", constdata.SHOP_ID),
|
||||
},
|
||||
},
|
||||
{
|
||||
Name: "categories",
|
||||
Subquery: exclause.Subquery{
|
||||
DB: db.Get().
|
||||
Model(&dbmodel.PsCategoryProduct{}).
|
||||
Select("id_product, JSON_ARRAYAGG(id_category) AS category_ids").
|
||||
Group("id_product"),
|
||||
},
|
||||
},
|
||||
}}).Find(&products).Error
|
||||
|
||||
return products, err
|
||||
}
|
||||
|
||||
@@ -2,7 +2,6 @@ package productsRepo
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
|
||||
"git.ma-al.com/goc_daniel/b2b/app/config"
|
||||
"git.ma-al.com/goc_daniel/b2b/app/db"
|
||||
@@ -10,13 +9,18 @@ import (
|
||||
"git.ma-al.com/goc_daniel/b2b/app/model/dbmodel"
|
||||
"git.ma-al.com/goc_daniel/b2b/app/utils/query/filters"
|
||||
"git.ma-al.com/goc_daniel/b2b/app/utils/query/find"
|
||||
"git.ma-al.com/goc_daniel/b2b/app/view"
|
||||
"git.ma-al.com/goc_marek/gormcol"
|
||||
"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, userID uint, p find.Paging, filt *filters.FiltersList) (find.Found[model.ProductInList], error)
|
||||
// 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, userID uint, p find.Paging, filt *filters.FiltersList) (*find.Found[model.ProductInList], error)
|
||||
GetProductVariants(langID uint, productID uint, shopID uint, customerID uint, countryID uint, quantity uint) ([]view.ProductAttribute, error)
|
||||
GetBase(p_id_product, p_id_shop, p_id_lang uint) (view.Product, error)
|
||||
GetPrice(p_id_product uint, productAttributeID *uint, p_id_shop uint, p_id_customer uint, p_id_country uint, p_quantity uint) (view.Price, error)
|
||||
GetVariants(p_id_product, p_id_shop, p_id_lang, p_id_customer, p_id_country, p_quantity uint) ([]view.ProductAttribute, error)
|
||||
AddToFavorites(userID uint, productID uint) error
|
||||
RemoveFromFavorites(userID uint, productID uint) error
|
||||
ExistsInFavorites(userID uint, productID uint) (bool, error)
|
||||
@@ -29,105 +33,221 @@ func New() UIProductsRepo {
|
||||
return &ProductsRepo{}
|
||||
}
|
||||
|
||||
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
|
||||
func (repo *ProductsRepo) GetBase(p_id_product, p_id_shop, p_id_lang uint) (view.Product, error) {
|
||||
var result view.Product
|
||||
|
||||
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
|
||||
err := db.DB.Raw(`CALL get_product_base(?,?,?)`,
|
||||
p_id_product, p_id_shop, p_id_lang).
|
||||
Scan(&result).Error
|
||||
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
if !json.Valid([]byte(productStr)) {
|
||||
return nil, fmt.Errorf("invalid json returned from stored procedure")
|
||||
}
|
||||
|
||||
raw := json.RawMessage(productStr)
|
||||
return &raw, nil
|
||||
return result, err
|
||||
}
|
||||
|
||||
func (repo *ProductsRepo) Find(id_lang, userID uint, p find.Paging, filt *filters.FiltersList) (find.Found[model.ProductInList], error) {
|
||||
var list []model.ProductInList
|
||||
var total int64
|
||||
func (repo *ProductsRepo) GetPrice(
|
||||
p_id_product uint, productAttributeID *uint, p_id_shop uint, p_id_customer uint, p_id_country uint, p_quantity uint,
|
||||
) (view.Price, error) {
|
||||
|
||||
query := db.Get().
|
||||
Table(gormcol.Field.Tab(dbmodel.PsProductShopCols.Active)+" AS ps").
|
||||
Select(`
|
||||
ps.id_product AS product_id,
|
||||
pl.name AS name,
|
||||
pl.link_rewrite AS link_rewrite,
|
||||
CONCAT(?, '/', ims.id_image, '-small_default/', pl.link_rewrite, '.webp') AS image_link,
|
||||
cl.name AS category_name,
|
||||
p.reference AS reference,
|
||||
COALESCE(v.variants_number, 0) AS variants_number,
|
||||
sa.quantity AS quantity,
|
||||
COALESCE(f.is_favorite, 0) AS is_favorite
|
||||
`, config.Get().Image.ImagePrefix).
|
||||
Joins("JOIN "+dbmodel.PsProductCols.IDProduct.Tab()+" p ON p.id_product = ps.id_product").
|
||||
Joins("JOIN ps_product_lang pl ON pl.id_product = ps.id_product AND pl.id_lang = ?", id_lang).
|
||||
Joins("JOIN ps_image_shop ims ON ims.id_product = ps.id_product AND ims.cover = 1").
|
||||
Joins("JOIN ps_category_lang cl ON cl.id_category = ps.id_category_default AND cl.id_lang = ?", id_lang).
|
||||
Joins("JOIN ps_category_product cp ON cp.id_product = ps.id_product").
|
||||
Joins("LEFT JOIN variants v ON v.id_product = ps.id_product").
|
||||
Joins("LEFT JOIN favorites f ON f.id_product = ps.id_product").
|
||||
Joins("LEFT JOIN ps_stock_available sa ON sa.id_product = ps.id_product AND sa.id_product_attribute = 0").
|
||||
Where("ps.active = ?", 1).
|
||||
Group("ps.id_product").
|
||||
type row struct {
|
||||
Price json.RawMessage `gorm:"column:price"`
|
||||
}
|
||||
|
||||
var r row
|
||||
err := db.DB.Raw(`
|
||||
SELECT fn_product_price(?,?,?,?,?,?) AS price`,
|
||||
p_id_product, p_id_shop, p_id_customer, p_id_country, p_quantity, productAttributeID).
|
||||
Scan(&r).Error
|
||||
|
||||
if err != nil {
|
||||
return view.Price{}, err
|
||||
}
|
||||
|
||||
var temp struct {
|
||||
Base json.Number `json:"base"`
|
||||
FinalTaxExcl json.Number `json:"final_tax_excl"`
|
||||
FinalTaxIncl json.Number `json:"final_tax_incl"`
|
||||
TaxRate json.Number `json:"tax_rate"`
|
||||
Priority json.Number `json:"priority"`
|
||||
}
|
||||
|
||||
if err := json.Unmarshal(r.Price, &temp); err != nil {
|
||||
return view.Price{}, err
|
||||
}
|
||||
|
||||
price := view.Price{
|
||||
Base: mustParseFloat(temp.Base),
|
||||
FinalTaxExcl: mustParseFloat(temp.FinalTaxExcl),
|
||||
FinalTaxIncl: mustParseFloat(temp.FinalTaxIncl),
|
||||
TaxRate: mustParseFloat(temp.TaxRate),
|
||||
Priority: mustParseInt(temp.Priority),
|
||||
}
|
||||
|
||||
return price, nil
|
||||
}
|
||||
func mustParseFloat(n json.Number) float64 {
|
||||
f, _ := n.Float64()
|
||||
return f
|
||||
}
|
||||
|
||||
func mustParseInt(n json.Number) int {
|
||||
i, _ := n.Int64()
|
||||
return int(i)
|
||||
}
|
||||
func (repo *ProductsRepo) GetVariants(p_id_product, p_id_shop, p_id_lang, p_id_customer, p_id_country, p_quantity uint) ([]view.ProductAttribute, error) {
|
||||
|
||||
var results []view.ProductAttribute
|
||||
|
||||
err := db.DB.Raw(`
|
||||
CALL get_product_variants(?,?,?,?,?,?)`,
|
||||
p_id_product, p_id_shop, p_id_lang, p_id_customer, p_id_country, p_quantity).
|
||||
Scan(&results).Error
|
||||
|
||||
return results, err
|
||||
}
|
||||
|
||||
func (repo *ProductsRepo) Find(langID uint, userID uint, p find.Paging, filt *filters.FiltersList) (*find.Found[model.ProductInList], error) {
|
||||
query := db.DB.
|
||||
Table("base_products AS bp").
|
||||
Clauses(exclause.With{
|
||||
CTEs: []exclause.CTE{
|
||||
{
|
||||
Name: "variants",
|
||||
Subquery: exclause.Subquery{
|
||||
DB: db.Get().
|
||||
Model(&dbmodel.PsProductAttributeShop{}).
|
||||
Select("id_product", "COUNT(*) AS variants_number").
|
||||
Group("id_product"),
|
||||
},
|
||||
},
|
||||
|
||||
{
|
||||
Name: "favorites",
|
||||
Subquery: exclause.Subquery{
|
||||
DB: db.Get().
|
||||
DB: db.DB.
|
||||
Table("b2b_favorites").
|
||||
Select(`
|
||||
product_id AS id_product,
|
||||
product_id AS product_id,
|
||||
COUNT(*) > 0 AS is_favorite
|
||||
`).
|
||||
Where("user_id = ?", userID).
|
||||
Group("product_id"),
|
||||
},
|
||||
},
|
||||
{
|
||||
Name: "new_product_days",
|
||||
Subquery: exclause.Subquery{
|
||||
DB: db.DB.
|
||||
Table("ps_configuration").
|
||||
Select("CAST(value AS SIGNED) AS days").
|
||||
Where("name = ?", "PS_NB_DAYS_NEW_PRODUCT"),
|
||||
},
|
||||
},
|
||||
{
|
||||
Name: "variants",
|
||||
Subquery: exclause.Subquery{
|
||||
DB: db.DB.
|
||||
Table("ps_product_attribute_shop").
|
||||
Select("id_product, COUNT(*) AS variants_number").
|
||||
Group("id_product"),
|
||||
},
|
||||
},
|
||||
{
|
||||
Name: "base_products",
|
||||
Subquery: exclause.Subquery{
|
||||
DB: db.DB.
|
||||
Table(gormcol.Field.Tab(dbmodel.PsProductShopCols.Active)+" AS ps").
|
||||
Select(`
|
||||
ps.id_product AS product_id,
|
||||
pl.name AS name,
|
||||
ps.id_category_default AS category_id,
|
||||
p.reference AS reference,
|
||||
sa.quantity AS quantity,
|
||||
COALESCE(f.is_favorite, 0) AS is_favorite,
|
||||
CASE
|
||||
WHEN ps.date_add >= DATE_SUB(
|
||||
NOW(),
|
||||
INTERVAL COALESCE(npd.days, 20) DAY
|
||||
) AND ps.active = 1
|
||||
THEN 1
|
||||
ELSE 0
|
||||
END AS is_new
|
||||
`).
|
||||
Joins("JOIN "+dbmodel.PsProductCols.IDProduct.Tab()+" p ON p.id_product = ps.id_product").
|
||||
Joins("JOIN ps_product_lang pl ON pl.id_product = ps.id_product AND pl.id_lang = ?", langID).
|
||||
Joins("LEFT JOIN favorites f ON f.product_id = ps.id_product").
|
||||
Joins("LEFT JOIN ps_stock_available sa ON sa.id_product = ps.id_product AND sa.id_product_attribute = 0").
|
||||
Joins("LEFT JOIN new_product_days npd ON 1 = 1").
|
||||
Where("ps.active = ?", 1).
|
||||
Group("ps.id_product"),
|
||||
},
|
||||
},
|
||||
},
|
||||
}).
|
||||
Order("ps.id_product DESC")
|
||||
Select(`
|
||||
bp.product_id AS product_id,
|
||||
bp.name AS name,
|
||||
pl.link_rewrite AS link_rewrite,
|
||||
CONCAT(?, '/', ims.id_image, '-small_default/', pl.link_rewrite, '.webp') AS image_link,
|
||||
cl.name AS category_name,
|
||||
bp.reference AS reference,
|
||||
COALESCE(v.variants_number, 0) AS variants_number,
|
||||
bp.quantity AS quantity,
|
||||
bp.is_favorite AS is_favorite,
|
||||
bp.is_new AS is_new
|
||||
`, config.Get().Image.ImagePrefix).
|
||||
Joins("JOIN ps_product_lang pl ON pl.id_product = bp.product_id AND pl.id_lang = ?", langID).
|
||||
Joins("JOIN ps_image_shop ims ON ims.id_product = bp.product_id AND ims.cover = 1").
|
||||
Joins("JOIN ps_category_lang cl ON cl.id_category = bp.category_id AND cl.id_lang = ?", langID).
|
||||
Joins("LEFT JOIN variants v ON v.id_product = bp.product_id").
|
||||
Order("bp.product_id DESC")
|
||||
|
||||
// Apply all filters
|
||||
if filt != nil {
|
||||
filt.ApplyAll(query)
|
||||
}
|
||||
query = query.Scopes(filt.All()...)
|
||||
|
||||
// run counter first as query is without limit and offset
|
||||
err := query.Count(&total).Error
|
||||
list, err := find.Paginate[model.ProductInList](langID, p, query)
|
||||
if err != nil {
|
||||
return find.Found[model.ProductInList]{}, err
|
||||
return nil, err
|
||||
}
|
||||
return &list, nil
|
||||
}
|
||||
|
||||
func (repo *ProductsRepo) GetProductVariants(langID uint, productID uint, shopID uint, customerID uint, countryID uint, quantity uint) ([]view.ProductAttribute, error) {
|
||||
var result []view.ProductAttribute
|
||||
err := db.DB.
|
||||
Raw(`
|
||||
CALL get_product_attributes_with_price(?, ?, ?, ?, ?, ?)
|
||||
`,
|
||||
langID,
|
||||
productID,
|
||||
shopID,
|
||||
customerID,
|
||||
countryID,
|
||||
quantity,
|
||||
).
|
||||
Scan(&result).Error
|
||||
|
||||
err = query.
|
||||
Limit(p.Limit()).
|
||||
Offset(p.Offset()).
|
||||
Find(&list).Error
|
||||
if err != nil {
|
||||
return find.Found[model.ProductInList]{}, err
|
||||
return nil, err
|
||||
}
|
||||
|
||||
return find.Found[model.ProductInList]{
|
||||
Items: list,
|
||||
Count: uint(total),
|
||||
}, nil
|
||||
return result, nil
|
||||
}
|
||||
|
||||
func (repo *ProductsRepo) PopulateProductPrice(product *model.ProductInList, targetCustomer *model.Customer, quantity int, shopID uint) error {
|
||||
row := db.Get().Raw(
|
||||
"CALL get_product_price(?, ?, ?, ?, ?)",
|
||||
product.ProductID,
|
||||
shopID,
|
||||
targetCustomer.ID,
|
||||
targetCustomer.CountryID,
|
||||
quantity,
|
||||
).Row()
|
||||
|
||||
var (
|
||||
id uint
|
||||
base float64
|
||||
excl float64
|
||||
incl float64
|
||||
tax float64
|
||||
)
|
||||
|
||||
err := row.Scan(&id, &base, &excl, &incl, &tax)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
product.PriceTaxExcl = excl
|
||||
product.PriceTaxIncl = incl
|
||||
return nil
|
||||
|
||||
}
|
||||
|
||||
func (repo *ProductsRepo) AddToFavorites(userID uint, productID uint) error {
|
||||
|
||||
@@ -7,7 +7,11 @@ import (
|
||||
"net/http"
|
||||
|
||||
"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"
|
||||
constdata "git.ma-al.com/goc_daniel/b2b/app/utils/const_data"
|
||||
"github.com/WinterYukky/gorm-extra-clause-plugin/exclause"
|
||||
)
|
||||
|
||||
type SearchProxyResponse struct {
|
||||
@@ -17,6 +21,7 @@ type SearchProxyResponse struct {
|
||||
|
||||
type UISearchRepo interface {
|
||||
Search(index string, body []byte) (*SearchProxyResponse, error)
|
||||
GetMeiliProducts(id_lang uint, offset, limit int) ([]model.MeiliSearchProduct, error)
|
||||
GetIndexSettings(index string) (*SearchProxyResponse, error)
|
||||
GetRoutes(langId uint) ([]model.Route, error)
|
||||
}
|
||||
@@ -80,3 +85,108 @@ func (r *SearchRepo) doRequest(method, url string, body []byte) (*SearchProxyRes
|
||||
func (r *SearchRepo) GetRoutes(langId uint) ([]model.Route, error) {
|
||||
return nil, nil
|
||||
}
|
||||
|
||||
// GetMeiliProductsProducts returns a batch of products with LIMIT/OFFSET pagination
|
||||
// The scanning is done inside the repo to keep the service layer cleaner
|
||||
func (r *SearchRepo) GetMeiliProducts(id_lang uint, offset, limit int) ([]model.MeiliSearchProduct, error) {
|
||||
|
||||
var products []model.MeiliSearchProduct
|
||||
|
||||
err := db.Get().
|
||||
Table("ps_product_shop ps").
|
||||
Select(`
|
||||
ps.id_product AS id_product,
|
||||
pl.name AS name,
|
||||
TRIM(REGEXP_REPLACE(REGEXP_REPLACE(pl.description_short, '<[^>]*>', ' '), '[[:space:]]+', ' ')) AS description,
|
||||
p.ean13,
|
||||
p.reference,
|
||||
ps.price,
|
||||
ps.id_category_default AS id_category,
|
||||
cl.name AS cat_name,
|
||||
cl.link_rewrite AS l_rew,
|
||||
COALESCE(vary.attributes, JSON_OBJECT()) AS attr,
|
||||
COALESCE(feat.features, JSON_OBJECT()) AS feat,
|
||||
img.id_image,
|
||||
cat.category_ids,
|
||||
(SELECT COUNT(*) FROM ps_product_attribute_shop pas2 WHERE pas2.id_product = ps.id_product AND pas2.id_shop = ?) AS variations
|
||||
`, constdata.SHOP_ID).
|
||||
Joins("JOIN ps_product p ON p.id_product = ps.id_product").
|
||||
Joins("JOIN ps_product_lang pl ON pl.id_product = ps.id_product AND pl.id_shop = ? AND pl.id_lang = ?", constdata.SHOP_ID, id_lang).
|
||||
Joins("JOIN ps_category_lang 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 variations vary ON vary.id_product = ps.id_product").
|
||||
Joins("LEFT JOIN features feat ON feat.id_product = ps.id_product").
|
||||
Joins("LEFT JOIN images img ON img.id_product = ps.id_product").
|
||||
Joins("LEFT JOIN categories cat ON cat.id_product = ps.id_product").
|
||||
Joins("JOIN products_page pp ON pp.id_product = ps.id_product").
|
||||
Where("ps.active = ?", 1).
|
||||
Order("ps.id_product").
|
||||
Clauses(exclause.With{CTEs: []exclause.CTE{
|
||||
{
|
||||
Name: "products_page",
|
||||
Subquery: exclause.Subquery{
|
||||
DB: db.Get().
|
||||
Model(&dbmodel.PsProductShop{}).
|
||||
Select("id_product, price").
|
||||
Where("id_shop = ? AND active = 1", constdata.SHOP_ID).
|
||||
Order("id_product").
|
||||
Limit(limit).
|
||||
Offset(offset),
|
||||
},
|
||||
},
|
||||
{
|
||||
Name: "variation_attributes",
|
||||
Subquery: exclause.Subquery{
|
||||
DB: db.Get().
|
||||
Table("ps_product_attribute_shop pas"). // <- explicit alias here
|
||||
Select(`
|
||||
pas.id_product,
|
||||
pag.id_attribute_group AS attribute_name,
|
||||
JSON_ARRAYAGG(DISTINCT pa.id_attribute) AS attribute_values
|
||||
`).
|
||||
Joins("JOIN ps_product_attribute_combination ppac ON ppac.id_product_attribute = pas.id_product_attribute").
|
||||
Joins("JOIN ps_attribute pa ON pa.id_attribute = ppac.id_attribute").
|
||||
Joins("JOIN ps_attribute_group pag ON pag.id_attribute_group = pa.id_attribute_group").
|
||||
Where("pas.id_shop = ?", constdata.SHOP_ID).
|
||||
Group("pas.id_product, pag.id_attribute_group"),
|
||||
},
|
||||
},
|
||||
{
|
||||
Name: "variations",
|
||||
Subquery: exclause.Subquery{
|
||||
DB: db.Get().
|
||||
Table("variation_attributes").
|
||||
Select("id_product, JSON_OBJECTAGG(attribute_name, attribute_values) AS attributes").
|
||||
Group("id_product"),
|
||||
},
|
||||
},
|
||||
{
|
||||
Name: "features",
|
||||
Subquery: exclause.Subquery{
|
||||
DB: db.Get().
|
||||
Table("ps_feature_product pfp"). // <- explicit alias
|
||||
Select("pfp.id_product, JSON_OBJECTAGG(pfp.id_feature, pfp.id_feature_value) AS features").
|
||||
Group("pfp.id_product"),
|
||||
},
|
||||
},
|
||||
{
|
||||
Name: "images",
|
||||
Subquery: exclause.Subquery{
|
||||
DB: db.Get().
|
||||
Model(&dbmodel.PsImageShop{}).
|
||||
Select("id_product, id_image").
|
||||
Where("id_shop = ? AND cover = 1", constdata.SHOP_ID),
|
||||
},
|
||||
},
|
||||
{
|
||||
Name: "categories",
|
||||
Subquery: exclause.Subquery{
|
||||
DB: db.Get().
|
||||
Model(&dbmodel.PsCategoryProduct{}).
|
||||
Select("id_product, JSON_ARRAYAGG(id_category) AS category_ids").
|
||||
Group("id_product"),
|
||||
},
|
||||
},
|
||||
}}).Find(&products).Error
|
||||
|
||||
return products, err
|
||||
}
|
||||
|
||||
247
app/repos/specificPriceRepo/specificPriceRepo.go
Normal file
247
app/repos/specificPriceRepo/specificPriceRepo.go
Normal file
@@ -0,0 +1,247 @@
|
||||
package specificPriceRepo
|
||||
|
||||
import (
|
||||
"context"
|
||||
"errors"
|
||||
"time"
|
||||
|
||||
"git.ma-al.com/goc_daniel/b2b/app/db"
|
||||
"git.ma-al.com/goc_daniel/b2b/app/model"
|
||||
"gorm.io/gorm"
|
||||
)
|
||||
|
||||
type UISpecificPriceRepo interface {
|
||||
Create(ctx context.Context, pr *model.SpecificPrice) error
|
||||
Update(ctx context.Context, pr *model.SpecificPrice) error
|
||||
Delete(ctx context.Context, id uint64) error
|
||||
GetByID(ctx context.Context, id uint64) (*model.SpecificPrice, error)
|
||||
List(ctx context.Context) ([]*model.SpecificPrice, error)
|
||||
SetActive(ctx context.Context, id uint64, active bool) error
|
||||
}
|
||||
|
||||
type SpecificPriceRepo struct{}
|
||||
|
||||
func New() UISpecificPriceRepo {
|
||||
return &SpecificPriceRepo{}
|
||||
}
|
||||
|
||||
func (repo *SpecificPriceRepo) Create(ctx context.Context, pr *model.SpecificPrice) error {
|
||||
return db.DB.WithContext(ctx).Transaction(func(tx *gorm.DB) error {
|
||||
now := time.Now()
|
||||
pr.CreatedAt = &now
|
||||
|
||||
if err := tx.Create(pr).Error; err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
return repo.insertRelations(tx, pr)
|
||||
})
|
||||
}
|
||||
|
||||
func (repo *SpecificPriceRepo) Update(ctx context.Context, pr *model.SpecificPrice) error {
|
||||
return db.DB.WithContext(ctx).Transaction(func(tx *gorm.DB) error {
|
||||
now := time.Now()
|
||||
pr.UpdatedAt = &now
|
||||
|
||||
if err := tx.Save(pr).Error; err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
if err := repo.clearRelations(tx, pr.ID); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
return repo.insertRelations(tx, pr)
|
||||
})
|
||||
}
|
||||
|
||||
func (repo *SpecificPriceRepo) GetByID(ctx context.Context, id uint64) (*model.SpecificPrice, error) {
|
||||
var pr model.SpecificPrice
|
||||
err := db.DB.WithContext(ctx).Where("id = ?", id).First(&pr).Error
|
||||
if err != nil {
|
||||
if errors.Is(err, gorm.ErrRecordNotFound) {
|
||||
return nil, nil
|
||||
}
|
||||
return nil, err
|
||||
}
|
||||
|
||||
if err := repo.loadRelations(ctx, &pr); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
return &pr, nil
|
||||
}
|
||||
|
||||
func (repo *SpecificPriceRepo) List(ctx context.Context) ([]*model.SpecificPrice, error) {
|
||||
var specificPrices []*model.SpecificPrice
|
||||
err := db.DB.WithContext(ctx).Find(&specificPrices).Error
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
for i := range specificPrices {
|
||||
if err := repo.loadRelations(ctx, specificPrices[i]); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
}
|
||||
|
||||
return specificPrices, nil
|
||||
}
|
||||
|
||||
func (repo *SpecificPriceRepo) SetActive(ctx context.Context, id uint64, active bool) error {
|
||||
return db.DB.WithContext(ctx).Model(&model.SpecificPrice{}).Where("id = ?", id).Update("is_active", active).Error
|
||||
}
|
||||
|
||||
func (repo *SpecificPriceRepo) Delete(ctx context.Context, id uint64) error {
|
||||
return db.DB.WithContext(ctx).Transaction(func(tx *gorm.DB) error {
|
||||
if err := tx.Exec("DELETE FROM b2b_specific_price_product WHERE b2b_specific_price_id = ?", id).Error; err != nil {
|
||||
return err
|
||||
}
|
||||
if err := tx.Exec("DELETE FROM b2b_specific_price_category WHERE b2b_specific_price_id = ?", id).Error; err != nil {
|
||||
return err
|
||||
}
|
||||
if err := tx.Exec("DELETE FROM b2b_specific_price_product_attribute WHERE b2b_specific_price_id = ?", id).Error; err != nil {
|
||||
return err
|
||||
}
|
||||
if err := tx.Exec("DELETE FROM b2b_specific_price_country WHERE b2b_specific_price_id = ?", id).Error; err != nil {
|
||||
return err
|
||||
}
|
||||
if err := tx.Exec("DELETE FROM b2b_specific_price_customer WHERE b2b_specific_price_id = ?", id).Error; err != nil {
|
||||
return err
|
||||
}
|
||||
if err := tx.Delete(&model.SpecificPrice{}, "id = ?", id).Error; err != nil {
|
||||
return err
|
||||
}
|
||||
return nil
|
||||
})
|
||||
}
|
||||
|
||||
func (repo *SpecificPriceRepo) insertRelations(tx *gorm.DB, pr *model.SpecificPrice) error {
|
||||
if len(pr.ProductIDs) > 0 {
|
||||
for _, productID := range pr.ProductIDs {
|
||||
if err := tx.Exec(`
|
||||
INSERT INTO b2b_specific_price_product (b2b_specific_price_id, id_product) VALUES (?, ?)
|
||||
`, pr.ID, productID).Error; err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if len(pr.CategoryIDs) > 0 {
|
||||
for _, categoryID := range pr.CategoryIDs {
|
||||
if err := tx.Exec(`
|
||||
INSERT INTO b2b_specific_price_category (b2b_specific_price_id, id_category) VALUES (?, ?)
|
||||
`, pr.ID, categoryID).Error; err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if len(pr.ProductAttributeIDs) > 0 {
|
||||
for _, attrID := range pr.ProductAttributeIDs {
|
||||
if err := tx.Exec(`
|
||||
INSERT INTO b2b_specific_price_product_attribute (b2b_specific_price_id, id_product_attribute) VALUES (?, ?)
|
||||
`, pr.ID, attrID).Error; err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if len(pr.CountryIDs) > 0 {
|
||||
for _, countryID := range pr.CountryIDs {
|
||||
if err := tx.Exec(`
|
||||
INSERT INTO b2b_specific_price_country (b2b_specific_price_id, b2b_id_country) VALUES (?, ?)
|
||||
`, pr.ID, countryID).Error; err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if len(pr.CustomerIDs) > 0 {
|
||||
for _, customerID := range pr.CustomerIDs {
|
||||
if err := tx.Exec(`
|
||||
INSERT INTO b2b_specific_price_customer (b2b_specific_price_id, b2b_id_customer) VALUES (?, ?)
|
||||
`, pr.ID, customerID).Error; err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
func (repo *SpecificPriceRepo) clearRelations(tx *gorm.DB, id uint64) error {
|
||||
if err := tx.Exec("DELETE FROM b2b_specific_price_product WHERE b2b_specific_price_id = ?", id).Error; err != nil {
|
||||
return err
|
||||
}
|
||||
if err := tx.Exec("DELETE FROM b2b_specific_price_category WHERE b2b_specific_price_id = ?", id).Error; err != nil {
|
||||
return err
|
||||
}
|
||||
if err := tx.Exec("DELETE FROM b2b_specific_price_product_attribute WHERE b2b_specific_price_id = ?", id).Error; err != nil {
|
||||
return err
|
||||
}
|
||||
if err := tx.Exec("DELETE FROM b2b_specific_price_country WHERE b2b_specific_price_id = ?", id).Error; err != nil {
|
||||
return err
|
||||
}
|
||||
if err := tx.Exec("DELETE FROM b2b_specific_price_customer WHERE b2b_specific_price_id = ?", id).Error; err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
func (repo *SpecificPriceRepo) loadRelations(ctx context.Context, pr *model.SpecificPrice) error {
|
||||
var err error
|
||||
|
||||
var productIDs []struct {
|
||||
IDProduct uint64 `gorm:"column:id_product"`
|
||||
}
|
||||
if err = db.DB.WithContext(ctx).Table("b2b_specific_price_product").Where("b2b_specific_price_id = ?", pr.ID).Select("id_product").Scan(&productIDs).Error; err != nil {
|
||||
return err
|
||||
}
|
||||
for _, p := range productIDs {
|
||||
pr.ProductIDs = append(pr.ProductIDs, p.IDProduct)
|
||||
}
|
||||
|
||||
var categoryIDs []struct {
|
||||
IDCategory uint64 `gorm:"column:id_category"`
|
||||
}
|
||||
if err = db.DB.WithContext(ctx).Table("b2b_specific_price_category").Where("b2b_specific_price_id = ?", pr.ID).Select("id_category").Scan(&categoryIDs).Error; err != nil {
|
||||
return err
|
||||
}
|
||||
for _, c := range categoryIDs {
|
||||
pr.CategoryIDs = append(pr.CategoryIDs, c.IDCategory)
|
||||
}
|
||||
|
||||
var attrIDs []struct {
|
||||
IDAttr uint64 `gorm:"column:id_product_attribute"`
|
||||
}
|
||||
if err = db.DB.WithContext(ctx).Table("b2b_specific_price_product_attribute").Where("b2b_specific_price_id = ?", pr.ID).Select("id_product_attribute").Scan(&attrIDs).Error; err != nil {
|
||||
return err
|
||||
}
|
||||
for _, a := range attrIDs {
|
||||
pr.ProductAttributeIDs = append(pr.ProductAttributeIDs, a.IDAttr)
|
||||
}
|
||||
|
||||
var countryIDs []struct {
|
||||
IDCountry uint64 `gorm:"column:b2b_id_country"`
|
||||
}
|
||||
if err = db.DB.WithContext(ctx).Table("b2b_specific_price_country").Where("b2b_specific_price_id = ?", pr.ID).Select("b2b_id_country").Scan(&countryIDs).Error; err != nil {
|
||||
return err
|
||||
}
|
||||
for _, c := range countryIDs {
|
||||
pr.CountryIDs = append(pr.CountryIDs, c.IDCountry)
|
||||
}
|
||||
|
||||
var customerIDs []struct {
|
||||
IDCustomer uint64 `gorm:"column:b2b_id_customer"`
|
||||
}
|
||||
if err = db.DB.WithContext(ctx).Table("b2b_specific_price_customer").Where("b2b_specific_price_id = ?", pr.ID).Select("b2b_id_customer").Scan(&customerIDs).Error; err != nil {
|
||||
return err
|
||||
}
|
||||
for _, c := range customerIDs {
|
||||
pr.CustomerIDs = append(pr.CustomerIDs, c.IDCustomer)
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
Reference in New Issue
Block a user