Update app.py

app.py

@@ -543,59 +543,58 @@ async def send_proactive_update(user_id: str, update_type: str):
     
     return response
 
+
 @app.post("/delivery")
 async def create_delivery_order(order_req: DeliveryOrderRequest):
-    async with async_session() as session:
-        try:
-            # Generate a unique order ID
-            order_id = str(uuid4())
+    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", "customer@example.com")
+
+        # 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."
+            }
 
-            # Ensure all fields are properly assigned (avoid NULL errors)
-            new_order = Order(
-                order_id=order_id,
-                user_id=order_req.user_id,
-                status="pending",
-                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",
-            )
+    except Exception as e:
+        raise HTTPException(status_code=500, detail=f"Error: {str(e)}")
 
-            # Add order to the database
-            session.add(new_order)
-            await session.commit()
-            await session.refresh(new_order)  # Refresh object to ensure DB commit
-
-            # 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", "customer@example.com")
-
-            # Initialize payment with Paystack
-            payment_data = create_paystack_payment_link(email, total_amount, order_id)
-
-            if payment_data.get("status"):
-                payment_link = payment_data["data"]["authorization_url"]
-                return {
-                    "delivery_id": new_order.order_id,
-                    "payment_link": payment_link,
-                    "message": "Order created successfully. Please complete payment using the link provided."
-                }
-            else:
-                return {
-                    "delivery_id": new_order.order_id,
-                    "message": "Order created, but payment initialization failed. Please try again later."
-                }
-
-        except SQLAlchemyError as e:
-            await session.rollback()
-            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
 # --------------------