feat: applying new Orders class and test is breaking in the expected, desired way

Author: theodorehreuter

src/stapi_fastapi/backends/root_backend.py

@@ -6,7 +6,7 @@
 
 from stapi_fastapi.models.order import (
     Order,
-    OrderCollection,
+    Orders,
     OrderStatus,
     OrderStatusPayload,
 )
@@ -15,7 +15,7 @@
 class RootBackend[T: OrderStatusPayload, U: OrderStatus](Protocol):  # pragma: nocover
     async def get_orders(
         self, request: Request, next_token: str, limit: int
-    ) -> ResultE[OrderCollection]:
+    ) -> ResultE[Orders]:
         """
         Return a list of existing orders.
         """

src/stapi_fastapi/routers/root_router.py

@@ -164,7 +164,7 @@ async def get_orders(
     ) -> OrderCollection:
         match await self.backend.get_orders(request, next_token, limit):
             case Success(orders):
-                for order in orders:
+                for order in orders.collection:
                     order.links.append(
                         Link(
                             href=str(
@@ -176,7 +176,7 @@ async def get_orders(
                             type=TYPE_JSON,
                         )
                     )
-                return orders
+                return orders.collection
             case Failure(e):
                 logging.exception("An error occurred while retrieving orders", e)
                 raise HTTPException(

tests/application.py

@@ -21,6 +21,7 @@
     OrderCollection,
     OrderParameters,
     OrderPayload,
+    Orders,
     OrderStatus,
     OrderStatusCode,
     OrderStatusPayload,
@@ -45,11 +46,18 @@ def __init__(self, orders: InMemoryOrderDB) -> None:
 
     async def get_orders(
         self, request: Request, next_token: str, limit: int
-    ) -> ResultE[OrderCollection]:
+    ) -> ResultE[Orders]:
         """
         Show all orders.
         """
-        return Success(OrderCollection(features=list(self._orders_db._orders.values())))
+        return Success(
+            Orders(
+                collection=OrderCollection(
+                    features=list(self._orders_db._orders.values())
+                ),
+                token="a",
+            )
+        )
 
     async def get_order(self, order_id: str, request: Request) -> ResultE[Maybe[Order]]:
         """

tests/test_order.py

@@ -198,7 +198,7 @@ def test_order_pagination(
     product_backend._allowed_payloads = create_order_allowed_payloads
 
     # check empty
-    res = stapi_client.get("/orders", params={"next_token": "a", "limit": 10})
+    res = stapi_client.get("/orders", params={"next_token": "a", "limit": 1})
     default_orders = {"type": "FeatureCollection", "features": [], "links": []}
 
     assert res.status_code == status.HTTP_200_OK
@@ -221,6 +221,8 @@ def test_order_pagination(
 
     # call all orders
     res = stapi_client.get("/orders", params={"next_token": "a", "limit": 1})
+    checker = res.json()
+
     assert res.status_code == status.HTTP_200_OK
-    assert res.headers["Content-Type"] == "application/geo+json"
-    print("hold")
+    assert len(checker["features"]) == 1
+    assert checker["links"] != []