updates fakes in api-server

pcrespov · pcrespov · commit 856146d58a28 · 2025-01-17T13:21:37.000+01:00
diff --git a/packages/models-library/src/models_library/api_schemas_webserver/workspaces.py b/packages/models-library/src/models_library/api_schemas_webserver/workspaces.py
@@ -1,12 +1,11 @@
 from datetime import datetime
-from typing import Self
+from typing import Annotated, Self
 
-from pydantic import ConfigDict
+from pydantic import ConfigDict, Field
 
 from ..access_rights import AccessRights
 from ..basic_types import IDStr
 from ..groups import GroupID
-from ..users import UserID
 from ..workspaces import UserWorkspaceWithAccessRights, WorkspaceID
 from ._base import InputSchema, OutputSchema
 
@@ -19,7 +18,9 @@ class WorkspaceGet(OutputSchema):
     created_at: datetime
     modified_at: datetime
     trashed_at: datetime | None
-    trashed_by: UserID | None
+    trashed_by: Annotated[
+        GroupID | None, Field(description="The primary gid of the user who trashed")
+    ]
     my_access_rights: AccessRights
     access_rights: dict[GroupID, AccessRights]
 
@@ -33,7 +34,7 @@ def from_domain_model(cls, wks: UserWorkspaceWithAccessRights) -> Self:
             created_at=wks.created,
             modified_at=wks.modified,
             trashed_at=wks.trashed,
-            trashed_by=wks.trashed_by if wks.trashed else None,
+            trashed_by=wks.trashed_by_primary_gid if wks.trashed else None,
             my_access_rights=wks.my_access_rights,
             access_rights=wks.access_rights,
         )
diff --git a/services/api-server/tests/mocks/create_study_job.json b/services/api-server/tests/mocks/create_study_job.json
@@ -85,6 +85,7 @@
     "workspaceId": 23,
     "folderId": 4,
     "trashedAt": "2024-05-14T09:55:20.099Z",
