feat: implement separate unit of work pattern

src/jobboard/adapters/repositories/jobs.py

@@ -1,7 +1,5 @@
 from src.jobboard.domain.model import model
-from src.jobboard.domain.ports.repositories.jobs import (
-    JobRepositoryInterface,
-)
+from src.jobboard.domain.ports.repositories.jobs import JobRepositoryInterface
 
 
 class JobSqlAlchemyRepository(JobRepositoryInterface):
@@ -25,4 +23,4 @@ def _get_all(self) -> list[model.Job]:
         return self.session.query(model.Job).all()
 
     def _search(self, query: str) -> list[model.Job]:
-        return self.session.query(model.Job).filter(model.Job.title.contains(query))
+        return self.session.query(model.Job).filter(model.Job.title.contains(query))

src/jobboard/adapters/repositories/users.py

@@ -1,7 +1,5 @@
 from src.jobboard.domain.model import model
-from src.jobboard.domain.ports.repositories.users import (
-    UserRepositoryInterface,
-)
+from src.jobboard.domain.ports.repositories.users import UserRepositoryInterface
 
 
 class UserSqlAlchemyRepository(UserRepositoryInterface):
@@ -19,4 +17,4 @@ def _get_by_email(self, email: str) -> model.User:
         return self.session.query(model.User).filter_by(email=email).first()
 
     def _get_by_id(self, id: int) -> model.User:
-        return self.session.query(model.User).filter_by(id=id).first()
+        return self.session.query(model.User).filter_by(id=id).first()

src/jobboard/adapters/unit_of_works/jobs.py

@@ -0,0 +1,26 @@
+from typing import Any, Callable
+
+from sqlalchemy.orm.session import Session
+
+from src.jobboard.adapters.repositories.jobs import JobSqlAlchemyRepository
+from src.jobboard.domain.ports.unit_of_works.jobs import JobUnitOfWorkInterface
+
+
+class JobSqlAlchemyUnitOfWork(JobUnitOfWorkInterface):
+    def __init__(self, session_factory: Callable[[], Any]):
+        self.session_factory = session_factory()
+
+    def __enter__(self):
+        self.session = self.session_factory()  # type: Session
+        self.jobs = JobSqlAlchemyRepository(self.session)
+        return super().__enter__()
+
+    def __exit__(self, *args):
+        super().__exit__(*args)
+        self.session.close()
+
+    def _commit(self):
+        self.session.commit()
+
+    def rollback(self):
+        self.session.rollback()

src/jobboard/adapters/unit_of_works/users.py

@@ -0,0 +1,26 @@
+from typing import Any, Callable
+
+from sqlalchemy.orm.session import Session
+
+from src.jobboard.adapters.repositories.users import UserSqlAlchemyRepository
+from src.jobboard.domain.ports.unit_of_works.users import UserUnitOfWorkInterface
+
+
+class UserSqlAlchemyUnitOfWork(UserUnitOfWorkInterface):
+    def __init__(self, session_factory: Callable[[], Any]):
+        self.session_factory = session_factory()
+
+    def __enter__(self):
+        self.session = self.session_factory()  # type: Session
+        self.users = UserSqlAlchemyRepository(self.session)
+        return super().__enter__()
+
+    def __exit__(self, *args):
+        super().__exit__(*args)
+        self.session.close()
+
+    def _commit(self):
+        self.session.commit()
+
+    def rollback(self):
+        self.session.rollback()

src/jobboard/adapters/use_cases/jobs.py

@@ -6,7 +6,7 @@
     ResponseSuccess,
     ResponseTypes,
 )
-from src.jobboard.domain.ports.unit_of_work import JobUnitOfWorkInterface
+from src.jobboard.domain.ports.unit_of_works.jobs import JobUnitOfWorkInterface
 from src.jobboard.domain.ports.use_cases.jobs import JobServiceInterface
 from src.jobboard.domain.schemas.jobs import JobCreateInputDto, JobOutputDto
 

src/jobboard/adapters/use_cases/users.py

@@ -7,7 +7,7 @@
     ResponseSuccess,
     ResponseTypes,
 )
