make testable

Author: giancarloromeo

services/storage/src/simcore_service_storage/core/application.py

@@ -29,7 +29,7 @@
 from ..dsm import setup_dsm
 from ..dsm_cleaner import setup_dsm_cleaner
 from ..exceptions.handlers import set_exception_handlers
-from ..modules.celery.celery import setup_celery
+from ..modules.celery.core import setup_celery
 from ..modules.db import setup_db
 from ..modules.long_running_tasks import setup_rest_api_long_running_tasks_for_uploads
 from ..modules.redis import setup as setup_redis

services/storage/src/simcore_service_storage/modules/celery/celery.py renamed to services/storage/src/simcore_service_storage/modules/celery/core.py

@@ -9,26 +9,14 @@
 from settings_library.redis import RedisDatabase
 from simcore_service_storage.modules.celery.tasks import archive
 
-from ...core.settings import ApplicationSettings, get_application_settings
+from ...core.settings import get_application_settings
 
 _log = logging.getLogger(__name__)
 
 
 class CeleryTaskQueue:
-    def __init__(self, app_settings: ApplicationSettings):
-        assert app_settings.STORAGE_REDIS
-        redis_dsn = app_settings.STORAGE_REDIS.build_redis_dsn(
-            RedisDatabase.CELERY_TASKS,
-        )
-
-        self._celery_app = Celery(
-            broker=redis_dsn,
-            backend=redis_dsn,
-        )
-
-    @property
-    def celery_app(self):
-        return self._celery_app
+    def __init__(self, celery_app: Celery):
+        self._celery_app = celery_app
 
     def create_task(self, task_fn: Callable):
         self._celery_app.task()(task_fn)
@@ -40,13 +28,23 @@ def cancel_task(self, task_id: str):
         self._celery_app.control.revoke(task_id)
 
 
-# TODO: use new FastAPI lifespan
+# TODO: move and use new FastAPI lifespan
 def setup_celery(app: FastAPI) -> None:
     async def on_startup() -> None:
         settings = get_application_settings(app)
         assert settings.STORAGE_REDIS
 
-        task_queue = CeleryTaskQueue(settings)
+        assert settings.STORAGE_REDIS
+        redis_dsn = settings.STORAGE_REDIS.build_redis_dsn(
+            RedisDatabase.CELERY_TASKS,
+        )
+
+        celery_app = Celery(
+            broker=redis_dsn,
+            backend=redis_dsn,
+        )
+
+        task_queue = CeleryTaskQueue(celery_app)
         task_queue.create_task(archive)
 
         app.state.task_queue = task_queue