From 70a0c6065e31dfff02f6ae066efadf58979c60de Mon Sep 17 00:00:00 2001 From: Artyom Date: Wed, 28 Oct 2026 22:39:31 +0300 Subject: [PATCH] Keep events of committed transactions in multi-step commands A command may now run several transactions: the upload compensation commits a removal after the ready commit failed, and a sweep commits one removal per abandoned intent and ends with a rolled back lookup. The unit of work cleared every collected event on any rollback, and the command bus published nothing when the handler raised, so the audit trail lost discards that had really been committed. A rollback now drops only the events recorded inside that transaction, and the bus publishes what was collected even when the handler fails. Events still come only from committed transactions. Co-Authored-By: Claude Opus 5.5 (1M context) Claude-Session: https://claude.ai/code/session_01V1d3RLHNBBMA6UqBLLJv27 --- src/messenger/shared/application/messagebus.py | 11 ++++++----- src/messenger/shared/infrastructure/postgres.py | 3 ++- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/messenger/shared/application/messagebus.py b/src/messenger/shared/application/messagebus.py index 0ef69a42..f6cb0152 100644 --- a/src/messenger/shared/application/messagebus.py +++ b/src/messenger/shared/application/messagebus.py @@ -28,11 +28,12 @@ class CommandBus: handler = self._handlers.get(type(command)) if handler is None: raise LookupError(f"нет обработчика для команды {type(command).__name__}") - result = await handler(command) - events = self._uow.collect_new_events() - if events: - await self._publisher.publish(events) - return result + try: + return await handler(command) + finally: + events = self._uow.collect_new_events() + if events: + await self._publisher.publish(events) class EventBus: diff --git a/src/messenger/shared/infrastructure/postgres.py b/src/messenger/shared/infrastructure/postgres.py index 4cfebcfb..ba28cd67 100644 --- a/src/messenger/shared/infrastructure/postgres.py +++ b/src/messenger/shared/infrastructure/postgres.py @@ -95,11 +95,12 @@ class PostgresUnitOfWork: self._transaction = connection.transaction() await self._transaction.start() self._committed = False + mark = len(self._events) try: yield finally: if not self._committed: - self._events.clear() + del self._events[mark:] await self._transaction.rollback() self.seen.clear() self._connection = None