Merge branch 'main' of ssh://git.ma-al.com:8822/goc_daniel/b2b into expand_orders
This commit is contained in:
@@ -1,7 +1,6 @@
|
||||
package orderService
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"strconv"
|
||||
|
||||
"git.ma-al.com/goc_daniel/b2b/app/delivery/middleware/perms"
|
||||
@@ -12,6 +11,7 @@ import (
|
||||
"git.ma-al.com/goc_daniel/b2b/app/service/addressesService"
|
||||
"git.ma-al.com/goc_daniel/b2b/app/service/emailService"
|
||||
constdata "git.ma-al.com/goc_daniel/b2b/app/utils/const_data"
|
||||
"git.ma-al.com/goc_daniel/b2b/app/utils/logger"
|
||||
"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/utils/responseErrors"
|
||||
@@ -49,9 +49,12 @@ func (s *OrderService) Find(user *model.Customer, p find.Paging, filt *filters.F
|
||||
|
||||
for i := 0; i < len(list.Items); i++ {
|
||||
address_unparsed, err := s.addressesService.ValidateAddressJson(list.Items[i].AddressString, list.Items[i].CountryID)
|
||||
// log such errors
|
||||
if err != nil {
|
||||
fmt.Printf("err: %v\n", err)
|
||||
logger.Warn("failed to validate address",
|
||||
"service", "orderService",
|
||||
"order_id", list.Items[i].OrderID,
|
||||
"error", err.Error(),
|
||||
)
|
||||
}
|
||||
|
||||
list.Items[i].AddressUnparsed = &address_unparsed
|
||||
@@ -98,16 +101,23 @@ func (s *OrderService) PlaceNewOrder(user_id uint, cart_id uint, name string, co
|
||||
// if no error is returned, remove the cart. This should be smooth
|
||||
err = s.cartsRepo.RemoveCart(user_id, cart_id)
|
||||
if err != nil {
|
||||
// Log error but don't fail placing order
|
||||
_ = err
|
||||
logger.Warn("failed to remove cart after order placement",
|
||||
"service", "orderService",
|
||||
"user_id", user_id,
|
||||
"cart_id", cart_id,
|
||||
"error", err.Error(),
|
||||
)
|
||||
}
|
||||
|
||||
// send email to admin
|
||||
go func(user_id uint) {
|
||||
err := s.emailService.SendNewOrderPlacedNotification(user_id)
|
||||
if err != nil {
|
||||
// Log error but don't fail placing order
|
||||
_ = err
|
||||
logger.Warn("failed to send new order notification",
|
||||
"service", "orderService",
|
||||
"user_id", user_id,
|
||||
"error", err.Error(),
|
||||
)
|
||||
}
|
||||
}(user_id)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user