Upload app/api/orders.py

app/api/orders.py

@@ -1,10 +1,11 @@
 from typing import Optional
 from fastapi import APIRouter, Depends, HTTPException, status, Header
-from sqlalchemy.orm import Session
+from sqlalchemy.orm import Session, joinedload
 from decimal import Decimal
 
 from app.db.base import get_db
 from app.models.user import User
+from app.models.product import Product
 from app.models.cart import Cart, CartItem
 from app.models.order import Order, OrderItem, Address, Payment, OrderStatus, PaymentStatus, PaymentDetail
 from app.schemas.order import (
@@ -127,11 +128,27 @@ def checkout(
     cart.coupon_id = None
     
     db.commit()
-    db.refresh(order)
+    # Eagerly load the order with all needed relations for the response
+    order = db.query(Order).options(
+        joinedload(Order.items).joinedload(OrderItem.product).joinedload(Product.images),
+        joinedload(Order.payment)
+    ).filter(Order.id == order.id).first()
     
+    def prepare_order_response(order_obj):
+        order_data = OrderResponse.model_validate(order_obj)
+        for i, item in enumerate(order_obj.items):
+            primary_image = None
+            if item.product and item.product.images:
+                sorted_imgs = sorted(item.product.images, key=lambda x: x.sort_order)
+                primary_image = sorted_imgs[0].image_url if sorted_imgs else None
+            
+            if i < len(order_data.items) and order_data.items[i].product:
+                order_data.items[i].product.image_url = primary_image
+        return order_data.model_dump()
+
     return {
         "isSuccess": True,
-        "value": OrderResponse.model_validate(order).model_dump(),
+        "value": prepare_order_response(order),
         "statusCode": 201
     }
 
@@ -143,8 +160,25 @@ def get_user_orders(
 ):
     if not current_user_id:
         return {"isSuccess": True, "value": {"orders": []}, "statusCode": 200}
-    orders = db.query(Order).filter(Order.user_id == current_user_id).order_by(Order.created_at.desc()).all()
-    results = [OrderResponse.model_validate(order).model_dump() for order in orders]
+    def prepare_order_response(order_obj):
+        order_data = OrderResponse.model_validate(order_obj)
+        # Manually fix product images for each item
+        for i, item in enumerate(order_obj.items):
+            primary_image = None
+            if item.product and item.product.images:
+                sorted_imgs = sorted(item.product.images, key=lambda x: x.sort_order)
+                primary_image = sorted_imgs[0].image_url if sorted_imgs else None
+            
+            if i < len(order_data.items) and order_data.items[i].product:
+                order_data.items[i].product.image_url = primary_image
+        return order_data.model_dump()
+
+    orders = db.query(Order).options(
+        joinedload(Order.items).joinedload(OrderItem.product).joinedload(Product.images),
+        joinedload(Order.payment)
+    ).filter(Order.user_id == current_user_id).order_by(Order.created_at.desc()).all()
+    
+    results = [prepare_order_response(order) for order in orders]
     
     return {
         "isSuccess": True,
@@ -159,15 +193,33 @@ def get_order_tracking(
     db: Session = Depends(get_db)
 ):
     if current_user_id:
-        order = db.query(Order).filter(Order.id == order_id, Order.user_id == current_user_id).first()
+        order = db.query(Order).options(
+            joinedload(Order.items).joinedload(OrderItem.product).joinedload(Product.images),
+            joinedload(Order.payment)
+        ).filter(Order.id == order_id, Order.user_id == current_user_id).first()
     else:
-        order = db.query(Order).filter(Order.id == order_id).first()
+        order = db.query(Order).options(
+            joinedload(Order.items).joinedload(OrderItem.product).joinedload(Product.images),
+            joinedload(Order.payment)
+        ).filter(Order.id == order_id).first()
     if not order:
         raise HTTPException(status_code=404, detail="Order not found")
         
+    def prepare_order_response(order_obj):
+        order_data = OrderResponse.model_validate(order_obj)
+        for i, item in enumerate(order_obj.items):
+            primary_image = None
+            if item.product and item.product.images:
+                sorted_imgs = sorted(item.product.images, key=lambda x: x.sort_order)
+                primary_image = sorted_imgs[0].image_url if sorted_imgs else None
+            
+            if i < len(order_data.items) and order_data.items[i].product:
+                order_data.items[i].product.image_url = primary_image
+        return order_data.model_dump()
+
     return {
         "isSuccess": True,
-        "value": OrderResponse.model_validate(order).model_dump(),
+        "value": prepare_order_response(order),
         "statusCode": 200
     }