fixes

ITISFoundation · Oct 23, 2024 · de1da19 · de1da19
1 parent fb9ace6
commit de1da19
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 3 deletions.
diff --git a/packages/postgres-database/src/simcore_postgres_database/models/projects.py b/packages/postgres-database/src/simcore_postgres_database/models/projects.py
@@ -145,7 +145,7 @@ class ProjectType(enum.Enum):
         "trashed_at",
         sa.DateTime(timezone=True),
         nullable=True,
-        doc="If set, it determines the time in which this project was sent to the trashed.",
+        doc="If set, it determines the time in which this project was sent to the trash bin.",
     ),
     sa.Column(
         "workspace_id",

diff --git a/services/web/server/src/simcore_service_webserver/projects/_trash_handlers.py b/services/web/server/src/simcore_service_webserver/projects/_trash_handlers.py
@@ -53,7 +53,6 @@ async def trash_project(request: web.Request):
 @routes.post(f"/{VTAG}/projects/{{project_uuid}}:untrash", name="untrash_project")
 @login_required
 @permission_required("project.delete")
-@_handle_trash_exceptions
 async def untrash_project(request: web.Request):
     user_id = get_user_id(request)
     product_name = get_product_name(request)

diff --git a/services/web/server/src/simcore_service_webserver/projects/db.py b/services/web/server/src/simcore_service_webserver/projects/db.py
@@ -743,6 +743,7 @@ async def get_project(
         projects.c.published,
         projects.c.hidden,
         projects.c.workspace_id,
+        projects.c.trashed_at,
     ]
 
     async def get_project_db(self, project_uuid: ProjectID) -> ProjectDB:

diff --git a/services/web/server/tests/unit/with_dbs/03/test_trash.py b/services/web/server/tests/unit/with_dbs/03/test_trash.py
@@ -3,7 +3,7 @@
 # pylint: disable=too-many-arguments
 # pylint: disable=unused-argument
 # pylint: disable=unused-variable
-from typing import Callable
+from collections.abc import Callable
 from uuid import UUID
 
 import arrow