forgot

Author: pcrespov

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

@@ -50,14 +50,14 @@ async def empty_trash(request: web.Request):
     user_id = get_user_id(request)
     product_name = products_web.get_product_name(request)
 
-    is_fired = asyncio.Event()
+    explicitly_trashed_project_deleted = asyncio.Event()
 
     fire_and_forget_task(
         _service.safe_empty_trash(
             request.app,
             product_name=product_name,
             user_id=user_id,
-            notify_explicit_projects_deleted=is_fired,
+            on_explicitly_trashed_projects_deleted=explicitly_trashed_project_deleted,
         ),
         task_suffix_name="rest.empty_trash",
         fire_and_forget_tasks_collection=request.app[APP_FIRE_AND_FORGET_TASKS_KEY],
@@ -67,6 +67,6 @@ async def empty_trash(request: web.Request):
     # otherwise, when the front-end requests the trash item list,
     # it may still display items, misleading the user into
     # thinking the `empty trash` operation failed.
-    await is_fired.wait()
+    await explicitly_trashed_project_deleted.wait()
 
     return web.json_response(status=status.HTTP_204_NO_CONTENT)

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

@@ -105,14 +105,13 @@ async def safe_empty_trash(
     *,
     product_name: ProductName,
     user_id: UserID,
-    notify_explicit_projects_deleted: asyncio.Event | None = None
+    on_explicitly_trashed_projects_deleted: asyncio.Event | None = None
 ):
     await _empty_explicitly_trashed_projects(app, product_name, user_id)
+    if on_explicitly_trashed_projects_deleted:
+        on_explicitly_trashed_projects_deleted.set()
 
-    # Notify the caller if an event is provided
-    if notify_explicit_projects_deleted:
-        notify_explicit_projects_deleted.set()
-
+    # This can be heavy!
     await _empty_explicitly_trashed_folders_and_content(app, product_name, user_id)