Use the ORM instead [view_using_orm]

hjwp · hjwp · commit d0593d396459 · 2024-03-01T15:05:35.000Z
diff --git a/src/allocation/adapters/repository.py b/src/allocation/adapters/repository.py
@@ -57,12 +57,3 @@ def _get_by_batchref(self, 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))
-        )
diff --git a/src/allocation/domain/model.py b/src/allocation/domain/model.py
@@ -71,10 +71,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)
diff --git a/src/allocation/views.py b/src/allocation/views.py
@@ -1,12 +1,12 @@
+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]

Original file line number	Diff line number	Diff line change
`@@ -57,12 +57,3 @@ def _get_by_batchref(self, batchref):`
`57`	`57`	`)`
`58`	`58`	`.first()`
`59`	`59`	`)`
`60`		`-`
`61`		`- def for_order(self, orderid):`
`62`		`- order_lines = self.session.query(model.OrderLine).filter_by(orderid=orderid)`
`63`		`- skus = {l.sku for l in order_lines}`
`64`		`- return (`
`65`		`- self.session.query(model.Product)`
`66`		`- .join(model.Batch)`
`67`		`- .filter(model.Batch.sku.in_(skus))`
`68`		`- )`