final cleanup

Author: pcrespov

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

@@ -7,7 +7,10 @@
 from models_library.products import ProductName
 from models_library.projects import ProjectID
 from models_library.users import UserID
+from simcore_postgres_database.utils_repos import transaction_context
+from sqlalchemy.ext.asyncio import AsyncConnection
 
+from ..db.plugin import get_asyncpg_engine
 from ..projects._trash_api import trash_project, untrash_project
 from ..workspaces.api import check_user_workspace_access
 from . import _folders_db
@@ -55,6 +58,7 @@ async def _check_exists_and_access(
 
 async def _folders_db_update(
     app: web.Application,
+    connection: AsyncConnection | None = None,
     *,
     product_name: ProductName,
     folder_id: FolderID,
@@ -63,6 +67,7 @@ async def _folders_db_update(
     # EXPLICIT un/trash
     await _folders_db.update(
         app,
+        connection,
         folders_id_or_ids=folder_id,
         product_name=product_name,
         trashed_at=trashed_at,
@@ -73,14 +78,15 @@ async def _folders_db_update(
     child_folders: set[FolderID] = {
         f
         for f in await _folders_db.get_folders_recursively(
-            app, folder_id=folder_id, product_name=product_name
+            app, connection, folder_id=folder_id, product_name=product_name
         )
         if f != folder_id
     }
 
     if child_folders:
         await _folders_db.update(
             app,
+            connection,
             folders_id_or_ids=child_folders,
             product_name=product_name,
             trashed_at=trashed_at,
@@ -104,40 +110,40 @@ async def trash_folder(
     # Trash
     trashed_at = arrow.utcnow().datetime
 
-    _logger.debug(
-        "TODO: Unit of work for all folders and projects and fails if force_stop_first=%s  is False",
-        force_stop_first,
-    )
+    async with transaction_context(get_asyncpg_engine(app)) as connection:
 
-    # 1. Trash folder and children
-    await _folders_db_update(
-        app,
-        folder_id=folder_id,
-        product_name=product_name,
-        trashed_at=trashed_at,
-    )
-
-    # 2. Trash all child projects that I am an owner
-    child_projects: list[
-        ProjectID
-    ] = await _folders_db.get_projects_recursively_only_if_user_is_owner(
-        app,
-        folder_id=folder_id,
-        private_workspace_user_id_or_none=user_id if workspace_is_private else None,
-        user_id=user_id,
-        product_name=product_name,
-    )
-
-    for project_id in child_projects:
-        await trash_project(
+        # 1. Trash folder and children
+        await _folders_db_update(
             app,
+            connection,
+            folder_id=folder_id,
             product_name=product_name,
+            trashed_at=trashed_at,
+        )
+
+        # 2. Trash all child projects that I am an owner
+        child_projects: list[
+            ProjectID
+        ] = await _folders_db.get_projects_recursively_only_if_user_is_owner(
+            app,
+            connection,
+            folder_id=folder_id,
+            private_workspace_user_id_or_none=user_id if workspace_is_private else None,
             user_id=user_id,
-            project_id=project_id,
-            force_stop_first=force_stop_first,
-            explicit=False,
+            product_name=product_name,
         )
 
+        for project_id in child_projects:
+            await trash_project(
+                app,
+                # NOTE: this needs to be included in the unit-of-work, i.e. connection,
+                product_name=product_name,
+                user_id=user_id,
+                project_id=project_id,
+                force_stop_first=force_stop_first,
+                explicit=False,
+            )
+
 
 async def untrash_folder(
     app: web.Application,