handlers return item

Author: pcrespov

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

@@ -16,7 +16,7 @@
 from simcore_postgres_database.models.projects import ProjectType
 from simcore_postgres_database.webserver_models import ProjectType as ProjectTypeDB
 from simcore_service_webserver.projects._projects_db import (
-    get_trashed_by_primary_gid_from_project,
+    batch_get_trashed_by_primary_gid,
 )
 
 from ..catalog.client import get_services_for_user_in_product
@@ -49,16 +49,18 @@ async def _update_project_dict(
     return project
 
 
-async def _update_list_of_project_dict(
+async def _batch_update_list_of_project_dict(
     app: web.Application, list_of_project_dict: list[ProjectDict]
 ) -> list[ProjectDict]:
 
     # updating `trashed_by_primary_gid`
-    updates_values = await get_trashed_by_primary_gid_from_project(
+    trashed_by_primary_gid_values = await batch_get_trashed_by_primary_gid(
         app, projects_uuids=[ProjectID(p["uuid"]) for p in list_of_project_dict]
     )
 
-    for project_dict, value in zip(list_of_project_dict, updates_values, strict=True):
+    for project_dict, value in zip(
+        list_of_project_dict, trashed_by_primary_gid_values, strict=True
+    ):
         project_dict.update(trashed_by_primary_gid=value)
 
     return list_of_project_dict
@@ -140,7 +142,7 @@ async def list_projects(  # pylint: disable=too-many-arguments
         order_by=order_by,
     )
 
-    db_projects = await _update_list_of_project_dict(app, db_projects)
+    db_projects = await _batch_update_list_of_project_dict(app, db_projects)
 
     projects: list[ProjectDict] = await logged_gather(
         *(
@@ -195,7 +197,7 @@ async def list_projects_full_depth(
         order_by=order_by,
     )
 
-    db_projects = await _update_list_of_project_dict(request.app, db_projects)
+    db_projects = await _batch_update_list_of_project_dict(request.app, db_projects)
 
     projects: list[ProjectDict] = await logged_gather(
         *(

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

@@ -302,6 +302,7 @@ async def get_active_project(request: web.Request) -> web.Response:
                 project_uuid=user_active_projects[0],
                 user_id=req_ctx.user_id,
                 include_state=True,
+                include_trashed_by_primary_gid=True,
             )
 
             # updates project's permalink field
@@ -342,6 +343,7 @@ async def get_project(request: web.Request):
             project_uuid=f"{path_params.project_id}",
             user_id=req_ctx.user_id,
             include_state=True,
+            include_trashed_by_primary_gid=True,
         )
         if not await project_uses_available_services(project, user_available_services):
             unavilable_services = get_project_unavailable_services(

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

@@ -50,14 +50,33 @@ async def patch_project(
         return ProjectDB.model_validate(row)
 
 
-async def get_trashed_by_primary_gid_from_project(
+async def get_trashed_by_primary_gid(
+    app: web.Application,
+    connection: AsyncConnection | None = None,
+    *,
+    projects_uuid: ProjectID,
+) -> GroupID | None:
+    async with pass_or_acquire_connection(get_asyncpg_engine(app), connection) as conn:
+        query = (
+            sa.select(
+                users.c.primary_gid.label("trashed_by_primary_gid"),
+            )
+            .select_from(projects.outerjoin(users, projects.c.trashed_by == users.c.id))
+            .where(projects.c.uuid == projects_uuid)
+        )
+        result = await conn.stream(query)
+        row = await result.first()
+        return row.trashed_by_primary_gid if row else None
+
+
+async def batch_get_trashed_by_primary_gid(
     app: web.Application,
     connection: AsyncConnection | None = None,
     *,
     projects_uuids: list[ProjectID],
 ) -> list[GroupID | None]:
     """
-    Returns trashed_by as GroupID instead of UserID as is in the database
+    Batch version of get_trashed_by_primary_gid preserving ORDER of projects_uuids
     """
     async with pass_or_acquire_connection(get_asyncpg_engine(app), connection) as conn:
         query = (

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

@@ -216,12 +216,13 @@ async def get_project_for_user(
             user_id, project, project_type is ProjectType.TEMPLATE, app
         )
 
+    # adds `trashed_by_primary_gid`
     if include_trashed_by_primary_gid and project.get("trashed_by") is not None:
-        _values = await _projects_db.get_trashed_by_primary_gid_from_project(
-            app, projects_uuids=[project["uuid"]]
+        project.update(
+            trashed_by_primary_gid=await _projects_db.get_trashed_by_primary_gid(
+                app, projects_uuid=project["uuid"]
+            )
         )
-        assert len(_values) == 1
-        project.update(trashed_by_primary_gid=_values[0])
 
     if project["workspaceId"] is not None:
         workspace: UserWorkspaceWithAccessRights = (