code ready, time for testing...
This commit is contained in:
@@ -9,11 +9,11 @@ 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)
|
||||
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 +49,7 @@ 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) UserHasCart(user_id uint, cart_id uint) (bool, error) {
|
||||
var amt uint
|
||||
|
||||
err := db.DB.
|
||||
@@ -59,7 +59,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 +96,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 +106,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 +116,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
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -3,15 +3,17 @@ 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(user_id uint, cart_id uint, country_id uint, address_info string) error
|
||||
ChangeOrderAddress(user_id uint, order_id uint, country_id uint, address_info string) error
|
||||
ChangeOrderStatus(user_id uint, order_id uint, status string) 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{}
|
||||
@@ -20,6 +22,19 @@ 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
|
||||
@@ -54,15 +69,42 @@ func (repo *OrdersRepo) Find(user_id uint, p find.Paging, filt *filters.FiltersL
|
||||
}, nil
|
||||
}
|
||||
|
||||
func (repo *OrdersRepo) PlaceNewOrder(user_id uint, cart_id uint, country_id uint, address_info string) error {
|
||||
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,
|
||||
AddressJSON: address_info,
|
||||
Status: constdata.NEW_ORDER_STATUS,
|
||||
Products: make([]model.OrderProduct, 0, len(cart.Products)),
|
||||
}
|
||||
|
||||
return nil
|
||||
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(user_id uint, order_id uint, country_id uint, address_info string) error {
|
||||
return nil
|
||||
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_info": address_info,
|
||||
}).
|
||||
Error
|
||||
}
|
||||
|
||||
func (repo *OrdersRepo) ChangeOrderStatus(user_id uint, order_id uint, status string) error {
|
||||
return nil
|
||||
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
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user