refactor

Author: Andrei Neagu

packages/service-library/src/servicelib/fastapi/postgres_lifespan.py

@@ -3,6 +3,7 @@
 from collections.abc import AsyncIterator
 from enum import Enum
 
+from fastapi import FastAPI
 from fastapi_lifespan_manager import State
 from servicelib.logging_utils import log_catch, log_context
 from settings_library.postgres import PostgresSettings
@@ -27,7 +28,7 @@ def create_postgres_database_input_state(settings: PostgresSettings) -> State:
     return {PostgresLifespanState.POSTGRES_SETTINGS: settings}
 
 
-async def postgres_database_lifespan(_, state: State) -> AsyncIterator[State]:
+async def postgres_database_lifespan(_: FastAPI, state: State) -> AsyncIterator[State]:
 
     with log_context(_logger, logging.INFO, f"{__name__}"):
 

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

@@ -13,11 +13,6 @@
 _logger = logging.getLogger(__name__)
 
 
-repository_lifespan_manager = LifespanManager()
-repository_lifespan_manager.add(postgres_database_lifespan)
-
-
-@repository_lifespan_manager.add
 async def _database_lifespan(app: FastAPI, state: State) -> AsyncIterator[State]:
     app.state.engine = state[PostgresLifespanState.POSTGRES_ASYNC_ENGINE]
 
@@ -26,3 +21,8 @@ async def _database_lifespan(app: FastAPI, state: State) -> AsyncIterator[State]
     app.state.default_product_name = await repo.get_default_product_name()
 
     yield {}
+
+
+repository_lifespan_manager = LifespanManager()
+repository_lifespan_manager.add(postgres_database_lifespan)
+repository_lifespan_manager.add(_database_lifespan)