fix tests

Author: pcrespov

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

@@ -1,6 +1,7 @@
 import logging
+from collections.abc import Callable
 from datetime import datetime
-from typing import Callable, cast
+from typing import cast
 
 import sqlalchemy as sa
 from aiohttp import web
@@ -28,7 +29,7 @@
 _logger = logging.getLogger(__name__)
 
 
-PROJECT_DB_COLS = get_columns_from_db_model(  # noqa: RUF012
+PROJECT_DB_COLS = get_columns_from_db_model(
     # NOTE: MD: I intentionally didn't include the workbench. There is a special interface
     # for the workbench, and at some point, this column should be removed from the table.
     # The same holds true for access_rights/ui/classifiers/quality, but we have decided to proceed step by step.

services/web/server/tests/unit/with_dbs/02/test_projects_repository.py

@@ -3,8 +3,10 @@
 # pylint: disable=unused-variable
 # pylint: disable=too-many-arguments
 
+from datetime import timedelta
 from uuid import UUID
 
+import arrow
 import pytest
 from aiohttp.test_utils import TestClient
 from common_library.users_enums import UserRole
@@ -13,7 +15,7 @@
     _projects_db as projects_service_repository,
 )
 from simcore_service_webserver.projects.exceptions import ProjectNotFoundError
-from simcore_service_webserver.projects.models import ProjectDict
+from simcore_service_webserver.projects.models import ProjectDBGet, ProjectDict
 
 
 @pytest.fixture
@@ -52,7 +54,7 @@ async def test_patch_project(
 ):
     assert client.app
 
-    # Thie will change after in patched_project
+    # This will change after in patched_project
     assert user_project["creationDate"] == user_project["lastChangeDate"]
 
     # Patch valid project
@@ -103,3 +105,60 @@ async def test_delete_project(
         await projects_service_repository.delete_project(
             client.app, project_uuid=non_existent_project_uuid
         )
+
+
+@pytest.fixture
+async def trashed_project(
+    client: TestClient,
+    logged_user: UserInfoDict,
+    user_project: ProjectDict,
+) -> ProjectDBGet:
+    assert client.app
+
+    # Patch project to be trashed
+    trashed_at = arrow.utcnow().datetime
+    patch_data = {
+        "trashed": trashed_at,
+        "trashed_by": logged_user["id"],
+        "trashed_explicitly": True,
+    }
+    return await projects_service_repository.patch_project(
+        client.app,
+        project_uuid=user_project["uuid"],
+        new_partial_project_data=patch_data,
+    )
+
+
+async def test_list_trashed_projects(client: TestClient, trashed_project: ProjectDBGet):
+    assert client.app
+
+    (
+        total_count,
+        trashed_projects,
+    ) = await projects_service_repository.list_trashed_projects(
+        client.app,
+        trashed_explicitly=True,
+        trashed_before=arrow.utcnow().datetime + timedelta(days=1),
+    )
+
+    assert total_count == 1
+    assert len(trashed_projects) == 1
+    assert trashed_projects[0] == trashed_project
+
+
+async def test_get_trashed_by_primary_gid(
+    client: TestClient,
+    logged_user: UserInfoDict,
+    trashed_project: ProjectDBGet,
+):
+    assert client.app
+
+    # Get trashed by primary gid
+    trashed_by_primary_gid = (
+        await projects_service_repository.get_trashed_by_primary_gid(
+            client.app,
+            projects_uuid=trashed_project.uuid,
+        )
+    )
+
+    assert trashed_by_primary_gid == logged_user["primary_gid"]