Merge branch 'main' of ssh://git.ma-al.com:8822/goc_daniel/b2b into no-vat-customers
This commit is contained in:
@@ -48,9 +48,9 @@ func (repo *AddressesRepo) UserAddressesAmt(user_id uint) (uint, error) {
|
||||
|
||||
func (repo *AddressesRepo) AddNewAddress(user_id uint, address_info string, country_id uint) error {
|
||||
address := model.Address{
|
||||
CustomerID: user_id,
|
||||
AddressInfo: address_info,
|
||||
CountryID: country_id,
|
||||
CustomerID: user_id,
|
||||
AddressString: address_info,
|
||||
CountryID: country_id,
|
||||
}
|
||||
|
||||
return db.DB.
|
||||
@@ -60,10 +60,10 @@ func (repo *AddressesRepo) AddNewAddress(user_id uint, address_info string, coun
|
||||
|
||||
func (repo *AddressesRepo) UpdateAddress(user_id uint, address_id uint, address_info string, country_id uint) error {
|
||||
address := model.Address{
|
||||
ID: address_id,
|
||||
CustomerID: user_id,
|
||||
AddressInfo: address_info,
|
||||
CountryID: country_id,
|
||||
ID: address_id,
|
||||
CustomerID: user_id,
|
||||
AddressString: address_info,
|
||||
CountryID: country_id,
|
||||
}
|
||||
|
||||
return db.DB.
|
||||
|
||||
@@ -9,11 +9,12 @@ import (
|
||||
type UICartsRepo interface {
|
||||
CartsAmount(user_id uint) (uint, error)
|
||||
CreateNewCart(user_id uint) (model.CustomerCart, error)
|
||||
UserHasCart(user_id uint, cart_id uint) (uint, error)
|
||||
RemoveCart(user_id uint, cart_id uint) error
|
||||
UserHasCart(user_id uint, cart_id uint) (bool, error)
|
||||
UpdateCartName(user_id uint, cart_id uint, new_name string) error
|
||||
RetrieveCartsInfo(user_id uint) ([]model.CustomerCart, error)
|
||||
RetrieveCart(user_id uint, cart_id uint) (*model.CustomerCart, error)
|
||||
CheckProductExists(product_id uint, product_attribute_id *uint) (uint, error)
|
||||
CheckProductExists(product_id uint, product_attribute_id *uint) (bool, error)
|
||||
AddProduct(user_id uint, cart_id uint, product_id uint, product_attribute_id *uint, amount uint) error
|
||||
}
|
||||
|
||||
@@ -49,7 +50,15 @@ func (repo *CartsRepo) CreateNewCart(user_id uint) (model.CustomerCart, error) {
|
||||
return cart, err
|
||||
}
|
||||
|
||||
func (repo *CartsRepo) UserHasCart(user_id uint, cart_id uint) (uint, error) {
|
||||
func (repo *CartsRepo) RemoveCart(user_id uint, cart_id uint) error {
|
||||
return db.DB.
|
||||
Table("b2b_customer_carts").
|
||||
Where("cart_id = ? AND user_id = ?", cart_id, user_id).
|
||||
Delete(nil).
|
||||
Error
|
||||
}
|
||||
|
||||
func (repo *CartsRepo) UserHasCart(user_id uint, cart_id uint) (bool, error) {
|
||||
var amt uint
|
||||
|
||||
err := db.DB.
|
||||
@@ -59,7 +68,7 @@ func (repo *CartsRepo) UserHasCart(user_id uint, cart_id uint) (uint, error) {
|
||||
Scan(&amt).
|
||||
Error
|
||||
|
||||
return amt, err
|
||||
return amt >= 1, err
|
||||
}
|
||||
|
||||
func (repo *CartsRepo) UpdateCartName(user_id uint, cart_id uint, new_name string) error {
|
||||
@@ -96,7 +105,7 @@ func (repo *CartsRepo) RetrieveCart(user_id uint, cart_id uint) (*model.Customer
|
||||
return &cart, err
|
||||
}
|
||||
|
||||
func (repo *CartsRepo) CheckProductExists(product_id uint, product_attribute_id *uint) (uint, error) {
|
||||
func (repo *CartsRepo) CheckProductExists(product_id uint, product_attribute_id *uint) (bool, error) {
|
||||
var amt uint
|
||||
|
||||
if product_attribute_id == nil {
|
||||
@@ -106,7 +115,7 @@ func (repo *CartsRepo) CheckProductExists(product_id uint, product_attribute_id
|
||||
Where("id_product = ?", product_id).
|
||||
Scan(&amt).
|
||||
Error
|
||||
return amt, err
|
||||
return amt >= 1, err
|
||||
|
||||
} else {
|
||||
err := db.DB.
|
||||
@@ -116,7 +125,7 @@ func (repo *CartsRepo) CheckProductExists(product_id uint, product_attribute_id
|
||||
Where("ps.id_product = ? AND pas.id_product_attribute = ?", product_id, *product_attribute_id).
|
||||
Scan(&amt).
|
||||
Error
|
||||
return amt, err
|
||||
return amt >= 1, err
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -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
|
||||
}
|
||||
|
||||
110
app/repos/ordersRepo/ordersRepo.go
Normal file
110
app/repos/ordersRepo/ordersRepo.go
Normal file
@@ -0,0 +1,110 @@
|
||||
package ordersRepo
|
||||
|
||||
import (
|
||||
"git.ma-al.com/goc_daniel/b2b/app/db"
|
||||
"git.ma-al.com/goc_daniel/b2b/app/model"
|
||||
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 UIOrdersRepo interface {
|
||||
UserHasOrder(user_id uint, order_id uint) (bool, error)
|
||||
Find(user_id uint, p find.Paging, filt *filters.FiltersList) (*find.Found[model.CustomerOrder], error)
|
||||
PlaceNewOrder(cart *model.CustomerCart, name string, country_id uint, address_info string) error
|
||||
ChangeOrderAddress(order_id uint, country_id uint, address_info string) error
|
||||
ChangeOrderStatus(order_id uint, status string) error
|
||||
}
|
||||
|
||||
type OrdersRepo struct{}
|
||||
|
||||
func New() UIOrdersRepo {
|
||||
return &OrdersRepo{}
|
||||
}
|
||||
|
||||
func (repo *OrdersRepo) UserHasOrder(user_id uint, order_id uint) (bool, error) {
|
||||
var amt uint
|
||||
|
||||
err := db.DB.
|
||||
Table("b2b_customer_orders").
|
||||
Select("COUNT(*) AS amt").
|
||||
Where("user_id = ? AND order_id = ?", user_id, order_id).
|
||||
Scan(&amt).
|
||||
Error
|
||||
|
||||
return amt >= 1, err
|
||||
}
|
||||
|
||||
func (repo *OrdersRepo) Find(user_id uint, p find.Paging, filt *filters.FiltersList) (*find.Found[model.CustomerOrder], error) {
|
||||
var list []model.CustomerOrder
|
||||
var total int64
|
||||
|
||||
query := db.Get().
|
||||
Model(&model.CustomerOrder{}).
|
||||
Preload("Products").
|
||||
Order("b2b_customer_orders.order_id DESC")
|
||||
|
||||
// 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.CustomerOrder]{}, err
|
||||
}
|
||||
|
||||
err = query.
|
||||
Limit(p.Limit()).
|
||||
Offset(p.Offset()).
|
||||
Find(&list).Error
|
||||
if err != nil {
|
||||
return &find.Found[model.CustomerOrder]{}, err
|
||||
}
|
||||
|
||||
return &find.Found[model.CustomerOrder]{
|
||||
Items: list,
|
||||
Count: uint(total),
|
||||
}, nil
|
||||
}
|
||||
|
||||
func (repo *OrdersRepo) PlaceNewOrder(cart *model.CustomerCart, name string, country_id uint, address_info string) error {
|
||||
order := model.CustomerOrder{
|
||||
UserID: cart.UserID,
|
||||
Name: name,
|
||||
CountryID: country_id,
|
||||
AddressString: address_info,
|
||||
Status: constdata.NEW_ORDER_STATUS,
|
||||
Products: make([]model.OrderProduct, 0, len(cart.Products)),
|
||||
}
|
||||
|
||||
for _, product := range cart.Products {
|
||||
order.Products = append(order.Products, model.OrderProduct{
|
||||
ProductID: product.ProductID,
|
||||
ProductAttributeID: product.ProductAttributeID,
|
||||
Amount: product.Amount,
|
||||
})
|
||||
}
|
||||
|
||||
return db.DB.Create(&order).Error
|
||||
}
|
||||
|
||||
func (repo *OrdersRepo) ChangeOrderAddress(order_id uint, country_id uint, address_info string) error {
|
||||
return db.DB.
|
||||
Table("b2b_customer_orders").
|
||||
Where("order_id = ?", order_id).
|
||||
Updates(map[string]interface{}{
|
||||
"country_id": country_id,
|
||||
"address_string": address_info,
|
||||
}).
|
||||
Error
|
||||
}
|
||||
|
||||
func (repo *OrdersRepo) ChangeOrderStatus(order_id uint, status string) error {
|
||||
return db.DB.
|
||||
Table("b2b_customer_orders").
|
||||
Where("order_id = ?", order_id).
|
||||
Update("status", status).
|
||||
Error
|
||||
}
|
||||
@@ -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
|
||||
}
|
||||
|
||||
@@ -105,57 +105,90 @@ func (repo *ProductsRepo) GetVariants(p_id_product, p_id_shop, p_id_lang, p_id_c
|
||||
}
|
||||
|
||||
func (repo *ProductsRepo) Find(langID uint, userID uint, p find.Paging, filt *filters.FiltersList) (*find.Found[model.ProductInList], 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 = ?", langID).
|
||||
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 = ?", langID).
|
||||
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").
|
||||
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")
|
||||
|
||||
query = query.Scopes(filt.All()...)
|
||||
|
||||
|
||||
@@ -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
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user