feat: create specific price system and adapt product queries
This commit is contained in:
@@ -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"
|
||||
@@ -16,9 +15,12 @@ import (
|
||||
)
|
||||
|
||||
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)
|
||||
// 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, 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)
|
||||
}
|
||||
|
||||
type ProductsRepo struct{}
|
||||
@@ -27,25 +29,75 @@ 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
|
||||
|
||||
return result, err
|
||||
}
|
||||
|
||||
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) {
|
||||
|
||||
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 nil, err
|
||||
return view.Price{}, err
|
||||
}
|
||||
|
||||
// Optional: validate it's valid JSON
|
||||
if !json.Valid([]byte(productStr)) {
|
||||
return nil, fmt.Errorf("invalid json returned from stored procedure")
|
||||
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"`
|
||||
}
|
||||
|
||||
raw := json.RawMessage(productStr)
|
||||
return &raw, nil
|
||||
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, p find.Paging, filt *filters.FiltersList) (*find.Found[model.ProductInList], error) {
|
||||
|
||||
Reference in New Issue
Block a user