uow now does messagebus magically. breaks tests [uow_has_messagebus]

hjwp · hjwp · commit bfdd979a3d2b · 2019-11-20T21:12:36.000Z
diff --git a/src/allocation/repository.py b/src/allocation/repository.py
@@ -1,6 +1,8 @@
 import abc
+from typing import Set
 from allocation import model
 
+
 class AbstractRepository(abc.ABC):
 
     @abc.abstractmethod
@@ -17,9 +19,14 @@ class SqlAlchemyRepository(AbstractRepository):
 
     def __init__(self, session):
         self.session = session
+        self.seen = set()  # type: Set[model.Product]
 
     def add(self, product):
+        self.seen.add(product)
         self.session.add(product)
 
     def get(self, sku):
-        return self.session.query(model.Product).filter_by(sku=sku).first()
+        product = self.session.query(model.Product).filter_by(sku=sku).first()
+        if product:
+            self.seen.add(product)
+        return product
diff --git a/src/allocation/services.py b/src/allocation/services.py
@@ -2,7 +2,7 @@
 from typing import Optional
 from datetime import date
 
-from allocation import exceptions, messagebus, model, unit_of_work
+from allocation import exceptions, model, unit_of_work
 from allocation.model import OrderLine
 
 
@@ -28,9 +28,6 @@ def allocate(
         product = uow.products.get(sku=line.sku)
         if product is None:
             raise exceptions.InvalidSku(f'Invalid sku {line.sku}')
-        try:
-            batchref = product.allocate(line)
-            uow.commit()
-            return batchref
-        finally:
-            messagebus.handle(product.events)
+        batchref = product.allocate(line)
+        uow.commit()
+        return batchref
diff --git a/src/allocation/unit_of_work.py b/src/allocation/unit_of_work.py
@@ -5,8 +5,8 @@
 from sqlalchemy.orm import sessionmaker
 from sqlalchemy.orm.session import Session
 
-from allocation import config
-from allocation import repository
+from allocation import config, messagebus, repository
+
 
 
 class AbstractUnitOfWork(abc.ABC):
@@ -18,8 +18,18 @@ def __enter__(self) -> AbstractUnitOfWork:
     def __exit__(self, *args):
         self.rollback()
 
-    @abc.abstractmethod
     def commit(self):
+        self._commit()
+        self.publish_events()
+
+    def publish_events(self):
+        for product in self.products.seen:
+            while product.events:
+                event = product.events.pop(0)
+                messagebus.handle(event)
+
+    @abc.abstractmethod
+    def _commit(self):
         raise NotImplementedError
 
     @abc.abstractmethod
@@ -47,7 +57,7 @@ def __exit__(self, *args):
         super().__exit__(*args)
         self.session.close()
 
-    def commit(self):
+    def _commit(self):
         self.session.commit()
 
     def rollback(self):
diff --git a/tests/unit/test_services.py b/tests/unit/test_services.py
@@ -21,7 +21,7 @@ def __init__(self):
         self.products = FakeRepository([])
         self.committed = False
 
-    def commit(self):
+    def _commit(self):
         self.committed = True
 
     def rollback(self):
