tests: extend pagination tester to inlcude rebuilding and passing POST body tests: add pagination tester to search opportunties test

Author: theodorehreuter

src/stapi_fastapi/routers/product_router.py

@@ -179,7 +179,7 @@ async def search_opportunities(
         ):
             case Success((features, pagination_token)):
                 links = [
-                    Link(  # current bug is missing method set and setting body for
+                    Link(
                         href=str(
                             request.url_for(
                                 f"{self.root_router.name}:{self.product.id}:create-order",

tests/conftest.py

@@ -185,6 +185,9 @@ def pagination_tester(
             next_url = next(
                 (d["href"] for d in resp_body["links"] if d["rel"] == "next"), None
             )
+            body = next(
+                (d.et("body") for d in resp_body["links"] if d.get("body")), None
+            )
         else:
             next_url = None
 

tests/test_opportunity.py

@@ -3,13 +3,13 @@
 from uuid import uuid4
 
 import pytest
-from fastapi import status
 from fastapi.testclient import TestClient
 from geojson_pydantic import Point
 from geojson_pydantic.types import Position2D
 
 from stapi_fastapi.models.opportunity import Opportunity, OpportunityCollection
 from tests.application import MyOpportunityProperties
+from tests.conftest import pagination_tester
 
 from .backends import MockProductBackend
 from .test_datetime_interval import rfc3339_strftime
@@ -127,12 +127,12 @@ def test_search_opportunities_pagination(
         },
     }
 
-    res = stapi_client.post(
-        f"/products/{product_id}/opportunities",
-        json=request_payload,
-        params={"next": None, "limit": 2},
+    pagination_tester(
+        stapi_client=stapi_client,
+        endpoint=f"/products/{product_id}/opportunities",
+        method="POST",
+        limit=2,
+        target="features",
+        expected_total_returns=3,
+        body=request_payload,
     )
-    body = res.json()  # noqa: F841
-
-    assert res.status_code == status.HTTP_200_OK
-    assert 1 == 2

tests/test_product.py

@@ -2,6 +2,8 @@
 from fastapi import status
 from fastapi.testclient import TestClient
 
+from tests.conftest import pagination_tester
+
 
 def test_products_response(stapi_client: TestClient):
     res = stapi_client.get("/products")
@@ -65,27 +67,15 @@ def test_product_order_parameters_response(
     assert "s3_path" in json_schema["properties"]
 
 
-@pytest.mark.parametrize("limit", [1])
-def test_product_pagination(stapi_client: TestClient, limit: int):
-    res = stapi_client.get("/products", params={"next": None, "limit": limit})
-    assert res.status_code == status.HTTP_200_OK
-    body = res.json()
-    assert len(body["products"]) == limit
-    links = body["links"]
-    for d in body["links"]:
-        if ("rel", "next") in d.items():
-            next = d["href"]
-
-    while len(links) > 1:
-        res = stapi_client.get(next)
-        assert res.status_code == status.HTTP_200_OK
-        body = res.json()
-        assert body["products"] != []
-        links = body["links"]
-        for d in body["links"]:
-            if ("rel", "next") in d.items():
-                assert len(body["products"]) == limit
-                next = body["links"][0]["href"]
+def test_product_pagination(stapi_client: TestClient):
+    pagination_tester(
+        stapi_client=stapi_client,
+        endpoint="/products",
+        method="GET",
+        limit=1,
+        target="products",
+        expected_total_returns=2,
+    )
 
 
 def test_token_not_found(stapi_client: TestClient) -> None: