Upload app/api/cart.py

app/api/cart.py

@@ -1,6 +1,6 @@
 from typing import Any, Optional
 from fastapi import APIRouter, Depends, HTTPException, status, Header
-from sqlalchemy.orm import Session
+from sqlalchemy.orm import Session, joinedload
 from datetime import datetime, timezone
 
 from app.db.base import get_db
@@ -11,6 +11,7 @@ from app.schemas.cart import (
     CartResponse, CartItemCreate, CartItemUpdate, 
     CartItemResponse, CouponApply, CouponResponse
 )
+from app.schemas.product import ProductListItem
 from app.core.security import get_optional_current_user
 
 router = APIRouter(tags=["Cart"])
@@ -71,6 +72,15 @@ def get_or_create_cart(db: Session, user_id: Optional[int] = None, session_id: O
     else:
         raise HTTPException(status_code=400, detail="Either login or provide X-Cart-ID header")
 
+
+def _get_primary_image(product) -> Optional[str]:
+    """Extract the primary image URL from a product's images relationship."""
+    if product.images:
+        sorted_imgs = sorted(product.images, key=lambda x: x.sort_order)
+        return sorted_imgs[0].image_url if sorted_imgs else None
+    return None
+
+
 @router.get("/cart", response_model=dict)
 def get_cart(
     current_user_id: Optional[int] = Depends(get_optional_current_user),
@@ -79,29 +89,69 @@ def get_cart(
 ) -> Any:
     """Get the current user's (or guest session's) shopping cart."""
     cart = get_or_create_cart(db, user_id=current_user_id, session_id=x_cart_id)
+    
+    # Re-query the cart with all needed eager loads for response serialization
+    cart = db.query(Cart).options(
+        joinedload(Cart.items)
+            .joinedload(CartItem.product)
+            .joinedload(Product.images),
+        joinedload(Cart.items)
+            .joinedload(CartItem.product)
+            .joinedload(Product.category),
+        joinedload(Cart.coupon)
+    ).filter(Cart.id == cart.id).first()
+
     totals = calculate_cart_totals(cart)
     
-    items_response = []
+    # Build response manually as plain dicts to guarantee image_url is included
+    items_list = []
     for item in cart.items:
-        item_data = CartItemResponse(
-            id=item.id,
-            cart_id=item.cart_id,
-            product_id=item.product_id,
-            quantity=item.quantity,
-            unit_price=item.unit_price,
-            total_price=item.quantity * item.unit_price,
-            product=item.product
-        )
-        items_response.append(item_data)
+        primary_image = _get_primary_image(item.product)
+        
+        product_dict = {
+            "id": item.product.id,
+            "name_ar": item.product.name_ar,
+            "name_en": item.product.name_en,
+            "price": item.product.price,
+            "compare_price": item.product.compare_price,
+            "stock": item.product.stock,
+            "category_id": item.product.category_id,
+            "category": None,
+            "rating": item.product.rating,
+            "rating_count": item.product.rating_count,
+            "is_featured": item.product.is_featured,
+            "image_url": primary_image,
+            "created_at": item.product.created_at.isoformat() if item.product.created_at else None,
+        }
+        if item.product.category:
+            product_dict["category"] = {
+                "id": item.product.category.id,
+                "name_ar": item.product.category.name_ar,
+                "name_en": item.product.category.name_en,
+                "icon": item.product.category.icon,
+                "sort_order": item.product.category.sort_order,
+            }
         
+        items_list.append({
+            "id": item.id,
+            "cart_id": item.cart_id,
+            "product_id": item.product_id,
+            "quantity": item.quantity,
+            "unit_price": item.unit_price,
+            "total_price": round(item.quantity * item.unit_price, 2),
+            "product": product_dict,
+        })
+    
+    response_value = {
+        "id": cart.id,
+        "user_id": cart.user_id,
+        "items": items_list,
+        **totals
+    }
+    
     return {
         "isSuccess": True,
-        "value": CartResponse(
-            id=cart.id,
-            user_id=cart.user_id,
-            items=items_response,
-            **totals
-        ),
+        "value": response_value,
         "statusCode": 200
     }