extra project col

Author: pcrespov

packages/models-library/src/models_library/projects.py

@@ -190,6 +190,7 @@ class Project(BaseProjectModel):
         default=None,
         alias="trashedAt",
     )
+    trashed_explicitly: bool = Field(default=False, alias="trashedExplicitly")
 
     class Config:
         description = "Document that stores metadata, pipeline and UI setup of a study"

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

@@ -115,8 +115,8 @@ async def list_projects(  # pylint: disable=too-many-arguments
         # attrs
         filter_by_project_type=ProjectTypeAPI.to_project_type_db(project_type),
         filter_by_services=user_available_services,
-        trashed=trashed,
-        hidden=show_hidden,
+        filter_trashed=trashed,
+        filter_hidden=show_hidden,
         # composed attrs
         search=search,
         # pagination

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

@@ -120,7 +120,7 @@ async def _schedule():
         product_name=product_name,
         project_uuid=project_id,
         project_patch=ProjectPatchExtended(
-            trashed_at=arrow.utcnow().datetime, hidden=not explicit
+            trashed_at=arrow.utcnow().datetime, trashed_explicitly=not explicit
         ),
     )
 
@@ -138,5 +138,5 @@ async def untrash_project(
         user_id=user_id,
         product_name=product_name,
         project_uuid=project_id,
-        project_patch=ProjectPatchExtended(trashed_at=None, hidden=False),
+        project_patch=ProjectPatchExtended(trashed_at=None, trashed_explicitly=False),
     )

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

@@ -363,8 +363,8 @@ async def list_projects(  # pylint: disable=too-many-arguments
         filter_by_project_type: ProjectType | None = None,
         filter_by_services: list[dict] | None = None,
         published: bool | None = False,
-        hidden: bool | None = False,
-        trashed: bool | None = False,
+        filter_hidden: bool | None = False,
+        filter_trashed: bool | None = False,
         # pagination
         offset: int | None = 0,
         limit: int | None = None,
@@ -442,16 +442,21 @@ async def list_projects(  # pylint: disable=too-many-arguments
                     projects.c.type == filter_by_project_type.value
                 )
 
-            if hidden is not None:
-                attributes_filters.append(projects.c.hidden.is_(hidden))
+            if filter_hidden is not None:
+                attributes_filters.append(projects.c.hidden.is_(filter_hidden))
 
             if published is not None:
                 attributes_filters.append(projects.c.published.is_(published))
 
-            if trashed is not None:
+            if filter_trashed is not None:
                 attributes_filters.append(
-                    projects.c.trashed_at.is_not(None)
-                    if trashed
+                    # marked explicitly as trashed
+                    (
+                        projects.c.trashed_at.is_not(None)
+                        & projects.c.trashed_explicitly.is_(True)
+                    )
+                    if filter_trashed
+                    # not marked as trashed
                     else projects.c.trashed_at.is_(None)
                 )
             query = query.where(sa.and_(*attributes_filters))

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

@@ -53,6 +53,7 @@ class ProjectDB(BaseModel):
     hidden: bool
     workspace_id: WorkspaceID | None
     trashed_at: datetime | None
+    trashed_explicitly: bool = False
 
     class Config:
         orm_mode = True
@@ -101,8 +102,8 @@ class Config:
 
 class ProjectPatchExtended(ProjectPatch):
     # Only used internally
-    trashed_at: datetime | None = None
-    hidden: bool | None = None
+    trashed_at: datetime | None
+    trashed_explicitly: bool
 
     class Config:
         allow_population_by_field_name = True