B-44: 返修——多币种对方汇总、镜像科目筛选、冲销独立生效日、创建来源撤销边界与并发幂等

2026-08-19 13:28:28 +08:00
parent d59576739f
commit f16e8aad34
7 changed files with 528 additions and 91 deletions
@@ -262,6 +262,146 @@ class DecisionTests(LedgerBase):
                request_key="dec-x", actor=self.admin,
            )

+    def test_reverse_uses_explicit_effective_date_across_cutoff(self) -> None:
+        # Reversing with an independent effective date must keep the original
+        # impact for cutoffs before it and net it to zero only on/after it —
+        # never rewrite the historical period retroactively.
+        from bank_importer import positions
+        approved = self.decide("approve_new")
+        event_id = approved["ledger_event_id"]
+        self.assertEqual("2026-01-10", self.current(event_id)["effective_at"][:10])
+
+        manual_records.decide(
+            self.connection, self.record["id"], "reverse",
+            reason="误录冲销", expected_decision_id=approved["decision_id"],
+            request_key="dec-rev-date", actor=self.admin,
+            effective_at="2026-06-15",
+        )
+        reversal = self.connection.execute(
+            "SELECT * FROM ledger_event_revisions WHERE posting_kind = 'reversal'"
+        ).fetchone()
+        self.assertEqual("2026-06-15", reversal["effective_at"][:10])
+
+        before = positions.company_balances(
+            self.connection, from_="2026-01-01", cutoff="2026-05-31"
+        )
+        after = positions.company_balances(
+            self.connection, from_="2026-01-01", cutoff="2026-07-31"
+        )
+        for item in before["items"]:
+            if item["company_id"] == self.company_a:
+                self.assertEqual("-50.00", item["result"]["signed_amount"])
+        for item in after["items"]:
+            if item["company_id"] == self.company_a:
+                self.assertEqual("0.00", item["result"]["signed_amount"])
+
+    def test_reverse_defaults_to_approval_business_day(self) -> None:
+        from datetime import datetime, timedelta, timezone
+        from bank_importer import positions
+        approved = self.decide("approve_new")
+        manual_records.decide(
+            self.connection, self.record["id"], "reverse",
+            reason="误录冲销", expected_decision_id=approved["decision_id"],
+            request_key="dec-rev-default", actor=self.admin,
+        )
+        today = datetime.now(timezone(timedelta(hours=8))).date().isoformat()
+        reversal = self.connection.execute(
+            "SELECT * FROM ledger_event_revisions WHERE posting_kind = 'reversal'"
+        ).fetchone()
+        self.assertEqual(today, reversal["effective_at"][:10])
+
+        # The day before the approval business day keeps the original impact.
+        before = positions.company_balances(
+            self.connection, from_="2026-01-01",
+            cutoff=(datetime.fromisoformat(today) - timedelta(days=1)).date().isoformat(),
+        )
+        for item in before["items"]:
+            if item["company_id"] == self.company_a:
+                self.assertEqual("-50.00", item["result"]["signed_amount"])
+
+    def test_reverse_of_creation_source_with_later_linked_evidence(self) -> None:
+        # approve_new created the event; a second manual record later links
+        # onto it. Reversing the creation source must still create an
+        # equal-amount reversal — the original economic impact must not survive
+        # just because other evidence was attached later.
+        approved = self.decide("approve_new")
+        event_id = approved["ledger_event_id"]
+
+        linked = manual_records.submit(
+            self.connection, company_id=self.company_a,
+            counterparty_company_id=self.company_b,
+            occurred_at="2026-01-12T09:00:00", direction="incoming",
+            amount="50.00", currency="CNY", funding_source="other",
+            requested_subject="receivable", request_key="mr-link-ev",
+            actor=self.admin,
+        )
+        manual_records.decide(
+            self.connection, linked["id"], "approve_link",
+            reason="同源补充证据", expected_decision_id=linked["decision_id"],
+            request_key="dec-link-ev", actor=self.admin,
+            target_ledger_event_id=event_id,
+        )
+        self.assertEqual(1, len(self.position_events()))
+
+        reversed_outcome = manual_records.decide(
+            self.connection, self.record["id"], "reverse",
+            reason="误录冲销", expected_decision_id=approved["decision_id"],
+            request_key="dec-rev-create", actor=self.admin,
+        )
+        self.assertEqual("reversed", reversed_outcome["state"])
+        rows = self.connection.execute(
+            "SELECT * FROM eligible_position_events ORDER BY ledger_event_id"
+        ).fetchall()
+        self.assertEqual(2, len(rows))
+        original, reversal = rows
+        self.assertEqual("normal", original["posting_kind"])
+        self.assertEqual("reversal", reversal["posting_kind"])
+        self.assertEqual(Decimal(original["amount"]), Decimal(reversal["amount"]))
+        # The later linked evidence stays attached to the event.
+        links = self.connection.execute(
+            "SELECT * FROM ledger_event_manual_sources ORDER BY manual_record_id"
+        ).fetchall()
+        self.assertEqual(2, len(links))
+
+    def test_reverse_of_linked_record_after_creation_reversal_detaches_only(self) -> None:
+        # M1 creates the event, M2 links; after M1's reversal created the
+        # offset, reversing the linked M2 must only detach, never add a second
+        # reversal event.
+        approved = self.decide("approve_new")
+        event_id = approved["ledger_event_id"]
+        linked = manual_records.submit(
+            self.connection, company_id=self.company_a,
+            counterparty_company_id=self.company_b,
+            occurred_at="2026-01-12T09:00:00", direction="incoming",
+            amount="50.00", currency="CNY", funding_source="other",
+            requested_subject="receivable", request_key="mr-link-ev2",
+            actor=self.admin,
+        )
+        linked_approved = manual_records.decide(
+            self.connection, linked["id"], "approve_link",
+            reason="同源补充证据", expected_decision_id=linked["decision_id"],
+            request_key="dec-link-ev2", actor=self.admin,
+            target_ledger_event_id=event_id,
+        )
+        manual_records.decide(
+            self.connection, self.record["id"], "reverse",
+            reason="误录冲销", expected_decision_id=approved["decision_id"],
+            request_key="dec-rev-create2", actor=self.admin,
+        )
+        manual_records.decide(
+            self.connection, linked["id"], "reverse",
+            reason="撤销关联证据", expected_decision_id=linked_approved["decision_id"],
+            request_key="dec-rev-link2", actor=self.admin,
+        )
+        reversals = self.connection.execute(
+            "SELECT COUNT(*) AS n FROM ledger_event_revisions WHERE posting_kind = 'reversal'"
+        ).fetchone()["n"]
+        self.assertEqual(1, reversals)
+        links = self.connection.execute(
+            "SELECT * FROM ledger_event_manual_sources"
+        ).fetchall()
+        self.assertEqual(1, len(links))
+

 class DedupAndConcurrencyTests(LedgerBase):
    def test_duplicate_manual_record_pairing_candidate(self) -> None:
