update

internal/services/v2/inprogress_order/in_progress_order.go

@@ -13,11 +13,13 @@ import (
 type InProgressOrderService interface {
 	Save(ctx mycontext.Context, order *entity.OrderRequest) (*entity.Order, error)
 	GetOrdersByPartnerID(ctx mycontext.Context, partnerID int64, limit, offset int) ([]*entity.Order, error)
+	GetOrderByOrderAndPartnerID(ctx mycontext.Context, partnerID int64, orderID int64) (*entity.Order, error)
 }
 
 type OrderRepository interface {
 	CreateOrUpdate(ctx mycontext.Context, order *entity.Order) (*entity.Order, error)
 	GetListByPartnerID(ctx mycontext.Context, partnerID int64, limit, offset int, status string) ([]*entity.Order, error)
+	FindByIDAndPartnerID(ctx mycontext.Context, id int64, partnerID int64) (*entity.Order, error)
 }
 
 type OrderCalculator interface {
@@ -26,6 +28,7 @@ type OrderCalculator interface {
 		items []entity.OrderItemRequest,
 		productDetails *entity.ProductDetails,
 		source string,
+		partnerID int64,
 	) (*entity.OrderCalculation, error)
 	ValidateOrderItems(ctx mycontext.Context, items []entity.OrderItemRequest) ([]int64, []entity.OrderItemRequest, error)
 }
@@ -57,7 +60,7 @@ func (s *inProgressOrderSvc) Save(ctx mycontext.Context, req *entity.OrderReques
 		return nil, err
 	}
 
-	orderCalculation, err := s.orderCalculator.CalculateOrderTotals(ctx, req.OrderItems, productDetails, req.Source)
+	orderCalculation, err := s.orderCalculator.CalculateOrderTotals(ctx, req.OrderItems, productDetails, req.Source, req.PartnerID)
 	if err != nil {
 		return nil, err
 	}
@@ -71,11 +74,12 @@ func (s *inProgressOrderSvc) Save(ctx mycontext.Context, req *entity.OrderReques
 		}
 
 		orderItems[i] = entity.OrderItem{
-			ItemID:   item.ProductID,
-			ItemName: productName,
-			Quantity: item.Quantity,
-			Price:    product.Price,
-			ItemType: product.Type,
+			ItemID:      item.ProductID,
+			ItemName:    productName,
+			Quantity:    item.Quantity,
+			Price:       product.Price,
+			ItemType:    product.Type,
+			Description: product.Description,
 		}
 	}
 
@@ -119,3 +123,15 @@ func (s *inProgressOrderSvc) GetOrdersByPartnerID(ctx mycontext.Context, partner
 
 	return orders, nil
 }
+
+func (s *inProgressOrderSvc) GetOrderByOrderAndPartnerID(ctx mycontext.Context, partnerID int64, orderID int64) (*entity.Order, error) {
+	orders, err := s.repo.FindByIDAndPartnerID(ctx, orderID, partnerID)
+	if err != nil {
+		logger.ContextLogger(ctx).Error("failed to get in-progress orders by partner ID",
+			zap.Error(err),
+			zap.Int64("partnerID", partnerID))
+		return nil, errors.Wrap(err, "failed to get order")
+	}
+
+	return orders, nil
+}