Update app.py

app.py

@@ -591,6 +591,17 @@ async def chatbot_response(request: Request, background_tasks: BackgroundTasks):
     elif sentiment_score > 0.3:
         sentiment_modifier = "Great to hear from you! "
 
+          # --- Order Tracking Handling ---
+    order_id_match = re.search(r"ord-\d+", user_message.lower())
+    if order_id_match:
+        order_id = order_id_match.group(0)
+        try:
+            # Call the /track_order endpoint
+            tracking_response = await track_order(order_id)
+            return JSONResponse(content={"response": tracking_response})
+        except HTTPException as e:
+            return JSONResponse(content={"response": f"⚠️ {e.detail}"})
+
     # --- Order Flow Handling ---
     order_response = process_order_flow(user_id, user_message)
     if order_response:
@@ -806,19 +817,28 @@ async def payment_callback(request: Request):
                 return JSONResponse(content={"message": "Order updated successfully."})
             else:
                 raise HTTPException(status_code=404, detail="Order not found.")
-
-# --- New Endpoint: Order Tracking ---
+                
 @app.get("/track_order/{order_id}")
 async def track_order(order_id: str):
+    """
+    Fetch order tracking details for a given order ID.
+    """
     async with async_session() as session:
         result = await session.execute(
-            OrderTracking.__table__.select()
+            select(OrderTracking)
             .where(OrderTracking.order_id == order_id)
             .order_by(OrderTracking.timestamp)
         )
-        tracking_updates = result.fetchall()
+        tracking_updates = result.scalars().all()
         if tracking_updates:
-            return [dict(row) for row in tracking_updates]
+            response = []
+            for update in tracking_updates:
+                response.append({
+                    "status": update.status,
+                    "message": update.message,
+                    "timestamp": update.timestamp.isoformat(),
+                })
+            return JSONResponse(content=response)
         else:
             raise HTTPException(status_code=404, detail="No tracking information found for this order.")