constructor fn, sorting are now more OO

hjwp · hjwp · commit 2554a1abc83d · 2019-02-05T11:12:01.000Z
diff --git a/domain_model.py b/domain_model.py
@@ -6,6 +6,15 @@ class Allocation(dict):
     def skus(self):
         return self.keys()
 
+    @staticmethod
+    def for_(order, source):
+        return Allocation({
+            sku: source
+            for sku, quantity in order.lines.items()
+            if source.can_allocate(sku, quantity)
+        })
+
+
     def supplement_with(self, allocation):
         for sku, quantity in allocation.items():
             if sku in self:
@@ -16,6 +25,8 @@ def fully_allocates(self, order):
         return self.skus == order.skus
 
 
+
+
 @dataclass
 class Order:
     lines: dict
@@ -31,12 +42,8 @@ def fully_allocated(self):
 
     def allocate(self, stock, shipments):
         self.allocation = Allocation()
-        for source in [stock] + sorted(shipments, key=lambda x: x.eta):
-            source_allocation = Allocation({
-                sku: source
-                for sku, quantity in self.lines.items()
-                if source.can_allocate(sku, quantity)
-            })
+        for source in [stock] + sorted(shipments):
+            source_allocation = Allocation.for_(self, source)
             if source_allocation.fully_allocates(self):
                 self.allocation = source_allocation
                 return
@@ -49,9 +56,11 @@ def can_allocate(self, sku, quantity):
         return sku in self and self[sku] > quantity
 
 
-@dataclass
 class Shipment(Stock):
 
+    def __lt__(self, other):
+        return self.eta < other.eta
+
     def __init__(self, lines, eta):
         self.eta = eta
         super().__init__(lines)
