[fix]

go-park-mail-ru · Dec 22, 2024 · 15d7df1 · 15d7df1
1 parent f5d95e8
commit 15d7df1
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/internal/delivery/orders/create_order_from_cart.go b/internal/delivery/orders/create_order_from_cart.go
@@ -19,36 +19,36 @@ func (h *OrdersHandler) CreateOrderFromCart(w http.ResponseWriter, r *http.Reque
 		return
 	}
 
+	h.logger.Info("[OrdersHandler.CreateOrderFromCart] Started executing", slog.Any("request-id", requestID))
+
 	userID, ok := utils.GetContextSessionUserID(r.Context())
 	if !ok {
 		utils.WriteErrorJSON(w, http.StatusUnauthorized, errs.UserNotAuthorized)
-
-		return
 	}
 
 	var request CreateOrderRequest
 	if err = easyjson.UnmarshalFromReader(r.Body, &request); err != nil {
-		h.logger.Error("[delivery.CreateOrderFromCart] Invalid request body", slog.String("error", err.Error()), slog.Any("request-id", requestID))
+		h.logger.Error("[delivery.CreateOrderFromCart] Invalid request body", slog.String("error", err.Error()))
 		utils.WriteErrorJSONByError(w, errs.InvalidJSONFormat, h.errResolver)
-
 		return
 	}
 
 	order, err := h.ordersManager.CreateOrderFromCart(r.Context(), request.Address, userID, request.PromoCode)
 	if err != nil {
 		if errors.Is(err, errs.NoPromoCode) {
-			h.logger.Error("[delivery.CreateOrderFromCart] No promo code", slog.String("error", err.Error()), slog.Any("request-id", requestID))
+			h.logger.Error("[delivery.CreateOrderFromCart] No promo code", slog.String("error", err.Error()))
 			utils.WriteErrorJSONByError(w, errs.NoPromoCode, h.errResolver)
 
 			return
 		}
 
-		h.logger.Error("[delivery.CreateOrderFromCart] Failed to create order from cart", slog.String("error", err.Error()), slog.Any("request-id", requestID))
-		utils.WriteErrorJSONByError(w, err, h.errResolver)
+		h.logger.Error("[delivery.CreateOrderFromCart] Failed to create order from cart", slog.String("error", err.Error()))
+		utils.WriteErrorJSONByError(w, errs.InternalServerError, h.errResolver)
 		return
 	}
 
 	orderDTO := ToOrderResponse(order)
+	h.logger.Info("[delivery.CreateOrderFromCart] Order created from cart", slog.String("orderID", orderDTO.ID.String()))
 
 	utils.WriteJSON(w, http.StatusOK, orderDTO)
 }
diff --git a/internal/repository/orders/create_order_from_cart.go b/internal/repository/orders/create_order_from_cart.go
@@ -51,7 +51,7 @@ func (r *OrdersRepo) CreateOrderFromCart(ctx context.Context, orderData *order.O
 	const insertProductQuery = `
 		INSERT INTO product_orders (id, order_id, product_id, option_id, count, delivery_date)
 		VALUES ($1, $2, $3, $4, $5, $6)
-  		ON CONFLICT (count) DO NOTHING;
+  		ON CONFLICT DO NOTHING;
 	`
 
 	for _, p := range orderData.Products {