wip on django repository tests

hjwp · hjwp · commit 2fbf6bcb1a4b · 2021-02-24T20:19:29.000Z
diff --git a/src/allocation/service_layer/services.py b/src/allocation/service_layer/services.py
@@ -16,7 +16,10 @@ def is_valid_sku(sku, batches):
 
 
 def add_batch(
-    ref: str, sku: str, qty: int, eta: Optional[date],
+    ref: str,
+    sku: str,
+    qty: int,
+    eta: Optional[date],
     uow: unit_of_work.AbstractUnitOfWork,
 ):
     with uow:
@@ -25,7 +28,9 @@ def add_batch(
 
 
 def allocate(
-    orderid: str, sku: str, qty: int,
+    orderid: str,
+    sku: str,
+    qty: int,
     uow: unit_of_work.AbstractUnitOfWork,
 ) -> str:
     line = OrderLine(orderid, sku, qty)
diff --git a/tests/integration/test_repository.py b/tests/integration/test_repository.py
@@ -1,67 +1,38 @@
 # pylint: disable=protected-access
 from allocation.domain import model
 from allocation.adapters import repository
+from allocation import django_model
 
 
 def test_repository_can_save_a_batch(session):
-    batch = model.Batch("batch1", "RUSTY-SOAPDISH", 100, eta=None)
+    batch = model.Batch("batch1", "RUSTY-SOAPDISH", 100, eta=date(2011, 12, 25))
 
     repo = repository.SqlAlchemyRepository(session)
     repo.add(batch)
-    session.commit()
-
-    rows = session.execute(
-        'SELECT reference, sku, _purchased_quantity, eta FROM "batches"'
-    )
-    assert list(rows) == [("batch1", "RUSTY-SOAPDISH", 100, None)]
 
-
-def insert_order_line(session):
-    session.execute(
-        "INSERT INTO order_lines (orderid, sku, qty)"
-        ' VALUES ("order1", "GENERIC-SOFA", 12)'
-    )
-    [[orderline_id]] = session.execute(
-        "SELECT id FROM order_lines WHERE orderid=:orderid AND sku=:sku",
-        dict(orderid="order1", sku="GENERIC-SOFA"),
-    )
-    return orderline_id
-
-
-def insert_batch(session, batch_id):
-    session.execute(
-        "INSERT INTO batches (reference, sku, _purchased_quantity, eta)"
-        ' VALUES (:batch_id, "GENERIC-SOFA", 100, null)',
-        dict(batch_id=batch_id),
-    )
-    [[batch_id]] = session.execute(
-        'SELECT id FROM batches WHERE reference=:batch_id AND sku="GENERIC-SOFA"',
-        dict(batch_id=batch_id),
-    )
-    return batch_id
-
-
-def insert_allocation(session, orderline_id, batch_id):
-    session.execute(
-        "INSERT INTO allocations (orderline_id, batch_id)"
-        " VALUES (:orderline_id, :batch_id)",
-        dict(orderline_id=orderline_id, batch_id=batch_id),
-    )
+    [saved_batch] = django_model.Batch.objects.all()
+    assert saved_batch.reference == batch.reference
+    assert saved_batch.sku == batch.sku
+    assert saved_batch.qty == batch.qty
+    assert saved_batch.eta == batch.eta
 
 
 def test_repository_can_retrieve_a_batch_with_allocations(session):
-    orderline_id = insert_order_line(session)
-    batch1_id = insert_batch(session, "batch1")
-    insert_batch(session, "batch2")
-    insert_allocation(session, orderline_id, batch1_id)
+    sku = "PONY-STATUE"
+    line = django_model.OrderLine.objects.create(orderid="order1", sku=sku, qty=12)
+    django_model.Batch.objects.create(reference="batch1", sku=sku, qty=100, eta=None)
+    django_model.Batch.objects.create(reference="batch2", sku=sku, qty=100, eta=None)
+    django_model.Allocation.objects.create(
+        reference="batch2", sku=sku, qty=100, eta=None
+    )
 
     repo = repository.SqlAlchemyRepository(session)
     retrieved = repo.get("batch1")
 
-    expected = model.Batch("batch1", "GENERIC-SOFA", 100, eta=None)
+    expected = model.Batch("batch1", sku, 100, eta=None)
     assert retrieved == expected  # Batch.__eq__ only compares reference
     assert retrieved.sku == expected.sku
     assert retrieved._purchased_quantity == expected._purchased_quantity
     assert retrieved._allocations == {
-        model.OrderLine("order1", "GENERIC-SOFA", 12),
+        model.OrderLine("order1", sku, 12),
     }
