improve delete workspace

Author: matusdrobuliak66

services/web/server/src/simcore_service_webserver/folders/_folders_service.py

@@ -11,11 +11,8 @@
 from models_library.users import UserID
 from models_library.workspaces import WorkspaceID, WorkspaceQuery, WorkspaceScope
 from pydantic import NonNegativeInt
-from servicelib.aiohttp.application_keys import APP_FIRE_AND_FORGET_TASKS_KEY
-from servicelib.common_headers import UNDEFINED_DEFAULT_SIMCORE_USER_AGENT_VALUE
-from servicelib.utils import fire_and_forget_task
 
-from ..projects._projects_service import submit_delete_project_task
+from ..projects._projects_service import delete_project_by_user
 from ..users.api import get_user
 from ..workspaces.api import check_user_workspace_access
 from ..workspaces.errors import (
@@ -362,17 +359,11 @@ async def delete_folder(
         )
     )
 
-    # fire and forget task for project deletion
     for project_id in project_id_list:
-        fire_and_forget_task(
-            submit_delete_project_task(
-                app,
-                project_uuid=project_id,
-                user_id=user_id,
-                simcore_user_agent=UNDEFINED_DEFAULT_SIMCORE_USER_AGENT_VALUE,
-            ),
-            task_suffix_name=f"delete_project_task_{project_id}",
-            fire_and_forget_tasks_collection=app[APP_FIRE_AND_FORGET_TASKS_KEY],
+        await delete_project_by_user(
+            app,
+            project_uuid=project_id,
+            user_id=user_id,
         )
 
     # 1.2 Delete all child folders

services/web/server/src/simcore_service_webserver/workspaces/_trash_service.py

@@ -23,7 +23,7 @@
 from ..folders._trash_service import trash_folder, untrash_folder
 from ..projects._crud_api_read import ProjectTypeAPI, list_projects
 from ..projects._trash_service import trash_project, untrash_project
-from . import _workspaces_repository, _workspaces_service
+from . import _workspaces_repository, _workspaces_service, _workspaces_service_crud_read
 from .errors import WorkspaceNotTrashedError
 
 _logger = logging.getLogger(__name__)
@@ -36,7 +36,7 @@ async def _check_exists_and_access(
     user_id: UserID,
     workspace_id: WorkspaceID,
 ):
-    await _workspaces_service.check_user_workspace_access(
+    await _workspaces_service_crud_read.check_user_workspace_access(
         app=app,
         user_id=user_id,
         workspace_id=workspace_id,
@@ -237,7 +237,7 @@ async def delete_trashed_workspace(
     until_equal_datetime: datetime | None = None,
 ) -> None:
 
-    workspace = await _workspaces_service.get_workspace(
+    workspace = await _workspaces_service_crud_read.get_workspace(
         app,
         user_id=user_id,
         product_name=product_name,
@@ -276,7 +276,7 @@ async def list_trashed_workspaces(
         (
             page_params.total_number_of_items,
             workspaces,
-        ) = await _workspaces_service.list_workspaces(
+        ) = await _workspaces_service_crud_read.list_workspaces(
             app,
             user_id=user_id,
             product_name=product_name,

services/web/server/src/simcore_service_webserver/workspaces/_workspaces_service.py

@@ -1,6 +1,5 @@
 # pylint: disable=unused-argument
 
-import asyncio
 import logging
 
 from aiohttp import web
@@ -87,9 +86,9 @@ async def update_workspace(
 async def delete_workspace(
     app: web.Application,
     *,
+    product_name: ProductName,
     user_id: UserID,
     workspace_id: WorkspaceID,
-    product_name: ProductName,
 ) -> None:
     await check_user_workspace_access(
         app=app,
@@ -125,12 +124,10 @@ async def delete_workspace(
         ]
 
         # Delete projects properly
-        await asyncio.gather(
-            *(
-                delete_project_by_user(app, project_uuid=project_uuid, user_id=user_id)
-                for project_uuid in workspace_root_projects
+        for project_uuid in workspace_root_projects:
+            await delete_project_by_user(
+                app, project_uuid=project_uuid, user_id=user_id
             )
-        )
 
     # Get all root folders
     for page_params in iter_pagination_params(limit=MAXIMUM_NUMBER_OF_ITEMS_PER_PAGE):
@@ -154,17 +151,13 @@ async def delete_workspace(
         ]
 
         # Delete folders properly
-        await asyncio.gather(
-            *(
-                delete_folder(
-                    app,
-                    user_id=user_id,
-                    product_name=product_name,
-                    folder_id=folder_id,
-                )
-                for folder_id in workspace_root_folders
+        for folder_id in workspace_root_folders:
+            await delete_folder(
+                app,
+                user_id=user_id,
+                product_name=product_name,
+                folder_id=folder_id,
             )
-        )
 
     await db.delete_workspace(
         app,