eta just got put out of scope. no more classes lol

hjwp · hjwp · commit 8bc6240bbe32 · 2019-02-05T10:15:06.000Z
diff --git a/domain_model.py b/domain_model.py
@@ -1,12 +1,9 @@
-class Shipment(dict):
-    def __init__(self, eta, lines):
-        self.eta = eta
-        super().__init__(lines)
-
-
 def skus(d):
     return set(d.keys())
 
+def allocated_completely(order, allocation):
+    return skus(order) == skus(allocation)
+
 
 def allocate_to(order, source):
     return {
@@ -19,15 +16,13 @@ def allocate_to(order, source):
 
 def allocate(order, stock, shipments):
     stock_allocation = allocate_to(order, stock)
-    if skus(stock_allocation) == skus(order):
+    if allocated_completely(order, stock_allocation):
         return stock_allocation
 
-    shipments.sort(key=lambda s: s.eta)
-
     shipment_allocations = []
     for shipment in shipments:
         shipment_allocation = allocate_to(order, shipment)
-        if skus(shipment_allocation) == skus(order):
+        if allocated_completely(order, shipment_allocation):
             return shipment_allocation
         shipment_allocations.append(shipment_allocation)
 
diff --git a/test_allocation.py b/test_allocation.py
@@ -2,10 +2,7 @@
 from datetime import date, timedelta
 
 
-from domain_model import (
-    Shipment,
-    allocate,
-)
+from domain_model import allocate
 
 
 def random_id():
@@ -23,9 +20,7 @@ def test_can_allocate_to_stock():
 
 def test_can_allocate_to_shipment():
     order = {'a-sku': 10}
-    shipment = Shipment(eta=date.today(), lines={
-        'a-sku': 1000
-    })
+    shipment = {'a-sku': 1000}
 
     allocations = allocate(order, stock={}, shipments=[shipment])
 
@@ -35,9 +30,7 @@ def test_can_allocate_to_shipment():
 def test_ignores_irrelevant_stock():
     order = {'sku1': 10}
     stock = {'sku2': 1000}
-    shipment = Shipment(eta=date.today(), lines={
-        'sku1': 1000,
-    })
+    shipment = {'sku1': 1000}
 
     allocations = allocate(order, stock=stock, shipments=[shipment])
 
@@ -46,12 +39,8 @@ def test_ignores_irrelevant_stock():
 
 def test_can_allocate_to_correct_shipment():
     order = {'sku2': 10}
-    shipment1 = Shipment(eta=date.today(), lines={
-        'sku1': 1000,
-    })
-    shipment2 = Shipment(eta=date.today(), lines={
-        'sku2': 1000,
-    })
+    shipment1 = {'sku1': 1000}
+    shipment2 = {'sku2': 1000}
 
     allocations = allocate(order, stock={}, shipments=[shipment1, shipment2])
 
@@ -61,9 +50,7 @@ def test_can_allocate_to_correct_shipment():
 def test_allocates_to_stock_in_preference_to_shipment():
     order = {'sku1': 10}
     stock = {'sku1': 1000}
-    shipment = Shipment(eta=date.today(), lines={
-        'sku1': 1000,
-    })
+    shipment = {'sku1': 1000}
 
     allocations = allocate(order, stock, shipments=[shipment])
 
@@ -81,10 +68,7 @@ def test_can_allocate_multiple_lines_to_wh():
 
 def test_can_allocate_multiple_lines_to_shipment():
     order = {'sku1': 5, 'sku2': 10}
-    shipment = Shipment(eta=date.today(), lines={
-        'sku1': 1000,
-        'sku2': 1000,
-    })
+    shipment = {'sku1': 1000, 'sku2': 1000}
 
     allocations = allocate(order, stock={}, shipments=[shipment])
 
@@ -94,9 +78,7 @@ def test_can_allocate_multiple_lines_to_shipment():
 
 def test_can_allocate_to_both():
     order = {'sku1': 5, 'sku2': 10}
-    shipment = Shipment(eta=date.today(), lines={
-        'sku2': 1000,
-    })
+    shipment = {'sku2': 1000}
     stock = {'sku1': 1000}
 
     allocations = allocate(order, stock, shipments=[shipment])
@@ -107,11 +89,7 @@ def test_can_allocate_to_both():
 
 def test_can_allocate_to_both_preferring_stock():
     order = {'sku1': 1, 'sku2': 2, 'sku3': 3, 'sku4': 4}
-    shipment = Shipment(eta=date.today(), lines={
-        'sku1': 1000,
-        'sku2': 1000,
-        'sku3': 1000,
-    })
+    shipment = {'sku1': 1000, 'sku2': 1000, 'sku3': 1000}
     stock = {'sku3': 1000, 'sku4': 1000}
 
     allocations = allocate(order, stock, shipments=[shipment])
@@ -124,10 +102,7 @@ def test_can_allocate_to_both_preferring_stock():
 
 def test_mixed_allocations_are_avoided_if_possible():
     order = {'sku1': 10, 'sku2': 10}
-    shipment = Shipment(eta=date.today(), lines={
-        'sku1': 1000,
-        'sku2': 1000,
-    })
+    shipment = {'sku1': 1000, 'sku2': 1000}
     stock = {'sku1': 1000}
 
     allocations = allocate(order, stock, shipments=[shipment])
@@ -136,43 +111,26 @@ def test_mixed_allocations_are_avoided_if_possible():
     assert allocations['sku2'] == shipment
 
 
-def test_prefer_allocating_to_earlier_shipment():
+def test_allocated_to_first_suitable_shipment_in_list():
     order = {'sku1': 10, 'sku2': 10}
-    shipment1 = Shipment(eta=date.today(), lines={
-        'sku1': 1000,
-        'sku2': 1000,
-    })
-    tomorrow = date.today() + timedelta(days=1)
-    shipment2 = Shipment(eta=tomorrow, lines={
-        'sku1': 1000,
-        'sku2': 1000,
-    })
+    shipment1 = {'sku1': 1000, 'sku2': 1000}
+    shipment2 = {'sku1': 1000, 'sku2': 1000}
     stock = {}
 
-    allocations = allocate(order, stock, shipments=[shipment2, shipment1])
+    allocations = allocate(order, stock, shipments=[shipment1, shipment2])
 
     assert allocations['sku1'] == shipment1
     assert allocations['sku2'] == shipment1
 
 
-def test_prefer_allocating_to_earlier_even_if_multiple_shipments():
+def test_still_preserves_ordering_if_split_across_shipments():
     order = {'sku1': 10, 'sku2': 10, 'sku3': 10}
-    shipment1 = Shipment(eta=date.today(), lines={
-        'sku1': 1000,
-    })
-    tomorrow = date.today() + timedelta(days=1)
-    shipment2 = Shipment(eta=tomorrow, lines={
-        'sku2': 1000,
-        'sku3': 1000,
-    })
-    later = tomorrow + timedelta(days=1)
-    shipment3 = Shipment(eta=later, lines={
-        'sku2': 1000,
-        'sku3': 1000,
-    })
+    shipment1 = {'sku1': 1000}
+    shipment2 = {'sku2': 1000, 'sku3': 1000}
+    shipment3 = {'sku2': 1000, 'sku3': 1000}
     stock = {}
 
-    allocations = allocate(order, stock, shipments=[shipment3, shipment2, shipment1])
+    allocations = allocate(order, stock, shipments=[shipment1, shipment2, shipment3])
 
     assert allocations['sku1'] == shipment1
     assert allocations['sku2'] == shipment2
@@ -182,10 +140,10 @@ def test_prefer_allocating_to_earlier_even_if_multiple_shipments():
 def test_stock_not_quite_enough_means_we_use_shipment():
     order = {'sku1': 10, 'sku2': 10}
     stock = {'sku1': 10, 'sku2': 5}
-    shipment = Shipment(eta=date.today(), lines={
+    shipment = {
         'sku1': 1000,
         'sku2': 1000,
-    })
+    }
 
     allocations = allocate(order, stock, shipments=[shipment])
 
@@ -204,9 +162,9 @@ def test_cannot_allocate_if_insufficent_quantity_in_stock():
 
 def test_cannot_allocate_if_insufficent_quantity_in_shipment():
     order = {'a-sku': 10}
-    shipment = Shipment(eta=date.today(), lines={
+    shipment = {
         'a-sku': 5,
-    })
+    }
 
     allocations = allocate(order, stock={}, shipments=[shipment])
 
