From de1da19f4160925b62259a90398ae5dc7a79ed84 Mon Sep 17 00:00:00 2001
From: Pedro Crespo-Valero <32402063+pcrespov@users.noreply.github.com>
Date: Wed, 23 Oct 2024 21:03:00 +0200
Subject: [PATCH] fixes

---
 .../src/simcore_postgres_database/models/projects.py            | 2 +-
 .../src/simcore_service_webserver/projects/_trash_handlers.py   | 1 -
 .../web/server/src/simcore_service_webserver/projects/db.py     | 1 +
 services/web/server/tests/unit/with_dbs/03/test_trash.py        | 2 +-
 4 files changed, 3 insertions(+), 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
index 055089489915..2e39b6869dac 100644
--- 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
index e42efbffc418..864c2c0ddf85 100644
--- 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
index 8403e68b18ec..9710723c371f 100644
--- 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
index 73a213531c74..d038f7584776 100644
--- 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