✨ Refactor RPC API: move lifespan management to a dedicated events module and add unit tests for access rights

Author: pcrespov

services/catalog/src/simcore_service_catalog/api/rpc/routes.py renamed to services/catalog/src/simcore_service_catalog/api/rpc/events.py

@@ -12,7 +12,7 @@
 )
 
 from .._meta import APP_FINISHED_BANNER_MSG, APP_STARTED_BANNER_MSG
-from ..api.rpc.routes import rpc_api_lifespan
+from ..api.rpc.events import rpc_api_lifespan
 from ..repository.events import database_lifespan
 from ..service.director import director_lifespan
 from ..service.function_services import function_services_lifespan

services/catalog/src/simcore_service_catalog/core/events.py

@@ -4,7 +4,7 @@
 
 
 from simcore_postgres_database.utils import as_postgres_sql_query_str
-from simcore_service_catalog.db.repositories._services_sql import (
+from simcore_service_catalog.repository._services_sql import (
     AccessRightsClauses,
     can_get_service_stmt,
     get_service_history_stmt,

services/catalog/tests/unit/test_db_repositories_services_sql.py

@@ -11,8 +11,8 @@
 from packaging.specifiers import SpecifierSet
 from packaging.version import Version
 from pytest_mock import MockerFixture, MockType
-from simcore_service_catalog.db.repositories.services import ServicesRepository
 from simcore_service_catalog.models.services_db import ReleaseDBGet
+from simcore_service_catalog.repository.services import ServicesRepository
 from simcore_service_catalog.service.compatibility import (
     _get_latest_compatible_version,
     evaluate_service_compatibility_map,

services/catalog/tests/unit/test_services_compatibility.py

@@ -30,15 +30,15 @@
     insert_and_get_row_lifespan,
 )
 from pytest_simcore.helpers.typing_env import EnvVarsDict
+from simcore_postgres_database.models.groups import groups
 from simcore_postgres_database.models.products import products
-from simcore_postgres_database.models.users import users
-from simcore_service_catalog.core.settings import ApplicationSettings
-from simcore_service_catalog.db.tables import (
-    groups,
+from simcore_postgres_database.models.services import (
     services_access_rights,
     services_meta_data,
 )
-from sqlalchemy import tuple_
+from simcore_postgres_database.models.users import users
+from simcore_service_catalog.core.settings import ApplicationSettings
+from sqlalchemy import sql
 from sqlalchemy.dialects.postgresql import insert as pg_insert
 from sqlalchemy.ext.asyncio import AsyncEngine
 
@@ -271,7 +271,7 @@ async def _inject_in_db(fake_catalog: list[tuple]):
     async with sqlalchemy_async_engine.begin() as conn:
         await conn.execute(
             services_meta_data.delete().where(
-                tuple_(services_meta_data.c.key, services_meta_data.c.version).in_(
+                sql.tuple_(services_meta_data.c.key, services_meta_data.c.version).in_(
                     inserted_services
                 )
             )

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

@@ -14,7 +14,7 @@
 from respx.router import MockRouter
 from simcore_postgres_database.models.services import services_meta_data
 from simcore_service_catalog.core.background_tasks import _run_sync_services
-from simcore_service_catalog.db.repositories.services import ServicesRepository
+from simcore_service_catalog.repository.services import ServicesRepository
 from sqlalchemy.ext.asyncio.engine import AsyncEngine
 
 pytest_simcore_core_services_selection = [

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

@@ -13,13 +13,13 @@
 from models_library.users import UserID
 from packaging import version
 from pydantic import EmailStr, HttpUrl, TypeAdapter
-from simcore_service_catalog.db.repositories.services import ServicesRepository
 from simcore_service_catalog.models.services_db import (
     ServiceAccessRightsAtDB,
     ServiceMetaDataDBCreate,
     ServiceMetaDataDBGet,
     ServiceMetaDataDBPatch,
 )
+from simcore_service_catalog.repository.services import ServicesRepository
 from simcore_service_catalog.utils.versioning import is_patch_release
 from sqlalchemy.ext.asyncio import AsyncEngine
 

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

@@ -9,8 +9,8 @@
 from models_library.products import ProductName
 from models_library.services import ServiceMetaDataPublished, ServiceVersion
 from pydantic import TypeAdapter
-from simcore_service_catalog.db.repositories.services import ServicesRepository
 from simcore_service_catalog.models.services_db import ServiceAccessRightsAtDB
+from simcore_service_catalog.repository.services import ServicesRepository
 from simcore_service_catalog.service.access_rights import (
     evaluate_auto_upgrade_policy,
     evaluate_default_policy,

services/catalog/tests/unit/with_dbs/test_services_access_rights.py renamed to services/catalog/tests/unit/with_dbs/test_service_access_rights.py

@@ -17,8 +17,8 @@
 from pytest_simcore.helpers.catalog_services import CreateFakeServiceDataCallable
 from respx.router import MockRouter
 from simcore_service_catalog.api._dependencies.director import get_director_api
-from simcore_service_catalog.db.repositories.groups import GroupsRepository
-from simcore_service_catalog.db.repositories.services import ServicesRepository
+from simcore_service_catalog.repository.groups import GroupsRepository
+from simcore_service_catalog.repository.services import ServicesRepository
 from simcore_service_catalog.service import manifest, services_api
 from simcore_service_catalog.service.director import DirectorApi
 from sqlalchemy.ext.asyncio import AsyncEngine