drafts batch delete projects

Author: pcrespov

services/web/server/src/simcore_service_webserver/garbage_collector/_tasks_trash.py

@@ -30,7 +30,7 @@
 )
 async def _run_task(app: web.Application):
     with log_context(_logger, logging.INFO, "Deleting expired trashed items"):
-        await trash_service.delete_expired_trash_as_admin(app)
+        await trash_service.safe_delete_expired_trash_as_admin(app)
 
 
 async def _run_periodically(app: web.Application, wait_interval_s: float):

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

@@ -237,3 +237,14 @@ async def delete_explicitly_trashed_project(
         user_id=user_id,
         project_uuid=project_id,
     )
+
+
+async def batch_delete_trashed_projects_as_admin(
+    app: web.Application,
+    trashed_before: datetime,
+    *,
+    product_name: ProductName,
+    fail_fast: bool,
+) -> None:
+
+    raise NotImplementedError

services/web/server/src/simcore_service_webserver/projects/projects_trash_service.py

@@ -1,9 +1,11 @@
 from ._trash_service import (
+    batch_delete_trashed_projects_as_admin,
     delete_explicitly_trashed_project,
     list_explicitly_trashed_projects,
 )
 
 __all__: tuple[str, ...] = (
+    "batch_delete_trashed_projects_as_admin",
     "delete_explicitly_trashed_project",
     "list_explicitly_trashed_projects",
 )

services/web/server/src/simcore_service_webserver/trash/_rest.py

@@ -58,7 +58,7 @@ async def empty_trash(request: web.Request):
     product_name = get_product_name(request)
 
     fire_and_forget_task(
-        _service.empty_trash_safe(
+        _service.safe_empty_trash(
             request.app, product_name=product_name, user_id=user_id
         ),
         task_suffix_name="rest.empty_trash",

services/web/server/src/simcore_service_webserver/trash/_service.py

@@ -99,21 +99,28 @@ async def _empty_explicitly_trashed_folders_and_content(
                 )
 
 
-async def empty_trash_safe(
+async def safe_empty_trash(
     app: web.Application, *, product_name: ProductName, user_id: UserID
 ):
     await _empty_explicitly_trashed_projects(app, product_name, user_id)
 
     await _empty_explicitly_trashed_folders_and_content(app, product_name, user_id)
 
 
-async def delete_expired_trash_as_admin(app: web.Application) -> list:
+async def safe_delete_expired_trash_as_admin(app: web.Application) -> list:
     settings = get_plugin_settings(app)
     retention = timedelta(days=settings.TRASH_RETENTION_DAYS)
     delete_until = arrow.now().datetime - retention
 
     deleted = []  # TODO: delete count of all items? ids? delete-stats?
     for product in products_service.list_products(app):
+
+        ctx = {
+            "delete_until": delete_until,
+            "retention": retention,
+            "product_name": product.name,
+        }
+
         with log_context(
             _logger,
             logging.DEBUG,
@@ -136,14 +143,26 @@ async def delete_expired_trash_as_admin(app: web.Application) -> list:
                     **create_troubleshotting_log_kwargs(
                         "Error batch deleting expired trashed folders as admin.",
                         error=exc,
-                        error_context={
-                            "delete_until": delete_until,
-                            "retention": retention,
-                            "product_name": product.name,
-                        },
+                        error_context=ctx,
                     )
                 )
 
-            # TODO: batch delete trashed projects here
+            try:
+
+                await projects_trash_service.batch_delete_trashed_projects_as_admin(
+                    app,
+                    trashed_before=delete_until,
+                    product_name=product.name,
+                    fail_fast=False,
+                )
+
+            except Exception as exc:  # pylint: disable=broad-exception-caught
+                _logger.warning(
+                    **create_troubleshotting_log_kwargs(
+                        "Error batch deleting expired projects as admin.",
+                        error=exc,
+                        error_context=ctx,
+                    )
+                )
 
     return deleted

services/web/server/src/simcore_service_webserver/trash/trash_service.py

@@ -1,4 +1,4 @@
-from ._service import delete_expired_trash_as_admin
+from ._service import safe_delete_expired_trash_as_admin
 
-__all__: tuple[str, ...] = ("delete_expired_trash_as_admin",)
+__all__: tuple[str, ...] = ("safe_delete_expired_trash_as_admin",)
 # nopycln: file

services/web/server/tests/unit/with_dbs/03/trash/test_trash_service.py

@@ -110,7 +110,7 @@ async def test_trash_service__delete_expired_trash(
     assert ProjectGet.model_validate(data).trashed_by == logged_user["primary_gid"]
 
     # UNDER TEST: Run delete_expired_trash
-    await trash_service.delete_expired_trash_as_admin(client.app)
+    await trash_service.safe_delete_expired_trash_as_admin(client.app)
 
     # ASSERT: logged_user tries to get the project and expects 404
     resp = await client.get(f"/v0/projects/{user_project_id}")
@@ -194,7 +194,7 @@ async def test_trash_nested_folders_and_projects(
         await assert_status(resp, status.HTTP_204_NO_CONTENT)
 
     # UNDER TEST
-    await trash_service.delete_expired_trash_as_admin(client.app)
+    await trash_service.safe_delete_expired_trash_as_admin(client.app)
 
     async with _client_session_with_user(client, logged_user):
         # Verify logged_user's resources are gone