v1.3 - client and admin scaffolding

backend/app/services/costing_engine.py

@@ -123,7 +123,11 @@ def _get_process_costs(db: Session, process_name: str | None, overrides: dict) -
     if not process_name:
         return 0.0, 0.0, 0.0, ["Missing bagging process"]
 
-    rule = db.scalar(select(ProcessCostRule).where(ProcessCostRule.process_name == process_name))
+    tenant_id = overrides.get("tenant_id")
+    query = select(ProcessCostRule).where(ProcessCostRule.process_name == process_name)
+    if tenant_id:
+        query = query.where(ProcessCostRule.tenant_id == tenant_id)
+    rule = db.scalar(query)
     if rule is None:
         return 0.0, 0.0, 0.0, [f"Process rule not found for {process_name}"]
 
@@ -138,13 +142,14 @@ def _get_packaging_cost(db: Session, product: Product, overrides: dict) -> tuple
     if product.own_bag:
         return 0.0, []
 
-    rule = db.scalar(
-        select(PackagingCostRule).where(
-            PackagingCostRule.sale_type == product.sale_type,
-            PackagingCostRule.unit_of_measure == product.unit_of_measure,
-            PackagingCostRule.own_bag == product.own_bag,
-        )
+    query = select(PackagingCostRule).where(
+        PackagingCostRule.sale_type == product.sale_type,
+        PackagingCostRule.unit_of_measure == product.unit_of_measure,
+        PackagingCostRule.own_bag == product.own_bag,
     )
+    if product.tenant_id:
+        query = query.where(PackagingCostRule.tenant_id == product.tenant_id)
+    rule = db.scalar(query)
     if rule is None:
         return 0.0, ["Packaging rule not found"]
 
@@ -152,12 +157,13 @@ def _get_packaging_cost(db: Session, product: Product, overrides: dict) -> tuple
 
 
 def _get_freight_cost(db: Session, product: Product, overrides: dict) -> tuple[float, list[str]]:
-    rule = db.scalar(
-        select(FreightCostRule).where(
-            FreightCostRule.sale_type == product.sale_type,
-            FreightCostRule.unit_of_measure == product.unit_of_measure,
-        )
+    query = select(FreightCostRule).where(
+        FreightCostRule.sale_type == product.sale_type,
+        FreightCostRule.unit_of_measure == product.unit_of_measure,
     )
+    if product.tenant_id:
+        query = query.where(FreightCostRule.tenant_id == product.tenant_id)
+    rule = db.scalar(query)
     if rule is None:
         return 0.0, ["Freight rule not found"]
     return overrides.get("freight_costs", {}).get(str(rule.id), rule.cost_per_unit), []
@@ -185,9 +191,11 @@ def _extract_unit_quantity_kg(unit_of_measure: str) -> float:
 
 def calculate_product_cost(db: Session, product_id: int, overrides: dict | None = None) -> dict:
     overrides = overrides or {}
+    overrides = {**overrides, "tenant_id": overrides.get("tenant_id")}
     product = db.scalar(select(Product).where(Product.id == product_id).options(selectinload(Product.mix)))
     if product is None:
         raise ValueError(f"Product {product_id} not found")
+    overrides["tenant_id"] = product.tenant_id
 
     mix_result = calculate_mix_cost(db, product.mix_id, overrides=overrides)
     warnings = list(mix_result["warnings"])