Skip to content

Commit a765959

Browse files
committed
ok ok let's just have lines the dict can just be for the constructor
1 parent 417bb54 commit a765959

3 files changed

Lines changed: 35 additions & 42 deletions

File tree

‎domain_model.py‎

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ def decrement_available_quantities(self):
3939
source.decrement_available(sku, self.order[sku])
4040

4141

42-
@dataclass
42+
@dataclass(unsafe_hash=True)
4343
class Line:
4444
sku: str
4545
qty: int
@@ -48,20 +48,21 @@ class Line:
4848
class _Lines:
4949

5050
def __init__(self, lines: dict):
51-
self._lines = lines
51+
self.lines = [Line(sku, qty) for sku, qty in lines.items()]
5252

5353
def __getitem__(self, sku):
54-
return self._lines[sku]
54+
return next(l.qty for l in self.lines if l.sku == sku)
55+
56+
def __setitem__(self, sku, qty):
57+
try:
58+
line = next(l for l in self.lines if l.sku == sku)
59+
line.qty = qty
60+
except StopIteration:
61+
self.lines.append(Line(sku=sku, qty=qty))
5562

5663
def __contains__(self, sku):
57-
return sku in self._lines
64+
return sku in {l.sku for l in self.lines}
5865

59-
@property
60-
def lines(self):
61-
return [
62-
Line(sku, qty)
63-
for sku, qty in self._lines.items()
64-
]
6566

6667

6768
class Order(_Lines):
@@ -71,7 +72,7 @@ class Order(_Lines):
7172
class _Stock(_Lines):
7273

7374
def decrement_available(self, sku, qty):
74-
self._lines[sku] -= qty
75+
self[sku] -= qty
7576

7677
def allocation_for(self, order: Order):
7778
return Allocation(order).with_sources({

‎orm.py‎

Lines changed: 3 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
from sqlalchemy import Table, MetaData, Column, Integer, String, ForeignKey
2-
from sqlalchemy import event
32
from sqlalchemy.orm import mapper, relationship
43

5-
from domain_model import Order
4+
from domain_model import Order, Line
65

76

87
metadata = MetaData()
@@ -19,34 +18,9 @@
1918
Column('qty', Integer),
2019
)
2120

22-
from dataclasses import dataclass
2321

24-
@dataclass
25-
class _DummyOrderLine:
26-
'''dummy type to map order lines, will convert them to and from dicts in events below'''
27-
order_id: int
28-
sku: str
29-
qty: int
30-
31-
32-
mapper(_DummyOrderLine, order_lines)
22+
mapper(Line, order_lines)
3323
mapper(Order, order, properties={
34-
'__lines': relationship(_DummyOrderLine),
24+
'lines': relationship(Line, cascade="all, delete-orphan")
3525
})
3626

37-
38-
39-
@event.listens_for(Order, 'load')
40-
def custom_load(target, context):
41-
target._lines = {l.sku: l.qty for l in target.__lines}
42-
target.__lines.clear()
43-
44-
@event.listens_for(Order, 'after_insert')
45-
def custom_insert(mapper, connection, target):
46-
for sku, qty in target._lines.items():
47-
target.__lines.append(_DummyOrderLine(order_id=target.id, sku=sku, qty=qty))
48-
49-
@event.listens_for(_DummyOrderLine, 'before_insert')
50-
def custom_update(mapper, connection, target):
51-
breakpoint()
52-
print(target)

‎test_orm.py‎

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,13 +62,31 @@ def test_order_mapper_can_edit_lines(session):
6262
session.execute('INSERT INTO "order_lines" VALUES (2, "sku3", 14)')
6363

6464
order = session.query(Order).first()
65-
order._lines['sku4'] = 99
65+
order['sku4'] = 99
6666
session.add(order)
6767
session.commit()
6868

6969
rows = list(session.execute('SELECT * FROM "order_lines" WHERE order_id=1'))
7070
assert rows == [
7171
(1, 'sku1', 12),
7272
(1, 'sku2', 13),
73-
(1, 'sku4', 13),
73+
(1, 'sku4', 99),
74+
]
75+
76+
77+
def test_order_mapper_can_delete_lines(session):
78+
session.execute('INSERT INTO "order" VALUES (1)')
79+
session.execute('INSERT INTO "order" VALUES (2)')
80+
session.execute('INSERT INTO "order_lines" VALUES (1, "sku1", 12)')
81+
session.execute('INSERT INTO "order_lines" VALUES (1, "sku2", 13)')
82+
session.execute('INSERT INTO "order_lines" VALUES (2, "sku3", 14)')
83+
84+
order = session.query(Order).first()
85+
order.lines.remove(order.lines[0])
86+
session.add(order)
87+
session.commit()
88+
89+
rows = list(session.execute('SELECT * FROM "order_lines" WHERE order_id=1'))
90+
assert rows == [
91+
(1, 'sku2', 13),
7492
]

0 commit comments

Comments
 (0)