Use the ORM instead [view_using_orm]

Author: hjwp

src/allocation/adapters/repository.py

@@ -57,11 +57,3 @@ def _get_by_batchref(self, batchref):
         return self.session.query(model.Product).join(model.Batch).filter(
             orm.batches.c.reference == batchref,
         ).first()
-
-
-    def for_order(self, orderid):
-        order_lines = self.session.query(model.OrderLine).filter_by(orderid=orderid)
-        skus = {l.sku for l in order_lines}
-        return self.session.query(model.Product).join(model.Batch).filter(
-            model.Batch.sku.in_(skus)
-        )

src/allocation/domain/model.py

@@ -73,10 +73,6 @@ def __gt__(self, other):
             return True
         return self.eta > other.eta
 
-    @property
-    def orderids(self):
-        return {l.orderid for l in self._allocations}
-
     def allocate(self, line: OrderLine):
         if self.can_allocate(line):
             self._allocations.add(line)

src/allocation/views.py

@@ -1,11 +1,11 @@
+from allocation.domain import model
 from allocation.service_layer import unit_of_work
 
 def allocations(orderid: str, uow: unit_of_work.SqlAlchemyUnitOfWork):
     with uow:
-        products = uow.products.for_order(orderid=orderid)
-        batches = [b for p in products for b in p.batches]
-        return [
-            {'sku': b.sku, 'batchref': b.reference}
-            for b in batches
-            if orderid in b.orderids
-        ]
+        batches = uow.session.query(model.Batch).join(
+            model.OrderLine, model.Batch._allocations
+        ).filter(
+            model.OrderLine.orderid == orderid
+        )
+        return [{'sku': b.sku, 'batchref': b.reference} for b in batches]