feat: clean up root backend model after messy main merge tests: fixed issue with in memory DB by adding missing __init__ to class. tests: added multiple orders to create_order fixture and passed this fixture to other tests using previously existing create_order_allowed_paylaods tests: added setup_pagination fixture that is now necessary again after fixing the in memory db init issue

Author: theodorehreuter

src/stapi_fastapi/backends/root_backend.py

@@ -11,7 +11,7 @@
 )
 
 
-class RootBackend[T: OrderStatusPayload, U: OrderStatus](Protocol):  # pragma: nocover
+class RootBackend[T: OrderStatus](Protocol):  # pragma: nocover
     async def get_orders(
         self, request: Request, next: str | None, limit: int
     ) -> ResultE[tuple[OrderCollection, str]]:

tests/application.py

@@ -34,8 +34,9 @@
 
 
 class InMemoryOrderDB:
-    _orders: dict[str, Order] = {}
-    _statuses: dict[str, list[OrderStatus]] = defaultdict(list)
+    def __init__(self) -> None:
+        self._orders: dict[str, Order] = {}
+        self._statuses: dict[str, list[OrderStatus]] = defaultdict(list)
 
 
 class MockRootBackend(RootBackend):

tests/test_order.py

@@ -27,34 +27,40 @@ def test_empty_order(stapi_client: TestClient):
 
 
 @pytest.fixture
-def create_order_allowed_payloads() -> list[OrderPayload]:
-    return [
-        OrderPayload(
+def create_order_payloads() -> list[OrderPayload]:
+    datetimes = [
+        ("2024-10-09T18:55:33Z", "2024-10-12T18:55:33Z"),
+        ("2024-10-15T18:55:33Z", "2024-10-18T18:55:33Z"),
+        ("2024-10-20T18:55:33Z", "2024-10-23T18:55:33Z"),
+    ]
+    payloads = []
+    for start, end in datetimes:
+        payload = OrderPayload(
             geometry=Point(
-                type="Point", coordinates=Position2D(longitude=13.4, latitude=52.5)
+                type="Point", coordinates=Position2D(longitude=14.4, latitude=56.5)
             ),
             datetime=(
-                datetime.fromisoformat("2024-11-11T18:55:33Z"),
-                datetime.fromisoformat("2024-11-15T18:55:33Z"),
+                datetime.fromisoformat(start),
+                datetime.fromisoformat(end),
             ),
             filter=None,
             order_parameters=MyOrderParameters(s3_path="s3://my-bucket"),
-        ),
-    ]
+        )
+        payloads.append(payload)
+    return payloads
 
 
 @pytest.fixture
 def new_order_response(
     product_id: str,
     product_backend: MockProductBackend,
     stapi_client: TestClient,
-    create_order_allowed_payloads: list[OrderPayload],
+    create_order_payloads: list[OrderPayload],
 ) -> Response:
-    product_backend._allowed_payloads = create_order_allowed_payloads
-
+    product_backend._allowed_payloads = create_order_payloads
     res = stapi_client.post(
         f"products/{product_id}/orders",
-        json=create_order_allowed_payloads[0].model_dump(),
+        json=create_order_payloads[0].model_dump(),
     )
 
     assert res.status_code == status.HTTP_201_CREATED, res.text
@@ -105,23 +111,23 @@ def get_order_response(
 
 @pytest.mark.parametrize("product_id", ["test-spotlight"])
 def test_get_order_properties(
-    get_order_response: Response, create_order_allowed_payloads
+    get_order_response: Response, create_order_payloads
 ) -> None:
     order = get_order_response.json()
 
     assert order["geometry"] == {
         "type": "Point",
-        "coordinates": list(create_order_allowed_payloads[0].geometry.coordinates),
+        "coordinates": list(create_order_payloads[0].geometry.coordinates),
     }
 
     assert order["properties"]["search_parameters"]["geometry"] == {
         "type": "Point",
-        "coordinates": list(create_order_allowed_payloads[0].geometry.coordinates),
+        "coordinates": list(create_order_payloads[0].geometry.coordinates),
     }
 
     assert (
         order["properties"]["search_parameters"]["datetime"]
-        == create_order_allowed_payloads[0].model_dump()["datetime"]
+        == create_order_payloads[0].model_dump()["datetime"]
     )
 
 
@@ -141,73 +147,21 @@ def test_order_status_after_create(
     assert len(res.json()["statuses"]) == 1
 
 
-@pytest.mark.parametrize("product_id", ["test-spotlight"])
-def test_order_status_after_update(
-    get_order_response: Response, stapi_client: TestClient
-) -> None:
-    body = get_order_response.json()
-    statuses_url = find_link(body["links"], "monitor")["href"]
-
-    res = stapi_client.post(
-        statuses_url,
-        json={
-            "status_code": "accepted",
-            "reason_code": "REASON1",
-            "reason_text": "some reason",
-        },
-    )
-
-    assert res.status_code == status.HTTP_202_ACCEPTED
-
-    res = stapi_client.get(statuses_url)
-    assert res.status_code == status.HTTP_200_OK
-    assert res.headers["Content-Type"] == "application/json"
-    body = res.json()
-    assert len(body["statuses"]) == 2
-
-    s = body["statuses"][0]
-    assert s["reason_code"] == "REASON1"
-    assert s["reason_text"] == "some reason"
-    assert s["status_code"] == "accepted"
-    assert s["timestamp"]
-
-    s = body["statuses"][1]
-    assert s["reason_code"] is None
-    assert s["reason_text"] is None
-    assert s["status_code"] == "received"
-    assert s["timestamp"]
-
-
 @pytest.fixture
-def create_order_payloads() -> list[OrderPayload]:
-    datetimes = [
-        ("2024-10-09T18:55:33Z", "2024-10-12T18:55:33Z"),
-        ("2024-10-15T18:55:33Z", "2024-10-18T18:55:33Z"),
-        ("2024-10-20T18:55:33Z", "2024-10-23T18:55:33Z"),
-    ]
-    payloads = []
-    for start, end in datetimes:
-        payload = OrderPayload(
-            geometry=Point(
-                type="Point", coordinates=Position2D(longitude=14.4, latitude=56.5)
-            ),
-            datetime=(
-                datetime.fromisoformat(start),
-                datetime.fromisoformat(end),
-            ),
-            filter=None,
-            order_parameters=MyOrderParameters(s3_path="s3://my-bucket"),
+def setup_pagination(stapi_client: TestClient, create_order_payloads) -> None:
+    product_id = "test-spotlight"
+
+    for order in create_order_payloads:
+        res = stapi_client.post(
+            f"products/{product_id}/orders",
+            json=order.model_dump(),
         )
-        payloads.append(payload)
-    return payloads
 
+        assert res.status_code == status.HTTP_201_CREATED, res.text
+        assert res.headers["Content-Type"] == "application/geo+json"
 
-def test_order_pagination(
-    prepare_order_pagination,
-    stapi_client: TestClient,
-) -> None:
-    # prepare_order_pagination
 
+def test_order_pagination(stapi_client: TestClient, setup_pagination) -> None:
     res = stapi_client.get("/orders", params={"next": None, "limit": 1})
     assert res.status_code == status.HTTP_200_OK
     body = res.json()
@@ -223,7 +177,6 @@ def test_order_pagination(
             break
 
 
-# separate test here to check for bad token getting back 404
 def test_token_not_found(stapi_client: TestClient):
     res = stapi_client.get("/orders", params={"next": "a_token"})
     # should return 404 as a result of bad token