Update app.py

app.py

@@ -68,17 +68,20 @@ class ChatHistory(Base):
 
 class Order(Base):
     __tablename__ = "orders"
-    order_id = Column(String(36), primary_key=True, index=True)
-    user_id = Column(String(36), index=True)
-    status = Column(String(20), default="pending")
-    payment_reference = Column(String(100), nullable=True)
-    last_location = Column(Text, nullable=True)  # Stored as a JSON string
+    id = Column(Integer, primary_key=True, index=True)
+    order_id = Column(String, unique=True, index=True)
+    user_id = Column(String, index=True)
+    dish = Column(String, nullable=True)
+    quantity = Column(String, nullable=True)
+    price = Column(String, default="0")
+    status = Column(String, default="Pending Payment")
+    payment_reference = Column(String, nullable=True)
+    delivery_address = Column(String, default="")
+    timestamp = Column(DateTime, default=datetime.utcnow)
+    pickup_address = Column(String, nullable=True)  # <-- Add this
+    last_location = Column(String, nullable=True)  # <-- Add this
+    contact_number = Column(String, nullable=True)  # <-- Add this
 
-    # New fields for delivery details:
-    package_description = Column(Text, nullable=False)
-    pickup_address = Column(Text, nullable=False)
-    delivery_address = Column(Text, nullable=False)
-    contact_number = Column(String(20), nullable=False)
 
 class OrderTracking(Base):
     __tablename__ = "order_tracking"
@@ -544,36 +547,38 @@ async def send_proactive_update(user_id: str, update_type: str):
 async def create_delivery_order(order_req: DeliveryOrderRequest):
     async with async_session() as session:
         try:
-            # Generate a unique order ID using UUID
-            order_id = str(uuid.uuid4())
+            # Generate a unique order ID
+            order_id = str(uuid4())
+
+            # Ensure all fields are properly assigned (avoid NULL errors)
             new_order = Order(
                 order_id=order_id,
                 user_id=order_req.user_id,
                 status="pending",
-                package_description=order_req.package_description,
-                pickup_address=order_req.pickup_address,
-                delivery_address=order_req.delivery_address,
-                contact_number=order_req.contact_number,
+                payment_reference=None,  # Ensure it is explicitly set
+                last_location=None,  # Ensure it is explicitly set
+                package_description=order_req.package_description or "Food package",
+                pickup_address=order_req.pickup_address or "Unknown Pickup Address",
+                delivery_address=order_req.delivery_address or "Unknown Delivery Address",
+                contact_number=order_req.contact_number or "Unknown Contact Number",
             )
+
+            # Add order to the database
             session.add(new_order)
             await session.commit()
-            await session.refresh(new_order)
-            
-            # Calculate the total amount (update this logic as needed)
-            # For example, you might calculate the amount based on package details or add a fixed delivery fee
-            total_amount = 10000  # Amount in kobo (₦100.00); replace with actual logic
+            await session.refresh(new_order)  # Refresh object to ensure DB commit
 
-            # Retrieve user's email - use a default if not provided
+            # Calculate the total amount (update logic as needed)
+            total_amount = 10000  # Amount in kobo (₦100.00); update this as required
+
+            # Retrieve user's email (use a default if not provided)
             email = getattr(order_req, "email", "[email protected]")
-            
-            # Initialize the payment with Paystack
+
+            # Initialize payment with Paystack
             payment_data = create_paystack_payment_link(email, total_amount, order_id)
-            
-            # Optional: Notify management of the new order (using a WhatsApp API call or similar)
+
             if payment_data.get("status"):
                 payment_link = payment_data["data"]["authorization_url"]
-                # You could also schedule a background task to notify management
-                # e.g., asyncio.create_task(send_whatsapp_message(MANAGEMENT_WHATSAPP_NUMBER, f"New order {order_id} created."))
                 return {
                     "delivery_id": new_order.order_id,
                     "payment_link": payment_link,
@@ -582,13 +587,15 @@ async def create_delivery_order(order_req: DeliveryOrderRequest):
             else:
                 return {
                     "delivery_id": new_order.order_id,
-                    "message": "Order created, but we could not initialize payment. Please try again later."
+                    "message": "Order created, but payment initialization failed. Please try again later."
                 }
+
         except SQLAlchemyError as e:
             await session.rollback()
-            raise HTTPException(status_code=500, detail="Error creating delivery order.") from e
-
-
+            raise HTTPException(status_code=500, detail=f"Database error: {str(e)}") from e
+        except Exception as e:
+            await session.rollback()
+            raise HTTPException(status_code=500, detail=f"Unexpected error: {str(e)}") from e
 # --------------------
 # ERROR HANDLING
 # --------------------