🐛 Fix pagination logic to use total from page_meta in multiple routes and update tests for last page pagination

Author: pcrespov

packages/models-library/src/models_library/api_schemas_catalog/services.py

@@ -177,9 +177,7 @@ class ServiceSummary(CatalogOutputSchema):
     version: ServiceVersion
     name: str
     description: str
-
     version_display: str | None = None
-
     contact: LowerCaseEmailStr | None
 
     @staticmethod
@@ -195,6 +193,14 @@ def _update_json_schema_extra(schema: JsonDict) -> None:
                         "version_display": _EXAMPLE_SLEEPER["version_display"],
                         "contact": _EXAMPLE_SLEEPER["contact"],
                     },
+                    {
+                        "key": _EXAMPLE_SLEEPER["key"],
+                        "version": "100.0.0",
+                        "name": "sleeper",
+                        "description": "short description",
+                        "version_display": "HUGE Release",
+                        "contact": "[email protected]",
+                    },
                     {
                         "key": _EXAMPLE_FILEPICKER["key"],
                         "version": _EXAMPLE_FILEPICKER["version"],

packages/pytest-simcore/src/pytest_simcore/helpers/catalog_rpc_server.py

@@ -28,7 +28,7 @@
 )
 from models_library.services_types import ServiceKey, ServiceVersion
 from models_library.users import UserID
-from pydantic import NonNegativeInt, TypeAdapter, validate_call
+from pydantic import TypeAdapter, validate_call
 from pytest_mock import MockType
 from servicelib.rabbitmq._client_rpc import RabbitMQRPCClient
 
@@ -52,7 +52,7 @@ async def list_services_paginated(
         product_name: ProductName,
         user_id: UserID,
         limit: PageLimitInt,
-        offset: NonNegativeInt,
+        offset: PageOffsetInt,
         filters: ServiceListFilters | None = None,
     ):
         assert rpc_client
@@ -209,7 +209,7 @@ async def list_all_services_summaries_paginated(
         product_name: ProductName,
         user_id: UserID,
         limit: PageLimitInt,
-        offset: NonNegativeInt,
+        offset: PageOffsetInt,
         filters: ServiceListFilters | None = None,
     ):
         assert rpc_client

services/api-server/src/simcore_service_api_server/api/routes/programs.py

@@ -66,7 +66,7 @@ async def list_programs(
 
     return create_page(
         programs,
-        total=len(programs),
+        total=page_meta.total,
         params=page_params,
     )
 
@@ -103,7 +103,7 @@ async def list_program_history(
 
     return create_page(
         programs,
-        total=len(programs),
+        total=page_meta.total,
         params=page_params,
     )
 

services/api-server/src/simcore_service_api_server/api/routes/solvers.py

@@ -268,7 +268,7 @@ async def list_solver_releases_paginated(
     page_params.offset = page_meta.offset
     return create_page(
         solvers,
-        total=len(solvers),
+        total=page_meta.total,
         params=page_params,
     )
 

services/api-server/tests/unit/api_solvers/test_api_routers_solvers.py

@@ -211,15 +211,26 @@ async def test_solvers_page_pagination_last_page(
     assert response.status_code == status.HTTP_200_OK
     total_items = response.json()["total"]
 
+    assert (
+        total_items > 1
+    ), "Total items in MOCK examples should be greater than 1 for pagination test since we need 'prev', 'self' and 'prev' links"
+    last_item = total_items - 1
+    page_size = 1
+
     # Request the last page by using the total count as offset
     response = await client.get(
-        f"/{API_VTAG}/solvers/page?offset={total_items-1}", auth=auth
+        f"/{API_VTAG}/solvers/page?limit={page_size}&offset={last_item}", auth=auth
     )
     assert response.status_code == status.HTTP_200_OK
 
     response_data = response.json()
     assert "links" in response_data, "Response should contain links section"
 
     links = response_data["links"]
-    assert links["next"] is None, "Next link should be None for the last page"
-    assert links["prev"] is not None, "Prev link should be present for the last page"
+    assert links["next"] is None, "Next link should be None for the last page (size=1)"
+    assert (
+        links["prev"] is not None
+    ), "Prev link should be present for the last page (size=1)"
+    assert (
+        links["last"] == links["self"]
+    ), "Last link should be the same as self link for the last page"