+    "trashedBy": 2,
     "accessRights": {
      "3": {
       "read": true,
diff --git a/services/api-server/tests/mocks/for_test_api_routes_studies.json b/services/api-server/tests/mocks/for_test_api_routes_studies.json
@@ -92,6 +92,7 @@
      "workspaceId": 278,
      "folderId": 123,
      "trashedAt": "2023-07-20T20:02:55.535Z",
+     "trashedBy": 2,
      "workbench": {
       "deea006c-a223-4103-b46e-7b677428de9f": {
        "key": "simcore/services/frontend/file-picker",
@@ -314,6 +315,7 @@
     "workspaceId": 278,
     "folderId": 123,
     "trashedAt": "2023-07-20T20:04:10.607Z",
+    "trashedBy": 2,
     "workbench": {
      "deea006c-a223-4103-b46e-7b677428de9f": {
       "key": "simcore/services/frontend/file-picker",
diff --git a/services/api-server/tests/mocks/get_job_pricing_unit_invalid_solver.json b/services/api-server/tests/mocks/get_job_pricing_unit_invalid_solver.json
@@ -39,6 +39,7 @@
     "workspaceId": 3,
     "folderId": 31,
     "trashedAt": null,
+    "trashedBy": null,
     "workbench": {
      "4b03863d-107a-5c77-a3ca-c5ba1d7048c0": {
       "key": "simcore/services/comp/isolve",
diff --git a/services/api-server/tests/mocks/get_job_pricing_unit_success.json b/services/api-server/tests/mocks/get_job_pricing_unit_success.json
@@ -39,6 +39,7 @@
     "workspaceId": 3,
     "folderId": 1,
     "trashedAt": null,
+    "trashedBy": null,
     "workbench": {
      "4b03863d-107a-5c77-a3ca-c5ba1d7048c0": {
       "key": "simcore/services/comp/isolve",
diff --git a/services/api-server/tests/mocks/get_solver_outputs.json b/services/api-server/tests/mocks/get_solver_outputs.json
@@ -39,6 +39,7 @@
     "workspaceId": 2,
     "folderId": 2,
     "trashedAt": null,
+    "trashedBy": null,
     "workbench": {
      "df42d273-b6f0-509c-bfb5-4abbc5bb0581": {
       "key": "simcore/services/comp/itis/sleeper",
diff --git a/services/api-server/tests/mocks/on_list_jobs.json b/services/api-server/tests/mocks/on_list_jobs.json
@@ -104,6 +104,7 @@
      "workspaceId": 7,
      "folderId": 1,
      "trashedAt": "2023-06-22T18:42:36.506Z",
+     "trashedBy": 2,
      "workbench": {
       "05c7ed3b-0be1-5077-8065-fb55f5e59ff3": {
        "key": "simcore/services/comp/itis/sleeper",
@@ -177,6 +178,7 @@
      "workspaceId": 4,
      "folderId": 8,
      "trashedAt": "2023-06-22T18:42:33.201Z",
+     "trashedBy": 2,
      "workbench": {
       "34805d7e-c2d0-561f-831f-c74a28fc9bd1": {
        "key": "simcore/services/comp/itis/sleeper",
diff --git a/services/api-server/tests/mocks/run_study_workflow.json b/services/api-server/tests/mocks/run_study_workflow.json
@@ -304,6 +304,7 @@
         "workspaceId": 3,
         "folderId": 3,
         "trashedAt": null,
+        "trashedBy": null,
         "workbench": {
           "ab014072-a95f-5775-bb34-5582a13245a6": {
             "key": "simcore/services/frontend/iterator-consumer/probe/file",
diff --git a/services/api-server/tests/mocks/start_job_not_enough_credit.json b/services/api-server/tests/mocks/start_job_not_enough_credit.json
@@ -39,6 +39,7 @@
         "workspaceId": 3,
         "folderId": 2,
         "trashedAt": null,
+        "trashedBy": null,
         "workbench": {
           "3b0b20e0-c860-51d9-9f82-d6b4bc5c2f24": {
             "key": "simcore/services/comp/itis/sleeper",
diff --git a/services/api-server/tests/mocks/start_job_with_payment.json b/services/api-server/tests/mocks/start_job_with_payment.json
@@ -39,6 +39,7 @@
         "workspaceId": 12,
         "folderId": 2,
         "trashedAt": null,
+        "trashedBy": null,
         "workbench": {
           "657b124c-0697-5166-b820-a2ea2704ae84": {
             "key": "simcore/services/comp/itis/sleeper",
diff --git a/services/api-server/tests/mocks/test_get_and_update_study_job_metadata.json b/services/api-server/tests/mocks/test_get_and_update_study_job_metadata.json
@@ -211,6 +211,7 @@
     "workspaceId": 3,
     "folderId": 12,
     "trashedAt": "2024-05-30T10:30:54.137359",
+    "trashedBy": 2,
     "workbench": {
      "45043872-d6d3-530b-bf40-67bfde79191c": {
       "key": "simcore/services/dynamic/jupyter-math",
diff --git a/services/web/server/src/simcore_service_webserver/workspaces/_workspaces_repository.py b/services/web/server/src/simcore_service_webserver/workspaces/_workspaces_repository.py
@@ -53,13 +53,6 @@
     workspaces.c.trashed_by,
 )
 
-assert set(Workspace.model_fields).issubset(
-    {c.name for c in _WORKSPACE_SELECTION_COLS}  # nosec
-), "part of the data-model is one-to-one to the domain model"
-assert set(WorkspaceUpdates.model_fields).issubset(  # nosec
-    c.name for c in workspaces.columns
-), "part of the data-model is one-to-one to the domain model"
-
 
 async def create_workspace(
     app: web.Application,
diff --git a/services/web/server/tests/unit/with_dbs/03/test_trash.py b/services/web/server/tests/unit/with_dbs/03/test_trash.py
@@ -553,7 +553,7 @@ async def test_trash_empty_workspace(
     _exclude_attrs = {"trashed_by", "trashed_at", "modified_at"}
 
     # TRASH
-    before_trash = arrow.utcnow().datetime
+    trashing_at = arrow.utcnow().datetime
     resp = await client.post(f"/v0/workspaces/{workspace.workspace_id}:trash")
     await assert_status(resp, status.HTTP_204_NO_CONTENT)
 
@@ -574,8 +574,8 @@ async def test_trash_empty_workspace(
         exclude=_exclude_attrs
     )
     assert page.data[0].trashed_at is not None
-    assert before_trash < page.data[0].trashed_at
-    assert page.data[0].trashed_by == logged_user["id"]
+    assert trashing_at < page.data[0].trashed_at
+    assert page.data[0].trashed_by == logged_user["primary_gid"]
 
     # --------
 
