fix(retry): pre-populate price list before re-importing failed orders

Production VENDING orders #485841978 and #485841895 (2026-04-28) crashed
on Retry with PL/SQL COM-001 because the retry path skipped the
CRM_POLITICI_PRET_ART pre-population step that bulk sync runs.

The price-list auto-insert (PRET=0) for missing CODMATs was only invoked
in sync_service.run_sync (lines 592-718). retry_service called
import_single_order directly, hitting pack_comenzi.adauga_articol_comanda
NO_DATA_FOUND on every CODMAT without a price entry.

Extracted the validation block into validation_service.pre_validate_order_prices
and call it from both bulk sync and retry. Single source of truth for
SKU validation, dual-policy routing (cont 341/345 → productie),
ARTICOLE_TERTI mapping resolution, and kit component price gating.

Tests: 3 unit + 3 oracle integration covering the regression scenario,
empty input, dual-policy routing, idempotency, and pre-validation
exception propagation.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This commit is contained in:
Claude Agent
2026-04-29 10:19:38 +00:00
parent 874ba4ca4e
commit bcd65d9fd6
4 changed files with 608 additions and 130 deletions

View File

@@ -529,6 +529,147 @@ def resolve_mapped_codmats(mapped_skus: set[str], conn,
return result
def pre_validate_order_prices(orders, app_settings: dict, conn, id_pol: int,
id_pol_productie: int = None,
id_gestiuni: list[int] = None,
validation: dict = None,
log_callback=None,
cota_tva: float = 21) -> dict:
"""Pre-validate prices for orders before importing them via PACK_IMPORT_COMENZI.
Auto-inserts PRET=0 rows in CRM_POLITICI_PRET_ART for missing CODMATs so
PL/SQL adauga_articol_comanda doesn't raise COM-001. Mutates
app_settings["_codmat_policy_map"] for build_articles_json routing.
Used by both bulk sync (sync_service.run_sync) and retry (retry_service).
Args:
orders: list of orders to scan for SKUs/CODMATs
app_settings: mutated with _codmat_policy_map (SKU/CODMAT → id_pol)
conn: Oracle connection (caller manages lifecycle)
id_pol: default sales price policy
id_pol_productie: production policy for cont 341/345 (None = single-policy)
id_gestiuni: gestiune filter for resolve_mapped_codmats
validation: output of validate_skus; computed internally if None
log_callback: optional Callable[[str], None] for progress messages
cota_tva: VAT rate for PROC_TVAV metadata (default 21)
Returns: {"codmat_policy_map": dict, "kit_missing": dict, "validation": dict}
- codmat_policy_map: {codmat_or_sku: id_pol}
- kit_missing: {sku: [missing_codmats]} for kits with unprice components
- validation: validate_skus result (for caller convenience)
"""
log = log_callback or (lambda _msg: None)
if not orders:
return {"codmat_policy_map": {}, "kit_missing": {}, "validation": validation or {}}
if validation is None:
all_skus = {item.sku for o in orders for item in o.items if item.sku}
validation = validate_skus(all_skus, conn, id_gestiuni)
log("Validare preturi...")
# Direct CODMATs (SKU exists in NOM_ARTICOLE without ARTICOLE_TERTI mapping)
all_codmats = set()
for order in orders:
for item in order.items:
if item.sku in validation["mapped"]:
continue
if item.sku in validation["direct"]:
all_codmats.add(item.sku)
codmat_policy_map = {}
if all_codmats:
if id_pol_productie:
codmat_policy_map = validate_and_ensure_prices_dual(
all_codmats, id_pol, id_pol_productie,
conn, validation.get("direct_id_map"), cota_tva=cota_tva,
)
log(f"Politici duale: "
f"{sum(1 for v in codmat_policy_map.values() if v == id_pol)} vanzare, "
f"{sum(1 for v in codmat_policy_map.values() if v == id_pol_productie)} productie")
else:
price_result = validate_prices(
all_codmats, id_pol, conn, validation.get("direct_id_map"),
)
if price_result["missing_price"]:
logger.info(
f"Auto-adding price 0 for {len(price_result['missing_price'])} "
f"direct articles in policy {id_pol}"
)
ensure_prices(
price_result["missing_price"], id_pol,
conn, validation.get("direct_id_map"), cota_tva=cota_tva,
)
# Mapped SKUs (via ARTICOLE_TERTI)
mapped_skus_in_orders = {
item.sku for o in orders for item in o.items
if item.sku in validation["mapped"]
}
mapped_codmat_data = {}
if mapped_skus_in_orders:
mapped_codmat_data = resolve_mapped_codmats(
mapped_skus_in_orders, conn, id_gestiuni=id_gestiuni,
)
mapped_id_map = {}
for sku, entries in mapped_codmat_data.items():
for entry in entries:
mapped_id_map[entry["codmat"]] = {
"id_articol": entry["id_articol"],
"cont": entry.get("cont"),
}
mapped_codmats = set(mapped_id_map.keys())
if mapped_codmats:
if id_pol_productie:
mapped_policy_map = validate_and_ensure_prices_dual(
mapped_codmats, id_pol, id_pol_productie,
conn, mapped_id_map, cota_tva=cota_tva,
)
codmat_policy_map.update(mapped_policy_map)
else:
mp_result = validate_prices(
mapped_codmats, id_pol, conn, mapped_id_map,
)
if mp_result["missing_price"]:
ensure_prices(
mp_result["missing_price"], id_pol,
conn, mapped_id_map, cota_tva=cota_tva,
)
# Bridge SKU → policy via 1:1 mappings (build_articles_json reads by SKU)
if codmat_policy_map and mapped_codmat_data:
for sku, entries in mapped_codmat_data.items():
if len(entries) == 1:
codmat = entries[0]["codmat"]
if codmat in codmat_policy_map:
codmat_policy_map[sku] = codmat_policy_map[codmat]
if codmat_policy_map:
app_settings["_codmat_policy_map"] = codmat_policy_map
# Kit component price gating
kit_missing = {}
kit_pricing_mode = app_settings.get("kit_pricing_mode")
if kit_pricing_mode and mapped_codmat_data:
kit_missing = validate_kit_component_prices(
mapped_codmat_data, id_pol, id_pol_productie, conn,
)
if kit_missing:
for sku, missing_codmats in kit_missing.items():
log(f"Kit {sku}: prețuri lipsă pentru {', '.join(missing_codmats)}")
return {
"codmat_policy_map": codmat_policy_map,
"kit_missing": kit_missing,
"validation": validation,
"mapped_codmat_data": mapped_codmat_data,
}
def validate_kit_component_prices(mapped_codmat_data: dict, id_pol: int,
id_pol_productie: int = None, conn=None) -> dict:
"""Pre-validate that kit components have non-zero prices in crm_politici_pret_art.