-from src.jobboard.domain.ports.unit_of_work import UserUnitOfWorkInterface
+from src.jobboard.domain.ports.unit_of_works.users import UserUnitOfWorkInterface
 from src.jobboard.domain.ports.use_cases.users import UserServiceInterface
 from src.jobboard.domain.schemas.users import (
     UserCreateInputDto,

src/jobboard/configurator/containers.py

@@ -2,10 +2,8 @@
 from sqlalchemy import create_engine
 from sqlalchemy.orm import sessionmaker
 
-from src.jobboard.adapters.db.unit_of_work import (
-    JobSqlAlchemyUnitOfWork,
-    UserSqlAlchemyUnitOfWork,
-)
+from src.jobboard.adapters.unit_of_works.jobs import JobSqlAlchemyUnitOfWork
+from src.jobboard.adapters.unit_of_works.users import UserSqlAlchemyUnitOfWork
 from src.jobboard.adapters.use_cases.jobs import JobService
 from src.jobboard.adapters.use_cases.users import UserService
 from src.jobboard.configurator import config

src/jobboard/domain/ports/unit_of_works/jobs.py

@@ -0,0 +1,32 @@
+import abc
+
+from src.jobboard.domain.ports.common import messagebus
+from src.jobboard.domain.ports.repositories.jobs import JobRepositoryInterface
+
+
+class JobUnitOfWorkInterface(abc.ABC):
+    jobs: JobRepositoryInterface
+
+    def __enter__(self) -> "JobUnitOfWorkInterface":
+        return self
+
+    def __exit__(self, *args):
+        self.rollback()
+
+    def commit(self):
+        self._commit()
+        self.publish_events()
+
+    def publish_events(self):
+        for job in self.jobs.seen:
+            while job.events:
+                event = job.events.pop(0)
+                messagebus.handle(event)
+
+    @abc.abstractmethod
+    def _commit(self):
+        raise NotImplementedError
+
+    @abc.abstractmethod
+    def rollback(self):
+        raise NotImplementedError

src/jobboard/domain/ports/unit_of_work.py → src/jobboard/domain/ports/unit_of_works/users.py

@@ -1,8 +1,7 @@
 import abc
 
-from src.jobboard.domain.ports.repositories.users import UserRepositoryInterface
-from src.jobboard.domain.ports.repositories.jobs import JobRepositoryInterface
 from src.jobboard.domain.ports.common import messagebus
+from src.jobboard.domain.ports.repositories.users import UserRepositoryInterface
 
 
 class UserUnitOfWorkInterface(abc.ABC):
@@ -31,31 +30,3 @@ def _commit(self):
     @abc.abstractmethod
     def rollback(self):
         raise NotImplementedError
-
-
-class JobUnitOfWorkInterface(abc.ABC):
-    jobs: JobRepositoryInterface
-
-    def __enter__(self) -> "JobUnitOfWorkInterface":
-        return self
-
-    def __exit__(self, *args):
-        self.rollback()
-
-    def commit(self):
-        self._commit()
-        self.publish_events()
-
-    def publish_events(self):
-        for job in self.jobs.seen:
-            while job.events:
-                event = job.events.pop(0)
-                messagebus.handle(event)
-
-    @abc.abstractmethod
-    def _commit(self):
-        raise NotImplementedError
-
-    @abc.abstractmethod
-    def rollback(self):
-        raise NotImplementedError

src/jobboard/domain/ports/use_cases/jobs.py

@@ -2,7 +2,7 @@
 from typing import Union
 
 from src.jobboard.domain.ports.common.responses import ResponseFailure, ResponseSuccess
-from src.jobboard.domain.ports.unit_of_work import JobUnitOfWorkInterface
+from src.jobboard.domain.ports.unit_of_works.jobs import JobUnitOfWorkInterface
 from src.jobboard.domain.schemas.jobs import JobCreateInputDto
 
 

src/jobboard/domain/ports/use_cases/users.py

@@ -2,7 +2,7 @@
 from typing import Union
 
 from src.jobboard.domain.ports.common.responses import ResponseFailure, ResponseSuccess
-from src.jobboard.domain.ports.unit_of_work import UserUnitOfWorkInterface
+from src.jobboard.domain.ports.unit_of_works.users import UserUnitOfWorkInterface
 from src.jobboard.domain.schemas.users import (
     UserCreateInputDto,
     UserLoginInputDto,

tests/fake_container.py

@@ -2,10 +2,8 @@
 from sqlalchemy import create_engine
 from sqlalchemy.orm import sessionmaker
 
-from src.jobboard.adapters.db.unit_of_work import (
-    JobSqlAlchemyUnitOfWork,
-    UserSqlAlchemyUnitOfWork,
-)
+from src.jobboard.adapters.unit_of_works.jobs import JobSqlAlchemyUnitOfWork
+from src.jobboard.adapters.unit_of_works.users import UserSqlAlchemyUnitOfWork
 from src.jobboard.adapters.use_cases.jobs import JobService
 from src.jobboard.adapters.use_cases.users import UserService