draft test and api in catalog

Author: pcrespov

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

@@ -310,3 +310,11 @@ class ServiceUpdateV2(CatalogInputSchema):
 assert set(ServiceUpdateV2.model_fields.keys()) - set(  # nosec
     ServiceGetV2.model_fields.keys()
 ) == {"deprecated"}
+
+
+class MyServiceGet(CatalogOutputSchema):
+    key: ServiceKey
+    release: ServiceRelease
+
+    owner: GroupID
+    my_access_rights: ServiceGroupAccessRightsV2

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

@@ -152,7 +152,7 @@ async def cached_registry_services() -> dict[str, Any]:
         services_owner_emails,
     ) = await asyncio.gather(
         cached_registry_services(),
-        services_repo.list_services_access_rights(
+        services_repo.batch_get_services_access_rights(
             key_versions=services_in_db,
             product_name=x_simcore_products_name,
         ),

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

@@ -4,6 +4,7 @@
 
 from fastapi import FastAPI
 from models_library.api_schemas_catalog.services import (
+    MyServiceGet,
     PageRpcServicesGetV2,
     ServiceGetV2,
     ServiceUpdateV2,
@@ -165,3 +166,21 @@ async def check_for_service(
         service_key=service_key,
         service_version=service_version,
     )
+
+
+@router.expose(reraise_if_error_type=(CatalogForbiddenError,))
+@log_decorator(_logger, level=logging.DEBUG)
+async def batch_get_my_services(
+    app: FastAPI,
+    *,
+    product_name: ProductName,
+    user_id: UserID,
+    ids: list[
+        tuple[
+            ServiceKey,
+            ServiceVersion,
+        ]
+    ],
+) -> list[MyServiceGet]:
+
+    raise NotImplementedError

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

@@ -481,7 +481,7 @@ async def get_service_access_rights(
                 async for row in await conn.stream(query)
             ]
 
-    async def list_services_access_rights(
+    async def batch_get_services_access_rights(
         self,
         key_versions: Iterable[tuple[str, str]],
         product_name: str | None = None,

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

@@ -1,6 +1,10 @@
 import logging
 
-from models_library.api_schemas_catalog.services import ServiceGetV2, ServiceUpdateV2
+from models_library.api_schemas_catalog.services import (
+    MyServiceGet,
+    ServiceGetV2,
+    ServiceUpdateV2,
+)
 from models_library.products import ProductName
 from models_library.rest_pagination import PageLimitInt
 from models_library.services_access import ServiceGroupAccessRightsV2
@@ -93,7 +97,7 @@ async def list_services_paginated(
         # injects access-rights
         access_rights: dict[
             tuple[str, str], list[ServiceAccessRightsAtDB]
-        ] = await repo.list_services_access_rights(
+        ] = await repo.batch_get_services_access_rights(
             ((s.key, s.version) for s in services), product_name=product_name
         )
         if not access_rights:
@@ -333,3 +337,33 @@ async def check_for_service(
             user_id=user_id,
             product_name=product_name,
         )
+
+
+async def batch_get_my_services(
+    *,
+    repo: ServicesRepository,
+    product_name: ProductName,
+    user_id: UserID,
+    ids: list[
+        tuple[
+            ServiceKey,
+            ServiceVersion,
+        ]
+    ],
+) -> list[MyServiceGet]:
+
+    raise NotImplementedError
+
+    # user_groups = []
+
+    # result = []
+
+    # services_access_rights = await repo.batch_get_services_access_rights(key_versions=ids, product_name=product_name)
+
+    # for service_key, service_version in ids:
+    #     my_access_rights = {"read": False, "execute": False}
+
+    #     if (service_access_rights_db := services_access_rights.get((service_key,service_version)))
+
+    #         if service_access_rights_db.gid in user_groups:
+    #             my_access_rights.append()

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

@@ -143,3 +143,69 @@ async def test_list_services_paginated(
 
     # since it is cached, it should only call it `limit` times
     assert mocked_director_service_api["get_service"].call_count == limit
+
+
+async def test_batch_get_my_services(
+    background_sync_task_mocked: None,
+    rabbitmq_and_rpc_setup_disabled: None,
+    mocked_director_service_api: MockRouter,
+    target_product: ProductName,
+    services_repo: ServicesRepository,
+    user_id: UserID,
+    director_client: DirectorApi,
+    create_fake_service_data: Callable,
+    services_db_tables_injector: Callable,
+):
+    # Create fake services data
+    service_key = "simcore/services/comp/some-service"
+    service_version_1 = "1.0.0"
+    service_version_2 = "2.0.0"
+    other_service_key = "simcore/services/comp/other-service"
+    other_service_version = "1.0.0"
+
+    fake_service_1 = create_fake_service_data(
+        service_key,
+        service_version_1,
+        team_access=None,
+        everyone_access=None,
+        product=target_product,
+    )
+    fake_service_2 = create_fake_service_data(
+        service_key,
+        service_version_2,
+        team_access="x",
+        everyone_access=None,
+        product=target_product,
+    )
+    fake_service_3 = create_fake_service_data(
+        other_service_key,
+        other_service_version,
+        team_access=None,
+        everyone_access=None,
+        product=target_product,
+    )
+
+    # Inject fake services into the database
+    await services_db_tables_injector([fake_service_1, fake_service_2, fake_service_3])
+
+    # Batch get my services
+    ids = [
+        (service_key, service_version_1),
+        (service_key, service_version_2),
+        (other_service_key, other_service_version),
+    ]
+
+    my_services = await services_api.batch_get_my_services(
+        repo=services_repo,
+        product_name=target_product,
+        user_id=user_id,
+        ids=ids,
+    )
+
+    assert len(my_services) == 3
+
+    # Check access rights
+    assert my_services[0].my_access_rights == {}
+    assert my_services[1].my_access_rights is not None
+    assert my_services[2].my_access_rights is not None
+    assert my_services[2].owner is not None