add tests for new implementations

Author: bisgaard-itis

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

@@ -28,6 +28,13 @@
 from pydantic import NonNegativeInt, TypeAdapter
 from servicelib.rabbitmq._client_rpc import RabbitMQRPCClient
 
+assert ServiceListFilters.model_json_schema()["properties"].keys() == {
+    "service_type"
+}, (
+    "ServiceListFilters is expected to only have the key 'service_type'. "
+    "Please update the mock if the schema changes."
+)
+
 
 class CatalogRpcSideEffects:
     # pylint: disable=no-self-use
@@ -44,11 +51,15 @@ async def list_services_paginated(
         assert rpc_client
         assert product_name
         assert user_id
-        assert filters is None, "filters not mocked yet"
 
         items = TypeAdapter(list[LatestServiceGet]).validate_python(
             LatestServiceGet.model_json_schema()["examples"],
         )
+        if filters:
+            items = [
+                item for item in items if item.service_type == filters.service_type
+            ]
+
         total_count = len(items)
 
         return PageRpc[LatestServiceGet].create(

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

@@ -146,27 +146,36 @@ async def list_solvers_releases(
         page_params.total_number_of_items = page_meta.total
         latest_releases.extend(services)
 
-    all_releases = []
-    for service in latest_releases:
+    all_solvers = []
+    for service_release in latest_releases:
         for page_params in iter_pagination_params(limit=DEFAULT_PAGINATION_LIMIT):
             services, page_meta = await catalog_service.list_release_history(
                 product_name=product_name,
                 user_id=user_id,
-                service_key=service.id,
+                service_key=service_release.key,
                 offset=page_params.offset,
                 limit=page_params.limit,
             )
             page_params.total_number_of_items = page_meta.total
-            all_releases.extend(services)
-
-    solvers = [Solver.create_from_service(service) for service in all_releases]
+            all_solvers.extend(
+                [
+                    Solver.create_from_service_release(
+                        service_key=service_release.key,
+                        description=service_release.description,
+                        contact=service_release.contact,
+                        name=service_release.name,
+                        service=service,
+                    )
+                    for service in services
+                ]
+            )
 
-    for solver in solvers:
+    for solver in all_solvers:
         solver.url = url_for(
             "get_solver_release", solver_key=solver.id, version=solver.version
         )
 
-    return sorted(solvers, key=attrgetter("id", "pep404_version"))
+    return sorted(all_solvers, key=attrgetter("id", "pep404_version"))
 
 
 @router.get(

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

@@ -89,3 +89,21 @@ async def test_list_solver_ports(
             },
         ],
     }
+
+
+async def test_list_solvers_with_mocked_catalog(
+    client: httpx.AsyncClient,
+    mocked_rpc_catalog_service_api: dict,
+    auth: httpx.BasicAuth,
+):
+    response = await client.get(f"/{API_VTAG}/solvers", auth=auth)
+    assert response.status_code == status.HTTP_200_OK
+
+
+async def test_list_solver_releases_with_mocked_catalog(
+    client: httpx.AsyncClient,
+    mocked_rpc_catalog_service_api: dict,
+    auth: httpx.BasicAuth,
+):
+    response = await client.get(f"/{API_VTAG}/solvers/releases", auth=auth)
+    assert response.status_code == status.HTTP_200_OK