fixes test and refactor query

Author: pcrespov

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

@@ -110,15 +110,15 @@ class ProjectGet(OutputSchema):
 
     @classmethod
     def from_domain_model(cls, project_data: dict[str, Any]) -> Self:
-        data = copy.copy(project_data)
+        trimmed_data = copy.copy(project_data)
         # project_data["trashed_by"] is a UserID
         # project_data["trashed_by_primary_gid"] is a GroupID
-        data.pop("trashed_by", None)
-        data.pop("trashedBy", None)
+        trimmed_data.pop("trashed_by", None)
+        trimmed_data.pop("trashedBy", None)
 
         return cls.model_validate(
             remap_keys(
-                project_data,
+                trimmed_data,
                 rename={
                     "trashed": "trashed_at",
                     "trashed_by_primary_gid": "trashed_by",

services/web/server/src/simcore_service_webserver/folders/_folders_repository.py

@@ -571,18 +571,20 @@ async def get_folders_recursively(
         return cast(list[FolderID], [row.folder_id async for row in result])
 
 
+def _select_trashed_by_primary_gid_query():
+    return sa.select(users.c.primary_gid.label("trashed_by_primary_gid")).select_from(
+        folders_v2.outerjoin(users, folders_v2.c.trashed_by == users.c.id),
+    )
+
+
 async def get_trashed_by_primary_gid(
     app: web.Application,
     connection: AsyncConnection | None = None,
     *,
     folder_id: FolderID,
 ) -> GroupID | None:
-    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(folders_v2.c.folder_id == folder_id)
+    query = _select_trashed_by_primary_gid_query().where(
+        folders_v2.c.folder_id == folder_id
     )
 
     async with pass_or_acquire_connection(get_asyncpg_engine(app), connection) as conn:
@@ -599,11 +601,9 @@ async def batch_get_trashed_by_primary_gid(
 ) -> list[GroupID | None]:
 
     query = (
-        sa.select(
-            users.c.primary_gid.label("trashed_by_primary_gid"),
+        _select_trashed_by_primary_gid_query().where(
+            folders_v2.c.folder_id.in_(folders_ids)
         )
-        .select_from(folders_v2.outerjoin(users, folders_v2.c.trashed_by == users.c.id))
-        .where(folders_v2.c.folder_id.in_(folders_ids))
     ).order_by(
         *[
             folders_v2.c.folder_id == _id for _id in folders_ids

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

@@ -50,18 +50,20 @@ async def patch_project(
         return ProjectDB.model_validate(row)
 
 
+def _select_trashed_by_primary_gid_query():
+    return sa.select(
+        users.c.primary_gid.label("trashed_by_primary_gid"),
+    ).select_from(projects.outerjoin(users, projects.c.trashed_by == users.c.id))
+
+
 async def get_trashed_by_primary_gid(
     app: web.Application,
     connection: AsyncConnection | None = None,
     *,
     projects_uuid: ProjectID,
 ) -> GroupID | None:
-    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)
+    query = _select_trashed_by_primary_gid_query().where(
+        projects.c.uuid == projects_uuid
     )
 
     async with pass_or_acquire_connection(get_asyncpg_engine(app), connection) as conn:
@@ -87,11 +89,9 @@ async def batch_get_trashed_by_primary_gid(
     projects_uuids_str = [f"{uuid}" for uuid in projects_uuids]
 
     query = (
-        sa.select(
-            users.c.primary_gid.label("trashed_by_primary_gid"),
+        _select_trashed_by_primary_gid_query().where(
+            projects.c.uuid.in_(projects_uuids_str)
         )
-        .select_from(projects.outerjoin(users, projects.c.trashed_by == users.c.id))
-        .where(projects.c.uuid.in_(projects_uuids_str))
     ).order_by(
         *[
             projects.c.uuid == uuid for uuid in projects_uuids_str