cleanup

Author: pcrespov

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

@@ -87,15 +87,15 @@ async def update_service(
         got.key = service_key
         return got.model_copy(update=update.model_dump(exclude_unset=True))
 
-    async def get_my_service_history(
+    async def list_my_service_history_paginated(
         self,
         rpc_client: RabbitMQRPCClient,
         *,
         product_name: ProductName,
         user_id: UserID,
         service_key: ServiceKey,
-        limit: PageLimitInt,
         offset: PageOffsetInt,
+        limit: PageLimitInt,
     ) -> PageRpc[ServiceRelease]:
 
         assert rpc_client

services/api-server/src/simcore_service_api_server/services_rpc/catalog.py

@@ -55,7 +55,7 @@ async def list_release_history(
         limit: PageLimitInt = DEFAULT_NUMBER_OF_ITEMS_PER_PAGE,
     ) -> tuple[list[ServiceRelease], PageMetaInfoLimitOffset]:
 
-        page = await catalog_rpc.get_my_service_history(
+        page = await catalog_rpc.list_my_service_history_paginated(
             self._client,
             product_name=product_name,
             user_id=user_id,

services/api-server/tests/unit/test_services_catalog.py

@@ -46,6 +46,12 @@ def mocked_rpc_catalog_service_api(mocker: MockerFixture) -> dict[str, MockType]
             autospec=True,
             side_effect=side_effects.update_service,
         ),
+        "list_my_service_history_paginated": mocker.patch.object(
+            catalog_rpc,
+            "list_my_service_history_paginated",
+            autospec=True,
+            side_effect=side_effects.list_my_service_history_paginated,
+        ),
     }
 
 
@@ -103,3 +109,10 @@ async def test_catalog_service_read_solvers(
     solver = to_solver(service)
     assert solver.id == selected_solver.id
     assert solver.version == oldest_release.version
+
+    # checks calls to rpc
+    mocked_rpc_catalog_service_api["list_services_paginated"].assert_called_once()
+    mocked_rpc_catalog_service_api[
+        "list_my_service_history_paginated"
+    ].assert_called_once()
+    mocked_rpc_catalog_service_api["get_service"].assert_called_once()