fixes tests

Author: pcrespov

services/catalog/src/simcore_service_catalog/api/rpc/_services.py

@@ -237,7 +237,7 @@ async def get_my_service_history(
 ) -> PageRpcServiceRelease:
     assert app.state.engine  # nosec
 
-    total_count, items = await services_api.get_service_history(
+    total_count, items = await services_api.list_my_service_release_history(
         repo=ServicesRepository(app.state.engine),
         product_name=product_name,
         user_id=user_id,

services/catalog/src/simcore_service_catalog/db/repositories/services.py

@@ -467,6 +467,7 @@ async def get_service_history(
 
     async def get_service_history_page(
         self,
+        *,
         # access-rights
         product_name: ProductName,
         user_id: UserID,

services/catalog/src/simcore_service_catalog/services/services_api.py

@@ -121,6 +121,7 @@ def _to_get_schema(
 async def list_latest_services(
     repo: ServicesRepository,
     director_api: DirectorApi,
+    *,
     product_name: ProductName,
     user_id: UserID,
     limit: PageLimitInt | None,
@@ -466,16 +467,21 @@ async def batch_get_my_services(
     return my_services
 
 
-async def get_service_history(
+async def list_my_service_release_history(
     repo: ServicesRepository,
     *,
+    # access-rights
     product_name: ProductName,
     user_id: UserID,
+    # target service
     service_key: ServiceKey,
+    # pagination
     limit: PageLimitInt | None = None,
     offset: NonNegativeInt | None = None,
+    # options
     include_compatibility: bool = False,
 ) -> tuple[PageTotalCount, list[ServiceRelease]]:
+
     total_count, history = await repo.get_service_history_page(
         # NOTE: that the service history might be different for each user
         # since access-rights are defined on a k:v basis
@@ -486,7 +492,7 @@ async def get_service_history(
         offset=offset,
     )
 
-    compatibility_map = {}
+    compatibility_map: dict[ServiceVersion, Compatibility | None] = {}
     if include_compatibility:
         msg = "This operation is heavy and for the moment is not necessary"
         raise NotImplementedError(msg)

services/catalog/tests/unit/with_dbs/test_api_rpc.py

@@ -13,7 +13,7 @@
 from fastapi import FastAPI
 from models_library.products import ProductName
 from models_library.rest_pagination import MAXIMUM_NUMBER_OF_ITEMS_PER_PAGE
-from models_library.services import ServiceRelease
+from models_library.services_history import ServiceRelease
 from models_library.services_types import ServiceKey, ServiceVersion
 from models_library.users import UserID
 from pydantic import ValidationError
@@ -29,8 +29,8 @@
 from servicelib.rabbitmq.rpc_interfaces.catalog.services import (
     batch_get_my_services,
     check_for_service,
+    get_my_service_history,
     get_service,
-    get_service_release_history,
     list_services_paginated,
     update_service,
 )
@@ -483,13 +483,15 @@ async def test_rpc_batch_get_my_services(
     assert my_services[1].release.version == other_service_version
 
 
-async def test_rpc_get_service_release_history(
+async def test_rpc_get_my_service_history(
     background_sync_task_mocked: None,
     mocked_director_service_api: MockRouter,
     rpc_client: RabbitMQRPCClient,
     product_name: ProductName,
     user_id: UserID,
     app: FastAPI,
+    create_fake_service_data: Callable,
+    services_db_tables_injector: Callable,
 ):
     assert app
 
@@ -499,49 +501,52 @@ async def test_rpc_get_service_release_history(
 
     # Inject fake service releases for the target service
     fake_releases = [
-        ServiceRelease(key=service_key, version=service_version_1),
-        ServiceRelease(key=service_key, version=service_version_2),
+        create_fake_service_data(
+            service_key,
+            srv_version,
+            team_access=None,
+            everyone_access=None,
+            product=product_name,
+        )
+        for srv_version in (service_version_1, service_version_2)
     ]
 
     # Inject unrelated fake service releases
     unrelated_service_key_1 = "simcore/services/comp/unrelated-service-1"
     unrelated_service_key_2 = "simcore/services/comp/unrelated-service-2"
     unrelated_releases = [
-        ServiceRelease(key=unrelated_service_key_1, version="1.0.0"),
-        ServiceRelease(key=unrelated_service_key_1, version="1.1.0"),
-        ServiceRelease(key=unrelated_service_key_2, version="2.0.0"),
+        *[
+            create_fake_service_data(
+                unrelated_service_key_1,
+                srv_version,
+                team_access=None,
+                everyone_access=None,
+                product=product_name,
+            )
+            for srv_version in (service_version_1, service_version_2)
+        ],
+        create_fake_service_data(
+            unrelated_service_key_2,
+            "2.0.0",
+            team_access=None,
+            everyone_access=None,
+            product=product_name,
+        ),
     ]
 
-    mocked_director_service_api.post(
-        f"/services/{service_key}/releases",
-        json=[release.model_dump() for release in fake_releases],
-    )
-    mocked_director_service_api.post(
-        f"/services/{unrelated_service_key_1}/releases",
-        json=[release.model_dump() for release in unrelated_releases[:2]],
-    )
-    mocked_director_service_api.post(
-        f"/services/{unrelated_service_key_2}/releases",
-        json=[release.model_dump() for release in unrelated_releases[2:]],
-    )
+    await services_db_tables_injector(fake_releases + unrelated_releases)
 
     # Call the RPC function
-    release_history = await get_service_release_history(
+    page = await get_my_service_history(
         rpc_client,
         product_name=product_name,
         user_id=user_id,
         service_key=service_key,
     )
+    release_history: list[ServiceRelease] = page.data
 
     # Validate the response
     assert isinstance(release_history, list)
     assert len(release_history) == 2
-    assert release_history[0].key == service_key
     assert release_history[0].version == service_version_1
-    assert release_history[1].key == service_key
     assert release_history[1].version == service_version_2
-
-    # Ensure unrelated services do not appear in the release history
-    unrelated_keys = {unrelated_service_key_1, unrelated_service_key_2}
-    for release in release_history:
-        assert release.key not in unrelated_keys