db and repo

Author: pcrespov

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

@@ -90,22 +90,16 @@ async def list_trashed_projects(
         return cast(int, total_count), folders
 
 
-async def patch_project(
+async def get_project(
     app: web.Application,
     connection: AsyncConnection | None = None,
     *,
     project_uuid: ProjectID,
-    new_partial_project_data: dict,
 ) -> ProjectDBGet:
-
-    async with transaction_context(get_asyncpg_engine(app), connection) as conn:
-        result = await conn.stream(
-            projects.update()
-            .values(last_change_date=sql.func.now(), **new_partial_project_data)
-            .where(projects.c.uuid == f"{project_uuid}")
-            .returning(*PROJECT_DB_COLS)
-        )
-        row = await result.first()
+    async with pass_or_acquire_connection(get_asyncpg_engine(app), connection) as conn:
+        query = sql.select(PROJECT_DB_COLS).where(projects.c.uuid == f"{project_uuid}")
+        result = await conn.execute(query)
+        row = result.one_or_none()
         if row is None:
             raise ProjectNotFoundError(project_uuid=project_uuid)
         return ProjectDBGet.model_validate(row)
@@ -170,3 +164,43 @@ async def batch_get_trashed_by_primary_gid(
         rows = {row.uuid: row.trashed_by_primary_gid async for row in result}
 
     return [rows.get(uuid) for uuid in projects_uuids_str]
+
+
+async def patch_project(
+    app: web.Application,
+    connection: AsyncConnection | None = None,
+    *,
+    project_uuid: ProjectID,
+    new_partial_project_data: dict,
+) -> None:
+
+    async with transaction_context(get_asyncpg_engine(app), connection) as conn:
+        result = await conn.stream(
+            projects.update()
+            .values(
+                **new_partial_project_data,
+                last_change_date=sql.func.now(),
+            )
+            .where(projects.c.uuid == f"{project_uuid}")
+        )
+        row = await result.one_or_none()
+        if row is None:
+            raise ProjectNotFoundError(project_uuid=project_uuid)
+
+
+async def delete_project(
+    app: web.Application,
+    connection: AsyncConnection | None = None,
+    *,
+    project_uuid: ProjectID,
+) -> ProjectDBGet:
+    async with transaction_context(get_asyncpg_engine(app), connection) as conn:
+        result = await conn.stream(
+            projects.delete()
+            .where(projects.c.uuid == f"{project_uuid}")
+            .returning(*PROJECT_DB_COLS)
+        )
+        row = await result.one_or_none()
+        if row is None:
+            raise ProjectNotFoundError(project_uuid=project_uuid)
+        return ProjectDBGet.model_validate(row)

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

@@ -0,0 +1,66 @@
+# NOTE: should replace _crud_api_delete.py:delete_project
+
+import logging
+from typing import Protocol
+
+from aiohttp import web
+from models_library.projects import ProjectID
+from servicelib.redis._errors import ProjectLockError
+from simcore_service_director_v2.core.errors import ProjectNotFoundError
+from simcore_service_webserver.projects.exceptions import ProjectDeleteError
+
+from . import _projects_db as _projects_repository
+
+_logger = logging.getLogger(__name__)
+
+
+class StopServicesCallback(Protocol):
+    async def __call__(self, app: web.Application, project_uuid: ProjectID) -> None:
+        ...
+
+
+async def delete_project_as_admin(
+    app: web.Application,
+    *,
+    project_uuid: ProjectID,
+    stop_project_services_as_admin: StopServicesCallback | None,
+):
+    hidden = False
+    stopped = not stop_project_services_as_admin
+    deleted = False
+
+    try:
+        # hide
+        await _projects_repository.patch_project(
+            app,
+            project_uuid=project_uuid,
+            new_partial_project_data={"hidden": True},
+        )
+        hidden = True
+
+        if stop_project_services_as_admin:
+            # NOTE: this callback could take long or raise whatever!
+            await stop_project_services_as_admin(app, project_uuid)
+            stopped = True
+
+        await _projects_repository.delete_project(app, project_uuid=project_uuid)
+        deleted = True
+
+    except ProjectNotFoundError as err:
+        _logger.debug(
+            "Project %s being deleted is already gone. IGNORING error. Details: %s",
+            project_uuid,
+            err,
+        )
+
+    except ProjectLockError as err:
+        raise ProjectDeleteError(
+            project_uuid=project_uuid,
+            reason=f"Cannot delete project {project_uuid} because it is currently in use. Details: {err}",
+        ) from err
+
+    except Exception as err:
+        raise ProjectDeleteError(
+            project_uuid=project_uuid,
+            reason=f"Unexpected error. Deletion sequence: {hidden=}, {stopped=}, {deleted=} ",
+        ) from err