Update app.py

app.py

@@ -251,6 +251,64 @@ app = FastAPI(title="Delivery Service Chatbot")
 async def on_startup():
     await init_db()
 
+logger = logging.getLogger(__name__)
+
+@app.post("/delivery")
+async def create_delivery_order(order_req: DeliveryOrderRequest):
+    try:
+        logger.info(f"Received order request: {order_req}")
+
+        # Generate a unique order ID
+        order_id = str(uuid.uuid4())
+
+        # Extract delivery location from the request
+        delivery_address = order_req.delivery_address.lower()
+
+        # Determine the shipping cost based on the location
+        shipping_cost = TOWN_SHIPPING_COSTS.get("default", 1000)  # Default cost
+        for town, cost in TOWN_SHIPPING_COSTS.items():
+            if town in delivery_address:
+                shipping_cost = cost
+                break  # Stop once a match is found
+
+        # Set a fixed item price (Modify this if price varies per package)
+        item_price = 5000  # ₦5000 for the package (adjust as needed)
+
+        # Calculate the total amount (item price + shipping cost)
+        total_amount = item_price + shipping_cost
+
+        # Convert to kobo (since Paystack expects amount in kobo)
+        total_amount_kobo = total_amount * 100  
+
+        # Retrieve user's email (use a default if not provided)
+        email = getattr(order_req, "email", "[email protected]")
+
+        # Generate Paystack payment link
+        payment_data = create_paystack_payment_link(email, total_amount_kobo, order_id)
+
+        logger.info(f"Generated payment data: {payment_data}")
+
+        if payment_data.get("status"):
+            payment_link = payment_data["data"]["authorization_url"]
+            return {
+                "order_id": order_id,
+                "total_amount": f"₦{total_amount}",
+                "shipping_cost": f"₦{shipping_cost}",
+                "payment_link": payment_link,
+                "message": "Order created successfully. Please complete payment using the link provided."
+            }
+        else:
+            return {
+                "order_id": order_id,
+                "total_amount": f"₦{total_amount}",
+                "shipping_cost": f"₦{shipping_cost}",
+                "message": "Order created, but payment initialization failed. Please try again later."
+            }
+
+    except Exception as e:
+        logger.error(f"Error creating delivery order: {e}", exc_info=True)
+        raise HTTPException(status_code=500, detail=f"Error: {str(e)}")
+
 @app.post("/chatbot")
 async def enhanced_chatbot_handler(request: Request, bg: BackgroundTasks):
     data = await request.json()
@@ -282,6 +340,7 @@ async def enhanced_chatbot_handler(request: Request, bg: BackgroundTasks):
     bg.add_task(update_user_last_interaction, user_id)
     return JSONResponse(response)
 
+    
 def create_paystack_payment_link(email: str, amount: int, reference: str) -> dict:
     url = "https://api.paystack.co/transaction/initialize"
     headers = {
@@ -290,18 +349,13 @@ def create_paystack_payment_link(email: str, amount: int, reference: str) -> dic
     }
     data = {
         "email": email,
-        "amount": amount,  # Amount in kobo (i.e. 10000 = ₦100)
+        "amount": amount,  # Amount must be in kobo (₦100 = 10000 kobo)
         "reference": reference,
-        "callback_url": os.getenv("PAYMENT_REDIRECT_URL", "https://default-redirect.com")
+        "callback_url": "https://your-website.com/payment_callback"
     }
-    try:
-        response = requests.post(url, json=data, headers=headers, timeout=10)
-        if response.status_code == 200:
-            return response.json()
-        else:
-            return {"status": False, "message": "Failed to initialize payment."}
-    except Exception as e:
-        return {"status": False, "message": str(e)}
+    response = requests.post(url, json=data, headers=headers, timeout=10)
+    return response.json() if response.status_code == 200 else {"status": False, "message": "Payment initialization failed"}
+
 
 @app.post("/ux/preferences")
 async def update_ux_preferences(request: Request):
@@ -544,56 +598,6 @@ async def send_proactive_update(user_id: str, update_type: str):
     return response
 
 
-@app.post("/delivery")
-async def create_delivery_order(order_req: DeliveryOrderRequest):
-    try:
-        # Generate a unique order ID
-        order_id = str(uuid.uuid4())
-
-        # Extract delivery location from the request
-        delivery_address = order_req.delivery_address.lower()
-
-        # Determine the shipping cost based on the location
-        shipping_cost = TOWN_SHIPPING_COSTS.get("default", 1000)  # Default cost
-        for town, cost in TOWN_SHIPPING_COSTS.items():
-            if town in delivery_address:
-                shipping_cost = cost
-                break  # Stop once a match is found
-
-        # Set a fixed item price (Modify this if price varies per package)
-        item_price = 5000  # ₦5000 for the package (adjust as needed)
-
-        # Calculate the total amount (item price + shipping cost)
-        total_amount = item_price + shipping_cost
-
-        # Convert to kobo (since Paystack expects amount in kobo)
-        total_amount_kobo = total_amount * 100  
-
-        # Retrieve user's email (use a default if not provided)
-        email = getattr(order_req, "email", "[email protected]")
-
-        # Generate Paystack payment link
-        payment_data = create_paystack_payment_link(email, total_amount_kobo, order_id)
-
-        if payment_data.get("status"):
-            payment_link = payment_data["data"]["authorization_url"]
-            return {
-                "order_id": order_id,
-                "total_amount": f"₦{total_amount}",
-                "shipping_cost": f"₦{shipping_cost}",
-                "payment_link": payment_link,
-                "message": "Order created successfully. Please complete payment using the link provided."
-            }
-        else:
-            return {
-                "order_id": order_id,
-                "total_amount": f"₦{total_amount}",
-                "shipping_cost": f"₦{shipping_cost}",
-                "message": "Order created, but payment initialization failed. Please try again later."
-            }
-
-    except Exception as e:
-        raise HTTPException(status_code=500, detail=f"Error: {str(e)}")
 
 # --------------------
 # ERROR HANDLING