From 27c85f43484bdb1bb3fc3d104ca316988f43f57d Mon Sep 17 00:00:00 2001 From: kenzycodex Date: Wed, 11 Nov 2026 09:31:21 +0000 Subject: [PATCH] Keep the bank's fee and VAT when a requery reply leaves them out The sandbox's requery reply carries the status only, which blanked the charges on the result screen. Read them from the transfer record instead, and never overwrite recorded charges with missing ones. --- api/services/forge_transfers.py | 19 +++++++++++++------ api/tests/test_forge_flow.py | 16 ++++++++++++++++ 2 files changed, 29 insertions(+), 6 deletions(-) diff --git a/api/services/forge_transfers.py b/api/services/forge_transfers.py index 01ba152..9c8bf32 100644 --- a/api/services/forge_transfers.py +++ b/api/services/forge_transfers.py @@ -80,8 +80,17 @@ def _set(transfer_id: str, **fields) -> None: def _apply_bank_reply(transfer_id: str, data: dict) -> dict: state = _BANK_STATES.get(str(data.get("status", "")).lower(), "pending") - _set(transfer_id, state=state, fee=data.get("fee"), vat=data.get("vat"), - stamp_duty=data.get("stamp_duty"), total_debit=data.get("total_debit"), last_error=None) + row = get(transfer_id) or {} + if state in FINAL and data.get("fee") is None and row.get("reference"): + # The requery reply carries the status only; the transfer record has + # the charges, so read them from there rather than show none. + try: + data = {**forge_bank.transfer_status(row["reference"]), **{"status": data.get("status")}} + except Exception: # noqa: BLE001 - the charges are shown later, never block the state + logger.warning("Could not read the charges for %s", row["reference"]) + # A reply without charges never wipes the ones already recorded. + charges = {k: data[k] for k in ("fee", "vat", "stamp_duty", "total_debit") if data.get(k) is not None} + _set(transfer_id, state=state, last_error=None, **charges) _teach_baseline(transfer_id, state) return get(transfer_id) @@ -177,9 +186,7 @@ def apply_event(event: str, data: dict) -> dict | None: # A final state is never walked back to pending by a late or replayed event. if row["state"] in FINAL and mapped == "pending": return row - _set(row["id"], state=mapped, - fee=data.get("fee", row["fee"]), vat=data.get("vat", row["vat"]), - stamp_duty=data.get("stamp_duty", row["stamp_duty"]), - total_debit=data.get("total_debit", row["total_debit"])) + charges = {k: data[k] for k in ("fee", "vat", "stamp_duty", "total_debit") if data.get(k) is not None} + _set(row["id"], state=mapped, **charges) _teach_baseline(row["id"], mapped) return get(row["id"]) diff --git a/api/tests/test_forge_flow.py b/api/tests/test_forge_flow.py index a284993..f36ec04 100644 --- a/api/tests/test_forge_flow.py +++ b/api/tests/test_forge_flow.py @@ -26,6 +26,7 @@ class FakeBank: def __init__(self): self.calls = [] self.send_mode = "pending" # pending | timeout + self.requery_has_charges = True # the real sandbox's requery reply carries the status only def posts_to(self, suffix): return [c for c in self.calls if c["method"] == "POST" and c["url"].endswith(suffix)] @@ -44,8 +45,13 @@ def __call__(self, method, url, payload, headers, timeout): raise socket.timeout("timed out") return ok({"status": "pending", "reference": payload["reference"]}, 202) if url.endswith("/requery"): + if not self.requery_has_charges: + return ok({"status": "successful", "reference": payload["reference"]}) return ok({"status": "successful", "reference": payload["reference"], "fee": 50.0, "vat": 3.75, "stamp_duty": 50.0, "total_debit": payload.get("amount", 0)}) + if method == "GET" and "/transfers/" in url: + return ok({"status": "successful", "reference": url.rsplit("/", 1)[-1], "fee": 10.0, "vat": 0.75, + "stamp_duty": 0.0, "total_debit": 5010.75}) raise AssertionError(f"unexpected bank call {method} {url}") @@ -251,3 +257,13 @@ def test_the_webhook_needs_a_configured_secret(world, monkeypatch): monkeypatch.delenv("FORGE_WEBHOOK_SECRET", raising=False) raw, headers = _signed({"event": "transfer.successful", "event_id": "evt_x", "data": {}}) assert world[0].post("/v1/forge/hooks/bank", content=raw, headers=headers).status_code == 503 + + +def test_charges_come_from_the_transfer_record_when_the_requery_has_none(world, bank): + client, headers = world + bank.requery_has_charges = False + res = client.post("/v1/forge/transfer", json=_transfer(5_000), headers=headers) + assert res.status_code == 200, res.text + t = res.json()["transfer"] + assert t["state"] == "successful" + assert (t["fee"], t["vat"], t["total_debit"]) == (10.0, 0.75, 5010.75)