slightly simpler impl

hjwp · hjwp · commit e29efff6098c · 2019-02-05T10:15:06.000Z
diff --git a/domain_model.py b/domain_model.py
@@ -1,10 +1,7 @@
-from dataclasses import dataclass
-
-@dataclass
 class Order(dict):
-    def __init__(self, d):
+    def __init__(self, lines):
         self.allocations = {}
-        super().__init__(d)
+        super().__init__(lines)
 
 
 class Shipment(dict):
@@ -21,20 +18,11 @@ def skus(thing):
         return thing.keys()
 
 
-def allocate_to(order, source, name):
+def allocate_to(order, source):
     for sku, quantity in order.items():
         if source.get(sku, 0) > quantity:
             source[sku] -= quantity
-            order.allocations[sku] = name
-
-
-def allocate_to_stock(order, stock):
-    allocate_to(order, stock, 'STOCK')
-
-def allocate_to_shipment(order, shipment):
-    allocate_to(order, shipment, shipment.id)
-
-
+            order.allocations[sku] = getattr(source, 'id', 'STOCK')
 
 
 def allocate_to_shipments(order, shipments):
@@ -50,15 +38,15 @@ def allocate_to_shipments(order, shipments):
 
 def allocate(order, stock, shipments):
     if skus(order) <= skus(stock):
-        allocate_to_stock(order, stock)
+        allocate_to(order, stock)
         return
 
     shipments.sort(key=lambda s: s.eta)
 
     for shipment in shipments:
         if skus(order) <= skus(shipment):
-            allocate_to_shipment(order, shipment)
+            allocate_to(order, shipment)
             return
 
-    allocate_to_stock(order, stock)
+    allocate_to(order, stock)
     allocate_to_shipments(order, shipments)
diff --git a/test_allocation.py b/test_allocation.py
@@ -9,8 +9,6 @@
 )
 
 
-
-
 def random_id():
     return uuid.uuid4().hex[:10]
 

Original file line number	Diff line number	Diff line change
`@@ -9,8 +9,6 @@`
`9`	`9`	`)`
`10`	`10`
`11`	`11`
`12`		`-`
`13`		`-`
`14`	`12`	`def random_id():`
`15`	`13`	`return uuid.uuid4().hex[:10]`
`16`	`14`