fix: load mock data into in memory db more cleanly for order status tests.

Author: theodorehreuter

tests/application.py

@@ -105,10 +105,26 @@ async def search_opportunities(
         product_router: ProductRouter,
         search: OpportunityRequest,
         request: Request,
-    ) -> ResultE[list[Opportunity]]:
+        next: str | None,
+        limit: int,
+    ) -> ResultE[tuple[list[Opportunity], str]]:
         try:
+            start = 0
+            if limit > 100:
+                limit = 100
+            if next:
+                start = self._opportunities.index(next)
+            end = min(start + limit, len(self._opportunities))
+            print(end)
+            # opportunities = self._opportunities.k
             return Success(
-                [o.model_copy(update=search.model_dump()) for o in self._opportunities]
+                (
+                    [
+                        o.model_copy(update=search.model_dump())
+                        for o in self._opportunities
+                    ],
+                    "",
+                )
             )
         except Exception as e:
             return Failure(e)
@@ -206,23 +222,3 @@ class MyOrderParameters(OrderParameters):
 root_router.add_product(product)
 app: FastAPI = FastAPI()
 app.include_router(root_router, prefix="")
-
-TEST_STATUSES = {
-    "test_order_id": [
-        OrderStatus(
-            timestamp=datetime(2025, 1, 14, 2, 21, 48, 466726, tzinfo=timezone.utc),
-            status_code=OrderStatusCode.received,
-            links=[],
-        ),
-        OrderStatus(
-            timestamp=datetime(2025, 1, 15, 5, 20, 48, 466726, tzinfo=timezone.utc),
-            status_code=OrderStatusCode.accepted,
-            links=[],
-        ),
-        OrderStatus(
-            timestamp=datetime(2025, 1, 16, 10, 15, 32, 466726, tzinfo=timezone.utc),
-            status_code=OrderStatusCode.completed,
-            links=[],
-        ),
-    ]
-}

tests/conftest.py

@@ -21,7 +21,6 @@
 from stapi_fastapi.routers.root_router import RootRouter
 
 from .application import (
-    TEST_STATUSES,
     InMemoryOrderDB,
     MockProductBackend,
     MockRootBackend,
@@ -42,13 +41,6 @@ def order_db() -> InMemoryOrderDB:
     return InMemoryOrderDB()
 
 
-@pytest.fixture
-def order_db_statuses() -> InMemoryOrderDB:
-    order_db = InMemoryOrderDB()
-    order_db._statuses = TEST_STATUSES
-    return order_db
-
-
 @pytest.fixture
 def product_backend(order_db: InMemoryOrderDB) -> MockProductBackend:
     return MockProductBackend(order_db)
@@ -59,11 +51,6 @@ def root_backend(order_db: InMemoryOrderDB) -> MockRootBackend:
     return MockRootBackend(order_db)
 
 
-@pytest.fixture
-def root_backend_preloaded(order_db_statuses: InMemoryOrderDB) -> MockRootBackend:
-    return MockRootBackend(order_db_statuses)
-
-
 @pytest.fixture
 def mock_product_test_spotlight(
     product_backend: MockProductBackend, mock_provider: Provider
@@ -131,16 +118,6 @@ def empty_stapi_client(root_backend, base_url: str) -> Iterator[TestClient]:
         yield client
 
 
-@pytest.fixture
-def statuses_client(root_backend_preloaded, base_url: str) -> Iterator[TestClient]:
-    root_router = RootRouter(root_backend_preloaded)
-    app = FastAPI()
-    app.include_router(root_router, prefix="")
-
-    with TestClient(app, base_url=f"{base_url}") as client:
-        yield client
-
-
 @pytest.fixture(scope="session")
 def url_for(base_url: str) -> Iterator[Callable[[str], str]]:
     def with_trailing_slash(value: str) -> str:
@@ -206,7 +183,6 @@ def mock_test_spotlight_opportunities() -> list[Opportunity]:
                 off_nadir={"minimum": 20, "maximum": 22},
                 vehicle_id=[1],
                 platform="platform_id",
-                other_thing="abcd1234",
             ),
         ),
     ]

tests/test_order.py

@@ -1,4 +1,4 @@
-from datetime import UTC, datetime, timedelta
+from datetime import UTC, datetime, timedelta, timezone
 
 import pytest
 from fastapi import status
@@ -7,9 +7,9 @@
 from geojson_pydantic.types import Position2D
 from httpx import Response
 
-from stapi_fastapi.models.order import OrderPayload
+from stapi_fastapi.models.order import OrderPayload, OrderStatus, OrderStatusCode
 
-from .application import MyOrderParameters
+from .application import InMemoryOrderDB, MyOrderParameters
 from .backends import MockProductBackend
 from .shared import find_link
 
@@ -188,13 +188,46 @@ def test_token_not_found(stapi_client: TestClient) -> None:
     assert res.status_code == status.HTTP_404_NOT_FOUND
 
 
-def test_order_status_pagination(statuses_client: TestClient, limit: int = 2) -> None:
+@pytest.fixture
+def order_statuses() -> dict[str, list[OrderStatus]]:
+    statuses = {
+        "test_order_id": [
+            OrderStatus(
+                timestamp=datetime(2025, 1, 14, 2, 21, 48, 466726, tzinfo=timezone.utc),
+                status_code=OrderStatusCode.received,
+                links=[],
+            ),
+            OrderStatus(
+                timestamp=datetime(2025, 1, 15, 5, 20, 48, 466726, tzinfo=timezone.utc),
+                status_code=OrderStatusCode.accepted,
+                links=[],
+            ),
+            OrderStatus(
+                timestamp=datetime(
+                    2025, 1, 16, 10, 15, 32, 466726, tzinfo=timezone.utc
+                ),
+                status_code=OrderStatusCode.completed,
+                links=[],
+            ),
+        ]
+    }
+    return statuses
+
+
+def test_order_status_pagination(
+    stapi_client: TestClient,
+    order_db: InMemoryOrderDB,
+    order_statuses: dict[str, list[OrderStatus]],
+    limit: int = 2,
+) -> None:
+    order_db._statuses = order_statuses
+
     order_id = "test_order_id"
-    res = statuses_client.get(f"/orders/{order_id}/statuses")
+    res = stapi_client.get(f"/orders/{order_id}/statuses")
     assert res.status_code == status.HTTP_200_OK
 
     order_id = "test_order_id"
-    res = statuses_client.get(
+    res = stapi_client.get(
         f"/orders/{order_id}/statuses", params={"next": None, "limit": limit}
     )
     body = res.json()
@@ -205,7 +238,7 @@ def test_order_status_pagination(statuses_client: TestClient, limit: int = 2) ->
             next = link["href"]
 
     while len(links) > 1:
-        res = statuses_client.get(next)
+        res = stapi_client.get(next)
         assert res.status_code == status.HTTP_200_OK
         body = res.json()
         assert body["statuses"] != []
@@ -217,8 +250,13 @@ def test_order_status_pagination(statuses_client: TestClient, limit: int = 2) ->
 
 
 def test_get_order_statuses_bad_token(
-    statuses_client: TestClient, limit: int = 2
+    stapi_client: TestClient,
+    order_db: InMemoryOrderDB,
+    order_statuses: dict[str, list[OrderStatus]],
+    limit: int = 2,
 ) -> None:
+    order_db._statuses = order_statuses
+
     order_id = "non_existing_order_id"
-    res = statuses_client.get(f"/orders/{order_id}/statuses")
+    res = stapi_client.get(f"/orders/{order_id}/statuses")
     assert res.status_code == status.HTTP_404_NOT_FOUND