fixing mapping

Author: pcrespov

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

@@ -6,8 +6,9 @@
 """
 
 from datetime import datetime
-from typing import Annotated, Any, Literal, TypeAlias
+from typing import Annotated, Any, Literal, Self, TypeAlias
 
+from common_library.dict_tools import remap_keys
 from models_library.folders import FolderID
 from models_library.utils._original_fastapi_encoders import jsonable_encoder
 from models_library.workspaces import WorkspaceID
@@ -35,6 +36,7 @@
 )
 from ..workspaces import WorkspaceID
 from ._base import EmptyModel, InputSchema, OutputSchema
+from .groups import GroupID
 from .permalinks import ProjectPermalink
 
 
@@ -95,14 +97,28 @@ class ProjectGet(OutputSchema):
     permalink: ProjectPermalink | None = None
     workspace_id: WorkspaceID | None
     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
     )
 
     model_config = ConfigDict(frozen=False)
 
+    @classmethod
+    def from_model(cls, project: dict[str, Any]) -> Self:
+        return cls.model_validate(
+            remap_keys(
+                project,
+                rename={"trashed": "trashed_at"},
+            )
+        )
+
 
 TaskProjectGet: TypeAlias = TaskGet
 

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

@@ -20,6 +20,7 @@
 from .projects_nodes_io import NodeIDStr
 from .projects_state import ProjectState
 from .projects_ui import StudyUI
+from .users import UserID
 from .utils.common_validators import (
     empty_str_to_none_pre_validator,
     none_to_empty_str_pre_validator,
@@ -182,10 +183,10 @@ class Project(BaseProjectModel):
         alias="folderId",
     )
 
-    trashed_at: datetime | None = Field(
-        default=None,
-        alias="trashedAt",
-    )
-    trashed_explicitly: bool = Field(default=False, alias="trashedExplicitly")
+    trashed: datetime | None = None
+    trashed_by: Annotated[UserID | None, Field(alias="trashedBy")] = None
+    trashed_explicitly: Annotated[bool, Field(alias="trashedExplicitly")] = False
 
-    model_config = ConfigDict(title="osparc-simcore project", extra="forbid")
+    model_config = ConfigDict(
+        extra="forbid",
+    )

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

@@ -423,7 +423,7 @@ async def create_project(  # pylint: disable=too-many-arguments,too-many-branche
             }
 
         # Ensures is like ProjectGet
-        data = ProjectGet.model_validate(new_project).data(exclude_unset=True)
+        data = ProjectGet.from_model(new_project).data(exclude_unset=True)
 
         raise web.HTTPCreated(
             text=json_dumps({"data": data}),

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

@@ -82,20 +82,20 @@ def convert_to_schema_names(
 ) -> dict:
     # SEE https://github.com/ITISFoundation/osparc-simcore/issues/3516
     converted_args = {}
-    for key, value in project_database_data.items():
-        if key in DB_EXCLUSIVE_COLUMNS:
+    for col_name, col_value in project_database_data.items():
+        if col_name in DB_EXCLUSIVE_COLUMNS:
             continue
-        converted_value = value
-        if isinstance(value, datetime) and key not in {"trashed"}:
-            converted_value = format_datetime(value)
-        elif key == "prj_owner":
+        converted_value = col_value
+        if isinstance(col_value, datetime) and col_name not in {"trashed"}:
+            converted_value = format_datetime(col_value)
+        elif col_name == "prj_owner":
             # this entry has to be converted to the owner e-mail address
             converted_value = user_email
 
-        if key in SCHEMA_NON_NULL_KEYS and value is None:
+        if col_name in SCHEMA_NON_NULL_KEYS and col_value is None:
             converted_value = ""
 
-        converted_args[snake_to_camel(key)] = converted_value
+        converted_args[snake_to_camel(col_name)] = converted_value
     converted_args.update(**kwargs)
     return converted_args
 
@@ -275,7 +275,26 @@ async def _get_project(
 
         query = (
             sa.select(
-                *[col for col in projects.columns if col.name not in ["access_rights"]],
+                projects.c.id,
+                projects.c.type,
+                projects.c.uuid,
+                projects.c.name,
+                projects.c.description,
+                projects.c.thumbnail,
+                projects.c.prj_owner,  # == user.id (who created)
+                projects.c.creation_date,
+                projects.c.last_change_date,
+                projects.c.workbench,
+                projects.c.ui,
+                projects.c.classifiers,
+                projects.c.dev,
+                projects.c.quality,
+                projects.c.published,
+                projects.c.hidden,
+                projects.c.trashed,
+                projects.c.trashed_by,  # == user.id (who trashed)
+                projects.c.trashed_explicitly,
+                projects.c.workspace_id,
                 access_rights_subquery.c.access_rights,
             )
             .select_from(projects.join(access_rights_subquery, isouter=True))

services/web/server/tests/unit/with_dbs/03/test_project_db.py

@@ -97,7 +97,8 @@ def _assert_added_project(
         "creationDate",
         "lastChangeDate",
         "accessRights",  # NOTE: access rights were moved away from the projects table
-        "trashedAt",
+        "trashed",
+        "trashedBy",
         "trashedExplicitly",
     ]
     assert {k: v for k, v in expected_prj.items() if k in _DIFFERENT_KEYS} != {
@@ -184,6 +185,7 @@ async def insert_project_in_db(
     client: TestClient,
 ) -> AsyncIterator[Callable[..., Awaitable[dict[str, Any]]]]:
     inserted_projects = []
+    assert client.app
 
     async def _inserter(prj: dict[str, Any], **overrides) -> dict[str, Any]:
         # add project without user id -> by default creates a template