fixing tests

Author: pcrespov

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

@@ -36,7 +36,6 @@
 )
 from ..workspaces import WorkspaceID
 from ._base import EmptyModel, InputSchema, OutputSchema
-from .groups import GroupID
 from .permalinks import ProjectPermalink
 
 
@@ -99,10 +98,6 @@ class ProjectGet(OutputSchema):
     folder_id: FolderID | None
 
     trashed_at: datetime | None
-    trashed_by: Annotated[
-        GroupID | None,
-        Field(description="Primary group ID of the user who trashed this item"),
-    ]
 
     _empty_description = field_validator("description", mode="before")(
         none_to_empty_str_pre_validator

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

@@ -6,7 +6,6 @@
 """
 
 from aiohttp import web
-from models_library.api_schemas_webserver._base import OutputSchema
 from models_library.api_schemas_webserver.projects import ProjectListItem
 from models_library.folders import FolderID, FolderQuery, FolderScope
 from models_library.projects import ProjectID
@@ -27,13 +26,12 @@
 from .models import ProjectDict, ProjectTypeAPI
 
 
-async def _append_fields(
+async def _append_item(
     request: web.Request,
     *,
     user_id: UserID,
     project: ProjectDict,
     is_template: bool,
-    model_schema_cls: type[OutputSchema],
 ):
     # state
     await projects_api.add_project_states_for_user(
@@ -47,7 +45,7 @@ async def _append_fields(
     await update_or_pop_permalink_in_project(request, project)
 
     # validate
-    return model_schema_cls.model_validate(project).data(exclude_unset=True)
+    return ProjectListItem.from_model(project).data(exclude_unset=True)
 
 
 async def list_projects(  # pylint: disable=too-many-arguments
@@ -128,12 +126,11 @@ async def list_projects(  # pylint: disable=too-many-arguments
 
     projects: list[ProjectDict] = await logged_gather(
         *(
-            _append_fields(
+            _append_item(
                 request,
                 user_id=user_id,
                 project=prj,
                 is_template=prj_type == ProjectTypeDB.TEMPLATE,
-                model_schema_cls=ProjectListItem,
             )
             for prj, prj_type in zip(db_projects, db_project_types, strict=False)
         ),
@@ -182,12 +179,11 @@ async def list_projects_full_depth(
 
     projects: list[ProjectDict] = await logged_gather(
         *(
-            _append_fields(
+            _append_item(
                 request,
                 user_id=user_id,
                 project=prj,
                 is_template=prj_type == ProjectTypeDB.TEMPLATE,
-                model_schema_cls=ProjectListItem,
             )
             for prj, prj_type in zip(db_projects, db_project_types, strict=False)
         ),

services/web/server/tests/conftest.py

@@ -18,6 +18,7 @@
 from aiohttp.test_utils import TestClient
 from common_library.json_serialization import json_dumps
 from faker import Faker
+from models_library.api_schemas_webserver.projects import ProjectGet
 from models_library.projects import ProjectID
 from models_library.projects_nodes_io import NodeID
 from models_library.projects_state import ProjectState
@@ -216,7 +217,7 @@ async def _setup(
         project_data: ProjectDict = {}
         expected_data: ProjectDict = {
             "classifiers": [],
-            "accessRights": [],
+            "accessRights": {},
             "tags": [],
             "lastChangeDate": None,
             "creationDate": None,
@@ -235,12 +236,16 @@ async def _setup(
             "trashedAt": None,
         }
         if from_study:
-            # access rights are replaced
-            expected_data = deepcopy(from_study)
-            expected_data["accessRights"] = {}
+            from_study_wo_access_rights = deepcopy(from_study)
+            from_study_wo_access_rights.pop("accessRights")
+            expected_data = {**expected_data, **from_study_wo_access_rights}
             if not as_template:
                 expected_data["name"] = f"{from_study['name']} (Copy)"
 
+            expected_data = ProjectGet.from_model(expected_data).model_dump(
+                mode="json", by_alias=True
+            )
+
         if not from_study or project:
             assert NEW_PROJECT.request_payload
             project_data = deepcopy(NEW_PROJECT.request_payload)