strip things down to just warehouse and order

hjwp · hjwp · commit 6aa42425f344 · 2019-02-14T18:06:50.000Z
diff --git a/domain_model.py b/domain_model.py
@@ -1,51 +1,5 @@
 from __future__ import annotations
 from dataclasses import dataclass
-from datetime import date
-
-
-def allocate(order, warehouse, shipments):
-    ordered_sources = [warehouse] + sorted(shipments)
-    allocation = Allocation(order)
-    for source in ordered_sources:
-        allocation.supplement_with(source.allocation_for(order))
-    allocation.decrement_available_quantities()
-    return allocation
-
-
-@dataclass(unsafe_hash=True)
-class AllocationLine:
-    sku: str
-    source: _Stock
-
-
-class Allocation:
-
-    def __init__(self, order):
-        self.order = order
-        self.lines = []
-
-    def __getitem__(self, sku):
-        return next(l.source for l in self.lines if l.sku == sku)
-
-    def __setitem__(self, sku, source):
-        line = next(l.source for l in self.lines if l.sku == sku)
-        line.source = source
-
-    def __contains__(self, sku):
-        return sku in {l.sku for l in self.lines}
-
-    def with_sources(self, sources: dict):
-        self.lines = [AllocationLine(sku, source) for sku, source in sources.items()]
-        return self
-
-    def supplement_with(self, other: Allocation):
-        for line in other.lines:
-            if line.sku not in self:
-                self.lines.append(line)
-
-    def decrement_available_quantities(self):
-        for line in self.lines:
-            line.source.decrement_available(line.sku, self.order[line.sku])
 
 
 @dataclass(unsafe_hash=True)
@@ -59,54 +13,12 @@ class _Lines:
     def __init__(self, lines: dict):
         self.lines = [Line(sku, qty) for sku, qty in lines.items()]
 
-    def __getitem__(self, sku):
-        return next(l.qty for l in self.lines if l.sku == sku)
-
-    def __setitem__(self, sku, qty):
-        try:
-            line = next(l for l in self.lines if l.sku == sku)
-            line.qty = qty
-        except StopIteration:
-            self.lines.append(Line(sku=sku, qty=qty))
-
-    def __contains__(self, sku):
-        return sku in {l.sku for l in self.lines}
-
 
 
 class Order(_Lines):
     pass
 
 
-class _Stock(_Lines):
-
-    def decrement_available(self, sku, qty):
-        self[sku] -= qty
-
-    def allocation_for(self, order: Order):
-        return Allocation(order).with_sources({
-            line.sku: self
-            for line in order.lines
-            if line.sku in self
-            and self[line.sku] > line.qty
-        })
-
-
-class Warehouse(_Stock):
-
-    def __repr__(self):
-        return f'<Warehouse lines={self._lines}>'
-
-
-
-class Shipment(_Stock):
-
-    def __init__(self, lines: dict, eta: date):
-        self.eta = eta
-        super().__init__(lines)
-
-    def __repr__(self):
-        return f'<Shipment eta={self.eta} lines={self._lines}>'
+class Warehouse(_Lines):
+    pass
 
-    def __lt__(self, other):
-        return self.eta < other.eta
diff --git a/orm.py b/orm.py
@@ -38,37 +38,3 @@
 })
 
 
-shipment = Table(
-    'shipment', metadata,
-    Column('id', Integer, primary_key=True, autoincrement=True),
-    Column('eta', Date),
-)
-shipment_lines = Table(
-    'shipment_lines', metadata,
-    Column('shipment_id', ForeignKey('shipment.id'), primary_key=True),
-    Column('sku', String(255), primary_key=True),
-    Column('qty', Integer),
-)
-
-shipment_line_mapper = mapper(domain_model.Line, shipment_lines, non_primary=True)
-mapper(domain_model.Shipment, shipment, properties={
-    'lines': relationship(shipment_line_mapper, cascade="all, delete-orphan")
-})
-
-allocation = Table(
-    'allocation', metadata,
-    Column('id', Integer, primary_key=True, autoincrement=True),
-    Column('order_id', ForeignKey('order.id'))
-)
-
-allocation_lines = Table(
-    'allocation_lines', metadata,
-    Column('allocation_id', ForeignKey('allocation.id'), primary_key=True),
-    Column('sku', String(255), primary_key=True),
-    Column('shipment_id', ForeignKey('shipment.id'), nullable=True),
-)
-
-mapper(domain_model.AllocationLine, allocation_lines)
-mapper(domain_model.Allocation, allocation, properties={
-    'lines': relationship(domain_model.AllocationLine, cascade="all, delete-orphan"),
-})
diff --git a/test_allocation.py b/test_allocation.py
diff --git a/test_orm.py b/test_orm.py
@@ -1,10 +1,9 @@
 import pytest
 from sqlalchemy import create_engine
 from sqlalchemy.orm import sessionmaker
-from datetime import date
 
 from orm import metadata
-from domain_model import Order, Warehouse, Shipment, Allocation
+from domain_model import Order, Warehouse
 
 
 @pytest.fixture
@@ -98,14 +97,8 @@ def test_order_mapper_can_delete_lines(session):
 def test_rest_of_fields(session):
     new_order = Order({'sku1': 12, 'sku2': 13})
     warehouse = Warehouse({'whsku1': 11, 'whsku2': 12})
-    # shipment1 = Shipment({'shipsku1': 13, 'shipsku2': 13}, eta=date.today())
-    # shipment2 = Shipment({'shipsku2': 22, 'shipsku3': 34}, eta=date.today())
-    # allocation = Allocation({'asku1': warehouse, 'asku2': shipment2})
     session.add(new_order)
     session.add(warehouse)
-    # session.add(shipment1)
-    # session.add(shipment2)
-    # session.add(allocation)
     session.commit()
 
     warehouse_rows = list(session.execute('SELECT * FROM "warehouse_lines"'))