@@ -343,6 +483,125 @@ class DedupAndConcurrencyTests(LedgerBase):
        ).fetchone()["n"]
        self.assertEqual(1, events)

+    def test_concurrent_submit_same_request_key_is_idempotent(self) -> None:
+        import sqlite3
+
+        results: list[dict] = []
+        errors: list[Exception] = []
+
+        def worker(thread_key: str) -> None:
+            try:
+                connection = sqlite3.connect(self.db_path, timeout=30)
+                connection.row_factory = sqlite3.Row
+                try:
+                    payload = manual_records.submit(
+                        connection, company_id=self.company_a,
+                        counterparty_company_id=self.company_b,
+                        occurred_at="2026-01-10T09:00:00", direction="incoming",
+                        amount="50.00", currency="CNY", funding_source="other",
+                        requested_subject="receivable",
+                        request_key="mr-conc-submit", actor=self.admin,
+                    )
+                    results.append(payload)
+                finally:
+                    connection.close()
+            except Exception as exc:  # pragma: no cover
+                errors.append(exc)
+
+        threads = [
+            threading.Thread(target=worker, args=(f"t{i}",)) for i in range(4)
+        ]
+        for thread in threads:
+            thread.start()
+        for thread in threads:
+            thread.join()
+
+        self.assertEqual([], errors)
+        rows = self.connection.execute(
+            "SELECT COUNT(*) AS n FROM manual_records"
+        ).fetchone()["n"]
+        self.assertEqual(1, rows)
+        self.assertEqual(1, len({payload["id"] for payload in results}))
+        decisions = self.connection.execute(
+            "SELECT COUNT(*) AS n FROM manual_record_decisions"
+        ).fetchone()["n"]
+        self.assertEqual(1, decisions)
+
+    def test_concurrent_confirm_subject_same_key_creates_single_revision(self) -> None:
+        import sqlite3
+
+        self.pair(self.company_a, self.company_b, "100.00")
+        from bank_importer import ledger_events
+        ledger_events.reconcile_bank_events(self.connection, actor=self.admin)
+        event_id = self.ledger_events()[0]["id"]
+
+        outcomes: list[dict] = []
+        errors: list[Exception] = []
+
+        def worker(thread_key: str) -> None:
+            try:
+                connection = sqlite3.connect(self.db_path, timeout=30)
+                connection.row_factory = sqlite3.Row
+                try:
+                    payload = subjects.confirm_subject(
+                        connection, event_id,
+                        perspective_company_id=self.company_a,
+                        subject_code="other_receivable", reason="并发确认",
+                        expected_revision=1, request_key="conc-subj-key",
+                        actor=self.admin,
+                    )
+                    outcomes.append(payload)
+                finally:
+                    connection.close()
+            except Exception as exc:  # pragma: no cover
+                errors.append(exc)
+
+        threads = [
+            threading.Thread(target=worker, args=(f"t{i}",)) for i in range(4)
+        ]
+        for thread in threads:
+            thread.start()
+        for thread in threads:
+            thread.join()
+
+        self.assertEqual([], errors)
+        confirmed = self.connection.execute(
+            "SELECT COUNT(*) AS n FROM ledger_event_revisions WHERE state = 'confirmed'"
+        ).fetchone()["n"]
+        self.assertEqual(1, confirmed)
+        self.assertEqual(1, len({payload["revision_id"] for payload in outcomes}))
+
+    def test_repeated_confirm_same_key_appends_no_noise_revision(self) -> None:
+        self.pair(self.company_a, self.company_b, "100.00")
+        from bank_importer import ledger_events
+        ledger_events.reconcile_bank_events(self.connection, actor=self.admin)
+        event_id = self.ledger_events()[0]["id"]
+        first = subjects.confirm_subject(
+            self.connection, event_id,
+            perspective_company_id=self.company_a, subject_code="other_receivable",
+            reason="确认", expected_revision=1, request_key="noise-key",
+            actor=self.admin,
+        )
+        second = subjects.confirm_subject(
+            self.connection, event_id,
+            perspective_company_id=self.company_a, subject_code="other_receivable",
+            reason="重复确认", expected_revision=1, request_key="noise-key",
+            actor=self.admin,
+        )
+        self.assertEqual(first["revision_id"], second["revision_id"])
+        revisions = self.connection.execute(
+            "SELECT COUNT(*) AS n FROM ledger_event_revisions WHERE ledger_event_id = ?",
+            (event_id,),
+        ).fetchone()["n"]
+        # One pending_subject + one confirmed; the replay appended nothing.
+        self.assertEqual(2, revisions)
+        confirmed = self.connection.execute(
+            "SELECT COUNT(*) AS n FROM ledger_event_revisions "
+            "WHERE ledger_event_id = ? AND state = 'confirmed'",
+            (event_id,),
+        ).fetchone()["n"]
+        self.assertEqual(1, confirmed)
+

 if __name__ == "__main__":
    unittest.main()