review @sanderegg

Author: matusdrobuliak66

packages/postgres-database/src/simcore_postgres_database/utils_projects.py

@@ -1,24 +1,33 @@
-import uuid
 from datetime import datetime, timezone
 
 import sqlalchemy as sa
+from models_library.errors_classes import OsparcErrorMixin
+from models_library.projects import ProjectID
 from pydantic import parse_obj_as
 from sqlalchemy.ext.asyncio import AsyncConnection
 
 from .models.projects import projects
 from .utils_repos import transaction_context
 
 
+class DBBaseProjectError(OsparcErrorMixin, Exception):
+    ...
+
+
+class DBProjectNotFoundError(DBBaseProjectError):
+    project_uuid: ProjectID
+
+
 class ProjectsRepo:
     def __init__(self, engine):
         self.engine = engine
 
     async def get_project_last_change_date(
         self,
-        project_uuid: uuid.UUID,
+        project_uuid: ProjectID,
         *,
         connection: AsyncConnection | None = None,
-    ) -> datetime | None:
+    ) -> datetime:
         async with transaction_context(self.engine, connection) as conn:
             get_stmt = sa.select(projects.c.last_change_date).where(
                 projects.c.uuid == f"{project_uuid}"
@@ -27,6 +36,6 @@ async def get_project_last_change_date(
             result = await conn.execute(get_stmt)
             row = result.first()
             if row is None:
-                return None
+                raise DBProjectNotFoundError(project_uuid=project_uuid)
             date = parse_obj_as(datetime, row[0])
             return date.replace(tzinfo=timezone.utc)

packages/postgres-database/tests/test_utils_projects.py

@@ -0,0 +1,68 @@
+# pylint: disable=redefined-outer-name
+# pylint: disable=unused-argument
+# pylint: disable=unused-variable
+# pylint: disable=too-many-arguments
+import uuid
+from collections.abc import Awaitable, Callable
+from datetime import datetime
+from typing import Any, AsyncIterator
+
+import pytest
+import sqlalchemy
+from aiopg.sa.connection import SAConnection
+from aiopg.sa.result import RowProxy
+from simcore_postgres_database.models.projects import projects
+from simcore_postgres_database.utils_projects import (
+    DBProjectNotFoundError,
+    ProjectsRepo,
+)
+from sqlalchemy.ext.asyncio import AsyncEngine
+
+
+async def _delete_project(connection: SAConnection, project_uuid: uuid.UUID) -> None:
+    result = await connection.execute(
+        sqlalchemy.delete(projects).where(projects.c.uuid == f"{project_uuid}")
+    )
+    assert result.rowcount == 1
+
+
+@pytest.fixture
+async def registered_user(
+    connection: SAConnection,
+    create_fake_user: Callable[..., Awaitable[RowProxy]],
+) -> RowProxy:
+    user = await create_fake_user(connection)
+    assert user
+    return user
+
+
+@pytest.fixture
+async def registered_project(
+    connection: SAConnection,
+    registered_user: RowProxy,
+    create_fake_project: Callable[..., Awaitable[RowProxy]],
+) -> AsyncIterator[dict[str, Any]]:
+    project = await create_fake_project(connection, registered_user)
+    assert project
+
+    yield dict(project)
+
+    await _delete_project(connection, project["uuid"])
+
+
+async def test_get_project_last_change_date(
+    asyncpg_engine: AsyncEngine,
+    registered_project: dict,
+):
+    # conn = connection
+    projects_repo = ProjectsRepo(asyncpg_engine)
+
+    project_last_change_date = await projects_repo.get_project_last_change_date(
+        project_uuid=registered_project["uuid"]
+    )
+    assert isinstance(project_last_change_date, datetime)
+
+    with pytest.raises(DBProjectNotFoundError):
+        await projects_repo.get_project_last_change_date(
+            project_uuid="976b031b-828e-4d88-836a-6c2fe4823c6b"  # <-- Non existing uuid in DB
+        )

services/efs-guardian/src/simcore_service_efs_guardian/services/background_tasks.py

@@ -9,7 +9,10 @@
     PROJECT_REDIS_LOCK_KEY,
     lock_project,
 )
-from simcore_postgres_database.utils_projects import ProjectsRepo
+from simcore_postgres_database.utils_projects import (
+    DBProjectNotFoundError,
+    ProjectsRepo,
+)
 
 from ..core.settings import ApplicationSettings
 from .efs_manager import EfsManager
@@ -33,12 +36,17 @@ async def removal_policy_task(app: FastAPI) -> None:
 
     projects_repo = ProjectsRepo(app.state.engine)
     for project_id in efs_project_ids:
-        _project_last_change_date = await projects_repo.get_project_last_change_date(
-            project_id
-        )
+        try:
+            _project_last_change_date = (
+                await projects_repo.get_project_last_change_date(project_id)
+            )
+        except DBProjectNotFoundError as exc:
+            _logger.warning(
+                "Project %s not found, this should not happen, please investigate (contact MD)",
+                exc.project_uuid,
+            )
         if (
-            _project_last_change_date is None
-            or _project_last_change_date
+            _project_last_change_date
             < base_start_timestamp
             - app_settings.EFS_REMOVAL_POLICY_TASK_AGE_LIMIT_TIMEDELTA
         ):