Skip to content

Commit 235f60b

Browse files
committed
some progress on orm but still a bit of a fight
1 parent a765959 commit 235f60b

3 files changed

Lines changed: 103 additions & 17 deletions

File tree

‎domain_model.py‎

Lines changed: 19 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
from __future__ import annotations
12
from dataclasses import dataclass
23
from datetime import date
34

@@ -11,32 +12,40 @@ def allocate(order, warehouse, shipments):
1112
return allocation
1213

1314

15+
@dataclass(unsafe_hash=True)
16+
class AllocationLine:
17+
sku: str
18+
source: _Stock
1419

1520

1621
class Allocation:
1722

1823
def __init__(self, order):
1924
self.order = order
20-
self._sources = {}
25+
self.lines = []
2126

2227
def __getitem__(self, sku):
23-
return self._sources[sku]
28+
return next(l.source for l in self.lines if l.sku == sku)
29+
30+
def __setitem__(self, sku, source):
31+
line = next(l.source for l in self.lines if l.sku == sku)
32+
line.source = source
2433

2534
def __contains__(self, sku):
26-
return sku in self._sources
35+
return sku in {l.sku for l in self.lines}
2736

2837
def with_sources(self, sources: dict):
29-
self._sources = sources
38+
self.lines = [AllocationLine(sku, source) for sku, source in sources.items()]
3039
return self
3140

32-
def supplement_with(self, other):
33-
for sku, source in other._sources.items():
34-
if sku not in self:
35-
self._sources[sku] = source
41+
def supplement_with(self, other: Allocation):
42+
for line in other.lines:
43+
if line.sku not in self:
44+
self.lines.append(line)
3645

3746
def decrement_available_quantities(self):
38-
for sku, source in self._sources.items():
39-
source.decrement_available(sku, self.order[sku])
47+
for line in self.lines:
48+
line.source.decrement_available(line.sku, self.order[line.sku])
4049

4150

4251
@dataclass(unsafe_hash=True)

‎orm.py‎

Lines changed: 54 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
from sqlalchemy import Table, MetaData, Column, Integer, String, ForeignKey
1+
from sqlalchemy import Table, MetaData, Column, Integer, String, ForeignKey, Date
22
from sqlalchemy.orm import mapper, relationship
33

4-
from domain_model import Order, Line
4+
import domain_model
55

66

77
metadata = MetaData()
@@ -10,17 +10,65 @@
1010
'order', metadata,
1111
Column('id', Integer, primary_key=True, autoincrement=True),
1212
)
13-
1413
order_lines = Table(
1514
'order_lines', metadata,
1615
Column('order_id', ForeignKey('order.id'), primary_key=True),
1716
Column('sku', String(255), primary_key=True),
1817
Column('qty', Integer),
1918
)
19+
mapper(domain_model.Line, order_lines)
20+
mapper(domain_model.Order, order, properties={
21+
'lines': relationship(domain_model.Line, cascade="all, delete-orphan")
22+
})
2023

2124

22-
mapper(Line, order_lines)
23-
mapper(Order, order, properties={
24-
'lines': relationship(Line, cascade="all, delete-orphan")
25+
warehouse = Table(
26+
'warehouse', metadata,
27+
Column('id', Integer, primary_key=True, autoincrement=True),
28+
)
29+
warehouse_lines = Table(
30+
'warehouse_lines', metadata,
31+
Column('warehouse_id', ForeignKey('warehouse.id'), primary_key=True),
32+
Column('sku', String(255), primary_key=True),
33+
Column('qty', Integer),
34+
)
35+
warehouse_line_mapper = mapper(domain_model.Line, warehouse_lines, non_primary=True)
36+
mapper(domain_model.Warehouse, warehouse, properties={
37+
'lines': relationship(warehouse_line_mapper, cascade="all, delete-orphan")
2538
})
2639

40+
41+
shipment = Table(
42+
'shipment', metadata,
43+
Column('id', Integer, primary_key=True, autoincrement=True),
44+
Column('eta', Date),
45+
)
46+
shipment_lines = Table(
47+
'shipment_lines', metadata,
48+
Column('shipment_id', ForeignKey('shipment.id'), primary_key=True),
49+
Column('sku', String(255), primary_key=True),
50+
Column('qty', Integer),
51+
)
52+
53+
shipment_line_mapper = mapper(domain_model.Line, shipment_lines, non_primary=True)
54+
mapper(domain_model.Shipment, shipment, properties={
55+
'lines': relationship(shipment_line_mapper, cascade="all, delete-orphan")
56+
})
57+
58+
allocation = Table(
59+
'allocation', metadata,
60+
Column('id', Integer, primary_key=True, autoincrement=True),
61+
Column('order_id', ForeignKey('order.id'))
62+
)
63+
64+
allocation_lines = Table(
65+
'allocation_lines', metadata,
66+
Column('allocation_id', ForeignKey('allocation.id'), primary_key=True),
67+
Column('sku', String(255), primary_key=True),
68+
Column('shipment_id', ForeignKey('shipment.id'), nullable=True),
69+
)
70+
71+
mapper(domain_model.AllocationLine, allocation_lines)
72+
mapper(domain_model.Allocation, allocation, properties={
73+
'lines': relationship(domain_model.AllocationLine, cascade="all, delete-orphan"),
74+
})

‎test_orm.py‎

Lines changed: 30 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
import pytest
22
from sqlalchemy import create_engine
33
from sqlalchemy.orm import sessionmaker
4+
from datetime import date
45

56
from orm import metadata
6-
from domain_model import Order
7+
from domain_model import Order, Warehouse, Shipment, Allocation
78

89

910
@pytest.fixture
@@ -90,3 +91,31 @@ def test_order_mapper_can_delete_lines(session):
9091
assert rows == [
9192
(1, 'sku2', 13),
9293
]
94+
95+
96+
97+
98+
def test_rest_of_fields(session):
99+
new_order = Order({'sku1': 12, 'sku2': 13})
100+
warehouse = Warehouse({'whsku1': 11, 'whsku2': 12})
101+
# shipment1 = Shipment({'shipsku1': 13, 'shipsku2': 13}, eta=date.today())
102+
# shipment2 = Shipment({'shipsku2': 22, 'shipsku3': 34}, eta=date.today())
103+
# allocation = Allocation({'asku1': warehouse, 'asku2': shipment2})
104+
session.add(new_order)
105+
session.add(warehouse)
106+
# session.add(shipment1)
107+
# session.add(shipment2)
108+
# session.add(allocation)
109+
session.commit()
110+
111+
warehouse_rows = list(session.execute('SELECT * FROM "warehouse_lines"'))
112+
assert warehouse_rows == [
113+
(1, 'whsku1', 12),
114+
(1, 'whsku2', 12),
115+
]
116+
117+
warehouse_rows = list(session.execute('SELECT * FROM "warehouse"'))
118+
assert warehouse_rows == [
119+
(1, 'whsku1', 12),
120+
(1, 'whsku2', 12),
121+
]

0 commit comments

Comments
 (0)