update physical orders: colors

routers/payments.py

@@ -38,15 +38,16 @@ class UpdateSubscriptionRequest(BaseModel):
 class PhysicalProductRequest(BaseModel):
     generated_model_id: int
     size_scale: float = 1.0
-    material: str = "pla"
+    color: str = "gray"
 
 class PriceQuote(BaseModel):
     material: str
+    color: str
     mass_g: float
     time_min: int
     amount_gbp: float
     client_secret: str
-    print_job_id: int
+    print_job_id: Optional[int] = None
 
 # Subscription plan configurations
 SUBSCRIPTION_PLANS = {
@@ -199,11 +200,12 @@ async def quote_and_pay_physical_product(
     """
     Get a price quote for 3D printing a generated model and create payment intent.
     Retrieves the model from database and applies size scaling to calculate costs.
+    Material is always PLA, but user can select color.
     """
     try:
-        if request.material not in MATERIALS:
-            raise HTTPException(status_code=400, detail="Unknown material")
-
+        # Material is always PLA
+        material = "pla"
+        
         if request.size_scale <= 0:
             raise HTTPException(status_code=400, detail="Size scale must be positive")
 
@@ -311,11 +313,11 @@ async def quote_and_pay_physical_product(
         def estimate_fullness(vol_cm3: float) -> float:
             """Return a heuristic fullness (0–1) based on total volume."""
             if vol_cm3 <= 500:
-                return 0.8  # small parts tend to be more solid
+                return 1.5  # small parts tend to be more solid
             elif vol_cm3 <= 1500:
-                return 0.6
+                return 1.2
             elif vol_cm3 <= 3000:
-                return 0.5
+                return 0.6
             else:
                 return 0.3  # large parts are mostly hollow / sparse infill
 
@@ -328,7 +330,7 @@ async def quote_and_pay_physical_product(
         fullness_factor = estimate_fullness(bbox_volume_cm3)
         scaled_volume_cm3 = bbox_volume_cm3 * fullness_factor
         
-        density = MATERIALS[request.material]["density"]
+        density = MATERIALS[material]["density"]
         mass_g = scaled_volume_cm3 * density
 
         # ───────────────────────────────────────────────────────────────
@@ -349,7 +351,7 @@ async def quote_and_pay_physical_product(
         #   – 0.2 mm layer height
         #   – Deposition rate = nozzle × layer_height × print_speed  (mm³/s)
 
-        print_speed = MATERIALS[request.material]["speed_mm_s"]
+        print_speed = MATERIALS[material]["speed_mm_s"]
         nozzle_diameter_mm = 0.4
         layer_height_mm = 0.2
         deposition_area_mm2 = nozzle_diameter_mm * layer_height_mm  # cross-sectional area of extrusion
@@ -371,7 +373,7 @@ async def quote_and_pay_physical_product(
         )
 
         # 4️⃣ Calculate pricing (server-authoritative)
-        material_price = mass_g * MATERIALS[request.material]["ppg"]
+        material_price = mass_g * MATERIALS[material]["ppg"]
 
         # Pricing model: material cost + setup fee, with a minimum total price.
         MIN_TOTAL_PRICE_GBP = 2.00
@@ -394,7 +396,8 @@ async def quote_and_pay_physical_product(
             metadata={
                 "user_id": current_user.id,
                 "generated_model_id": request.generated_model_id,
-                "material": request.material,
+                "material": material,
+                "color": request.color,
                 "size_scale": str(request.size_scale),
                 "mass_g": f"{mass_g:.2f}",
                 "time_min": str(time_min),
@@ -404,30 +407,14 @@ async def quote_and_pay_physical_product(
             automatic_payment_methods={"enabled": True},
         )
 
-        # 6️⃣ Store preliminary print job record
-        print_job_result = supabase.from_("Print_Jobs").insert({
-            "user_id": current_user.id,
-            "generated_model_id": request.generated_model_id,
-            "stripe_payment_intent_id": intent.id,
-            "status": "awaiting_payment",
-            "material": request.material,
-            "size_scale": request.size_scale,
-            "mass_g": mass_g,
-            "time_min": time_min,
-            "price_gbp": amount_gbp,
-            "model_name": model_data.get("model_name", ""),
-            "created_at": datetime.now().isoformat()
-        }).execute()
-
-        print_job_id = print_job_result.data[0]["id"] if print_job_result.data else None
-
         return PriceQuote(
-            material=request.material,
+            material=material,
+            color=request.color,
             mass_g=round(mass_g, 2),
             time_min=time_min,
             amount_gbp=amount_gbp,
             client_secret=intent.client_secret,
-            print_job_id=print_job_id
+            print_job_id=None  # Will be created only when payment is confirmed
         )
 
     except HTTPException:
@@ -463,20 +450,30 @@ async def confirm_physical_payment(
         
         # Check if this payment has already been processed
         existing_job = supabase.from_("Print_Jobs").select("*").eq("stripe_payment_intent_id", request.payment_intent_id).execute()
-        if existing_job.data and existing_job.data[0]["status"] != "awaiting_payment":
+        if existing_job.data:
             return {"message": "Payment already processed", "print_job_id": existing_job.data[0]["id"]}
         
-        # Update print job status to paid/processing
-        update_result = supabase.from_("Print_Jobs").update({
+        # Create print job record now that payment is confirmed
+        print_job_result = supabase.from_("Print_Jobs").insert({
+            "user_id": current_user.id,
+            "generated_model_id": intent.metadata.get("generated_model_id"),
+            "stripe_payment_intent_id": request.payment_intent_id,
             "status": "paid",
-            "payment_confirmed_at": datetime.now().isoformat(),
-            "updated_at": datetime.now().isoformat()
-        }).eq("stripe_payment_intent_id", request.payment_intent_id).execute()
+            "material": intent.metadata.get("material"),
+            "color": intent.metadata.get("color"),
+            "size_scale": float(intent.metadata.get("size_scale")),
+            "mass_g": float(intent.metadata.get("mass_g")),
+            "time_min": int(intent.metadata.get("time_min")),
+            "price_gbp": float(intent.amount) / 100,  # Convert from pence to pounds
+            "model_name": intent.metadata.get("model_name", ""),
+            "created_at": datetime.now().isoformat(),
+            "payment_confirmed_at": datetime.now().isoformat()
+        }).execute()
         
-        if not update_result.data:
-            raise HTTPException(status_code=404, detail="Print job not found")
+        if not print_job_result.data:
+            raise HTTPException(status_code=500, detail="Failed to create print job record")
         
-        print_job = update_result.data[0]
+        print_job = print_job_result.data[0]
         
         # Record in Model_Order_History for tracking
         supabase.from_("Model_Order_History").insert({
@@ -844,12 +841,26 @@ async def handle_physical_payment_succeeded(payment_intent):
         return
     
     try:
-        # Update print job status to paid
-        supabase.from_("Print_Jobs").update({
-            "status": "paid",
-            "payment_confirmed_at": datetime.now().isoformat(),
-            "updated_at": datetime.now().isoformat()
-        }).eq("stripe_payment_intent_id", payment_intent["id"]).execute()
+        # Check if print job already exists (from confirm_physical_payment endpoint)
+        existing_job = supabase.from_("Print_Jobs").select("*").eq("stripe_payment_intent_id", payment_intent["id"]).execute()
+        
+        if not existing_job.data:
+            # Create print job record if it doesn't exist (webhook processed before API call)
+            supabase.from_("Print_Jobs").insert({
+                "user_id": user_id,
+                "generated_model_id": generated_model_id,
+                "stripe_payment_intent_id": payment_intent["id"],
+                "status": "paid",
+                "material": payment_intent.metadata.get("material"),
+                "color": payment_intent.metadata.get("color"),
+                "size_scale": float(payment_intent.metadata.get("size_scale")),
+                "mass_g": float(payment_intent.metadata.get("mass_g")),
+                "time_min": int(payment_intent.metadata.get("time_min")),
+                "price_gbp": float(payment_intent["amount"]) / 100,
+                "model_name": payment_intent.metadata.get("model_name", ""),
+                "created_at": datetime.now().isoformat(),
+                "payment_confirmed_at": datetime.now().isoformat()
+            }).execute()
         
         # Update Model_Order_History if exists
         supabase.from_("Model_Order_History").update({