drafts project trash deletiong

Author: pcrespov

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

@@ -1,20 +1,27 @@
 import asyncio
+import datetime
 import logging
 
 import arrow
 from aiohttp import web
+from models_library.basic_types import IDStr
 from models_library.products import ProductName
 from models_library.projects import ProjectID
+from models_library.rest_ordering import OrderBy, OrderDirection
 from models_library.users import UserID
 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 ..director_v2 import api as director_v2_api
 from ..dynamic_scheduler import api as dynamic_scheduler_api
-from . import projects_service
+from . import _crud_api_read, projects_service
 from ._access_rights_api import check_user_project_permission
-from .exceptions import ProjectRunningConflictError
+from .exceptions import (
+    ProjectNotFoundError,
+    ProjectNotTrashedError,
+    ProjectRunningConflictError,
+)
 from .models import ProjectPatchInternalExtended
 
 _logger = logging.getLogger(__name__)
@@ -45,7 +52,7 @@ async def trash_project(
     project_id: ProjectID,
     force_stop_first: bool,
     explicit: bool,
-):
+) -> None:
     """
 
     Raises:
@@ -108,7 +115,7 @@ async def untrash_project(
     product_name: ProductName,
     user_id: UserID,
     project_id: ProjectID,
-):
+) -> None:
     # NOTE: check_user_project_permission is inside projects_api.patch_project
     await projects_service.patch_project(
         app,
@@ -119,3 +126,90 @@ async def untrash_project(
             trashed_at=None, trashed_explicitly=False, trashed_by=None
         ),
     )
+
+
+async def list_trashed_projects(
+    app: web.Application,
+    *,
+    product_name: ProductName,
+    user_id: UserID,
+    until_equal_datetime: datetime.datetime | None = None,
+) -> list[ProjectID]:
+    """
+    Lists all projects that were trashed until a specific datetime.
+    """
+    projects, _ = await _crud_api_read.list_projects_full_depth(
+        request=app,
+        user_id=user_id,
+        product_name=product_name,
+        trashed=True,
+        tag_ids_list=[],
+        offset=0,
+        limit=100,  # FIXME: this is only the first 100. redo with yield
+        order_by=OrderBy(field=IDStr("trashed"), direction=OrderDirection.ASC),
+        search_by_multi_columns=None,
+        search_by_project_name=None,
+    )
+
+    # NOTE; this can be done at the database level when projects_repo is refactored
+    # by defining a custom trash_filter that permits some flexibility in the filtering options
+    trashed_projects = []
+    for project in projects:
+        trashed_at = project.get("trashed_at")
+        trashed_by = project.get("trashed_by")
+        trashed_explicitly = project.get("trashed_explicitly")
+
+        if (
+            trashed_at
+            and (until_equal_datetime is None or trashed_at < until_equal_datetime)
+            and trashed_by == user_id
+            and trashed_explicitly
+        ):
+            trashed_projects.append(project)
+
+    return [project["uuid"] for project in trashed_projects]
+
+
+async def delete_trashed_project(
+    app: web.Application,
+    *,
+    user_id: UserID,
+    project_id: ProjectID,
+    until_equal_datetime: datetime.datetime | None = None,
+) -> None:
+    """
+    Deletes a project that was explicitly trashed by the user from a specific datetime (if provided, otherwise all).
+
+    Raises:
+        ProjectNotFoundError: If the project is not found.
+        ProjectNotTrashedError: If the project was not trashed explicitly by the user from the specified datetime.
+    """
+    project = await projects_service.get_project_for_user(
+        app, project_uuid=f"{project_id}", user_id=user_id
+    )
+
+    if not project:
+        raise ProjectNotFoundError(project_uuid=project_id, user_id=user_id)
+
+    trashed_at = project.get("trashed_at")
+    trashed_by = project.get("trashed_by")
+    trashed_explicitly = project.get("trashed_explicitly")
+
+    if (
+        not trashed_at
+        or (until_equal_datetime is not None and until_equal_datetime < trashed_at)
+        or trashed_by != user_id
+        or not trashed_explicitly
+    ):
+        raise ProjectNotTrashedError(
+            project_uuid=project_id,
+            user_id=user_id,
+            reason="Project was not trashed explicitly by the user from the specified datetime",
+        )
+    # FIXME: locking while deleting?
+    # FIXME: this can be heavy. Rather call delete_trashed_project as a task
+    await projects_service.delete_project_by_user(
+        app,
+        user_id=user_id,
+        project_uuid=project_id,
+    )

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

@@ -93,6 +93,12 @@ class ProjectRunningConflictError(ProjectTrashError):
     )
 
 
+class ProjectNotTrashedError(ProjectTrashError):
+    msg_template = (
+        "Cannot delete project {project_uuid} since it was not trashed first: {reason}"
+    )
+
+
 class NodeNotFoundError(BaseProjectError):
     msg_template = "Node '{node_uuid}' not found in project '{project_uuid}'"
 

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

@@ -6,6 +6,7 @@
 from models_library.products import ProductName
 from models_library.users import UserID
 
+from ..projects import _trash_service
 from .settings import get_plugin_settings
 
 _logger = logging.getLogger(__name__)
@@ -19,7 +20,16 @@ async def empty_trash(app: web.Application, product_name: ProductName, user_id:
         f"{user_id=}",
         f"{product_name=}",
     )
-    raise NotImplementedError
+
+    trashed_projects_ids = await _trash_service.list_trashed_projects(
+        app=app, product_name=product_name, user_id=user_id
+    )
+
+    for project_id in trashed_projects_ids:
+        # TODO: handle error. should not be fail-fast!
+        await _trash_service.delete_trashed_project(
+            app, user_id=user_id, project_id=project_id
+        )
 
 
 async def prune_trash(app: web.Application) -> list[str]:

services/web/server/tests/unit/with_dbs/03/test_trash.py

@@ -841,3 +841,7 @@ async def test_trash_project_explitictly_and_empty_trash_bin(
             await assert_status(resp, status.HTTP_200_OK)
             page = Page[ProjectListItem].model_validate(await resp.json())
             assert page.meta.total == 0
+
+    # GET trahsed project
+    resp = await client.get(f"/v0/projects/{project_uuid}")
+    await assert_status(resp, status.HTTP_404_NOT_FOUND)