refactor: update sqlalchemy setup

src/domain/common/models/domain_event.py

@@ -5,4 +5,6 @@ class DomainEvent(Protocol): ...
 
 
 class HasDomainEvents(Protocol):
+    _domain_events: list[DomainEvent]
+
     def clear_domain_events(self) -> None: ...

src/domain/common/models/entity.py

@@ -10,14 +10,14 @@
 @dataclass(kw_only=True)
 class Entity(ABC, HasDomainEvents, Generic[TId]):
     id: TId
-    _events: list[DomainEvent] = field(default_factory=list)
+    _domain_events: list[DomainEvent] = field(default_factory=list)
 
     @property
     def events(self) -> tuple[DomainEvent, ...]:
-        return tuple(self._events)
+        return tuple(self._domain_events)
 
     def add_domain_event(self, domain_event: DomainEvent) -> None:
-        self._events.append(domain_event)
+        self._domain_events.append(domain_event)
 
     def clear_domain_events(self) -> None:
-        self._events.clear()
+        self._domain_events.clear()

src/infrastructure/persistence/db/interceptors/publish_event.py

@@ -4,24 +4,36 @@
 from sqlalchemy.orm import Mapper, QueryContext
 
 from src.infrastructure.persistence.db.extra.sas import sync_as_async
-from src.infrastructure.persistence.db.models.base import Base
+from src.infrastructure.persistence.db.models.base import BaseClass
 
 
 @event.listens_for(Mapper, "refresh", named=True)
 @sync_as_async
 async def saving_changes(
-    target: Base,
+    target: BaseClass,
     context: QueryContext,
     attrs: Optional[set[str]],
 ) -> Any:
     """Publish domain events interceptor.
 
     :param target: SQLAlchemy ORM Model
     :param context: QueryContext
-    :param attrs: Set of strings
+    :param attrs: Set of attributes
     """
 
-    await publish_domain_events(context)
+    await publish_domain_events(target.entity, context)
 
 
-async def publish_domain_events(context: QueryContext | None) -> None: ...
+async def publish_domain_events(entity: object | None, context: QueryContext | None) -> None:
+    if not (entity and context):
+        return
+    # Get hold of domain events
+    events = entity.events  # type: ignore [attr-defined]
+
+    # Clear domain events
+    entity.clear_domain_events()  # type: ignore [attr-defined]
+
+    # Publish domain events
+    for domain_event in events:
+        # Call mediator here
+        print(domain_event)  # noqa: T201

src/infrastructure/persistence/db/models/base.py

@@ -2,3 +2,16 @@
 
 
 class Base(DeclarativeBase): ...
+
+
+class BaseClass(Base):
+    __abstract__ = True
+
+    def __init__(self, entity: object | None = None, **kwargs) -> None:
+        """Initialize SQLAlchemy model.
+
+        :param entity: Optional `Entity` instance attribute
+        :param kwargs: SQLAlchemy model params
+        """
+        super().__init__(**kwargs)
+        self.entity = entity

src/infrastructure/persistence/db/models/dinner.py

@@ -2,10 +2,10 @@
 
 from sqlalchemy.orm import Mapped, mapped_column
 
-from .base import Base
+from .base import BaseClass
 
 
-class Dinner(Base):
+class Dinner(BaseClass):
     __tablename__ = "dinner"
 
     id: Mapped[UUID] = mapped_column(primary_key=True)

src/infrastructure/persistence/db/models/menu.py

@@ -7,10 +7,10 @@
 from src.application.menu.dto.average_rating import AverageRatingDTO
 from src.infrastructure.persistence.db.types.dataclass import DataclassType
 
-from .base import Base
+from .base import BaseClass
 
 
-class Menu(Base):
+class Menu(BaseClass):
     __tablename__ = "menu"
 
     id: Mapped[UUID] = mapped_column(primary_key=True)
@@ -27,7 +27,7 @@ class Menu(Base):
     updated_date_time: Mapped[datetime]
 
 
-class MenuSection(Base):
+class MenuSection(BaseClass):
     __tablename__ = "menu_sections"
 
     id: Mapped[UUID] = mapped_column(primary_key=True)
@@ -40,7 +40,7 @@ class MenuSection(Base):
     menu_id: Mapped[UUID] = mapped_column(ForeignKey("menu.id"), primary_key=True)
 
 
-class MenuItem(Base):
+class MenuItem(BaseClass):
     __tablename__ = "menu_items"
     __table_args__ = (
         ForeignKeyConstraint(
@@ -61,15 +61,15 @@ class MenuItem(Base):
     )
 
 
-class MenuDinnerIds(Base):
+class MenuDinnerIds(BaseClass):
     __tablename__ = "menu_dinner_ids"
 
     id: Mapped[UUID] = mapped_column(primary_key=True, default=uuid4)
     menu_id: Mapped[UUID] = mapped_column(ForeignKey("menu.id"))
     dinner_id: Mapped[UUID] = mapped_column(ForeignKey("dinner.id"))
 
 
-class MenuReviewIds(Base):
+class MenuReviewIds(BaseClass):
     __tablename__ = "menu_review_ids"
 
     id: Mapped[UUID] = mapped_column(primary_key=True, default=uuid4)

src/infrastructure/persistence/db/models/review.py

@@ -2,10 +2,10 @@
 
 from sqlalchemy.orm import Mapped, mapped_column
 
-from .base import Base
+from .base import BaseClass
 
 
-class MenuReview(Base):
+class MenuReview(BaseClass):
     __tablename__ = "menu_review"
 
     id: Mapped[UUID] = mapped_column(primary_key=True)

tests/integration/menu/test_repository.py

@@ -18,6 +18,7 @@ async def test_add_menu(menu_repo: MenuRepository) -> None:
         host_id=HostId.create_unique(),
     )
     menu_db = MenuDB(
+        entity=menu,
         id=menu.id.value,
         name=menu.name,
         description=menu.description,