fix(pl): harden load-contract product checks and tests
Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
1 parent
fbcd27b213
commit
a6d900ee1f
2 files changed
+32
-10
No files matched your search
@@ -480,10 +480,22 @@ def assert_at_most_one_contract(
|
||||
return links
|
||||
|
||||
|
||||
def _assert_product_rows_in_contract_allowed(products: Optional[list], allowed: set[str]) -> None:
|
||||
for prod in products or []:
|
||||
pid = str(getattr(prod, "product_id", None) or "").strip()
|
||||
name = (getattr(prod, "product_name", None) or pid or "未命名").strip()
|
||||
if not pid or pid not in allowed:
|
||||
raise HTTPException(
|
||||
status_code=422,
|
||||
detail=f"装货产品「{name}」不在所选合同明细中",
|
||||
)
|
||||
|
||||
|
||||
def assert_load_products_in_selected_contract(
|
||||
db: Session,
|
||||
tenant_no: str,
|
||||
load: PlanLoadBody,
|
||||
plan_products: Optional[list] = None,
|
||||
) -> None:
|
||||
if is_internal_customer_name(load.customer_name):
|
||||
return
|
||||
@@ -507,14 +519,8 @@ def assert_load_products_in_selected_contract(
|
||||
for r in rows
|
||||
if getattr(r, "product_id", None) and str(r.product_id).strip()
|
||||
}
|
||||
for prod in load.products or []:
|
||||
pid = str(getattr(prod, "product_id", None) or "").strip()
|
||||
name = (getattr(prod, "product_name", None) or pid or "未命名").strip()
|
||||
if not pid or pid not in allowed:
|
||||
raise HTTPException(
|
||||
status_code=422,
|
||||
detail=f"装货产品「{name}」不在所选合同明细中",
|
||||
)
|
||||
_assert_product_rows_in_contract_allowed(load.products, allowed)
|
||||
_assert_product_rows_in_contract_allowed(plan_products, allowed)
|
||||
|
||||
|
||||
def _resolve_stop_contracts(
|
||||
@@ -589,7 +595,7 @@ def validate_plan_stops_write(
|
||||
resolved_deliveries.append(delivery)
|
||||
|
||||
enrich_stop_addresses_from_library(db, tenant_no, load, resolved_deliveries)
|
||||
assert_load_products_in_selected_contract(db, tenant_no, load)
|
||||
assert_load_products_in_selected_contract(db, tenant_no, load, plan_products=products)
|
||||
return load, resolved_deliveries
|
||||
|
||||
|
||||
|
||||
@@ -101,11 +101,12 @@ def test_assert_load_products_skips_internal_customer():
|
||||
from app.services.pl_internal_customer import INTERNAL_CUSTOMER_NAMES
|
||||
|
||||
internal = next(iter(INTERNAL_CUSTOMER_NAMES))
|
||||
# Empty/mismatched contract products — would 422 for external customer.
|
||||
db = _FakeDb([])
|
||||
load = PlanLoadBody(
|
||||
customerId="cust-1",
|
||||
customerName=internal,
|
||||
contracts=[],
|
||||
contracts=[PlanContractLink(contractId="c1", contractNo="N1")],
|
||||
products=[
|
||||
PlanStopProductBody(
|
||||
productId="p1",
|
||||
@@ -117,3 +118,18 @@ def test_assert_load_products_skips_internal_customer():
|
||||
],
|
||||
)
|
||||
assert_load_products_in_selected_contract(db, "shanxia2.0", load)
|
||||
|
||||
|
||||
def test_assert_plan_products_outside_contract_raises():
|
||||
db = _FakeDb(["p1"])
|
||||
load = _load_with_products(["p1"])
|
||||
plan_products = [
|
||||
SimpleNamespace(product_id="p2", product_name="计划外产品"),
|
||||
]
|
||||
with pytest.raises(HTTPException) as exc:
|
||||
assert_load_products_in_selected_contract(
|
||||
db, "shanxia2.0", load, plan_products=plan_products
|
||||
)
|
||||
assert exc.value.status_code == 422
|
||||
assert "计划外产品" in str(exc.value.detail)
|
||||
assert "不在所选合同明细中" in str(exc.value.detail)
|
||||
Reference in new issue
Block a user