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

Merge branch 'main' of ssh://git.ma-al.com:8822/goc_daniel/b2b into product-procedures

Browse Source
This commit is contained in:
Wiktor Dudzic
2026-04-03 08:37:26 +02:00
parent 0ed9d792b6 cf4d14a3cb
commit c31964c41b
27 changed files with 684 additions and 444 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/repos/categoriesRepo/categoriesRepo.go
View File

@@ -37,12 +37,11 @@ func (r *CategoriesRepo) GetAllCategories(idLang uint) ([]model.ScannedCategory,
ps_category_lang.link_rewrite AS link_rewrite,
ps_lang.iso_code AS iso_code
`).
Joins(`LEFT JOIN ? ON ??.id_category = ??.id_category AND ??.id_shop = ? AND ??.id_lang = ?`,
categoryLangTbl, categoryLangTbl, categoryTbl, categoryLangTbl, constdata.SHOP_ID, categoryLangTbl, idLang).
Joins(`LEFT JOIN ? ON ??.id_category = ??.id_category AND ??.id_shop = ?`,
categoryShopTbl, categoryShopTbl, categoryTbl, categoryShopTbl, constdata.SHOP_ID).
Joins(`JOIN ? ON ??.id_lang = ??.id_lang`,
langTbl, langTbl, categoryLangTbl).
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
app/repos/listRepo/listRepo.go
View File

@@ -32,7 +32,7 @@ func (repo *ListRepo) ListProducts(id_lang uint, p find.Paging, filt *filters.Fi
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,
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,

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

@@ -1,6 +1,7 @@
package productDescriptionRepo
import (
"errors"
"fmt"
"git.ma-al.com/goc_daniel/b2b/app/db"
@@ -8,6 +9,7 @@ import (
"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"
)
type UIProductDescriptionRepo interface {
@@ -28,14 +30,21 @@ func (r *ProductDescriptionRepo) GetProductDescription(productID uint, productid
var ProductDescription model.ProductDescription
err := db.Get().
Model(dbmodel.PsProductLang{}).
Where(&dbmodel.PsProductLang{
IDProduct: int32(productID),
IDShop: int32(constdata.SHOP_ID),
IDLang: int32(productid_lang),
}).
First(&ProductDescription).Error
if err != nil {
if errors.Is(err, gorm.ErrRecordNotFound) {
// handle "not found" case only
ProductDescription.ExistsInDatabase = false
} else if err != nil {
return nil, fmt.Errorf("database error: %w", err)
} else {
ProductDescription.ExistsInDatabase = true
}
return &ProductDescription, nil
@@ -50,6 +59,7 @@ func (r *ProductDescriptionRepo) CreateIfDoesNotExist(productID uint, productid_
}
err := db.Get().
Model(dbmodel.PsProductLang{}).
Where(&dbmodel.PsProductLang{
IDProduct: int32(productID),
IDShop: int32(constdata.SHOP_ID),