fixes tests

Author: pcrespov

packages/models-library/tests/test_api_schemas_webserver_projects.py

@@ -30,7 +30,7 @@
 
 @pytest.mark.parametrize(
     "api_call",
-    (NEW_PROJECT, CREATE_FROM_SERVICE, CREATE_FROM_TEMPLATE),
+    [NEW_PROJECT, CREATE_FROM_SERVICE, CREATE_FROM_TEMPLATE],
     ids=lambda c: c.name,
 )
 def test_create_project_schemas(api_call: HttpApiCallCapture):
@@ -45,7 +45,7 @@ def test_create_project_schemas(api_call: HttpApiCallCapture):
 
 @pytest.mark.parametrize(
     "api_call",
-    (LIST_PROJECTS,),
+    [LIST_PROJECTS],
     ids=lambda c: c.name,
 )
 def test_list_project_schemas(api_call: HttpApiCallCapture):
@@ -59,7 +59,7 @@ def test_list_project_schemas(api_call: HttpApiCallCapture):
 
 @pytest.mark.parametrize(
     "api_call",
-    (GET_PROJECT, CREATE_FROM_TEMPLATE__TASK_RESULT),
+    [GET_PROJECT, CREATE_FROM_TEMPLATE__TASK_RESULT],
     ids=lambda c: c.name,
 )
 def test_get_project_schemas(api_call: HttpApiCallCapture):
@@ -74,7 +74,7 @@ def test_get_project_schemas(api_call: HttpApiCallCapture):
 
 @pytest.mark.parametrize(
     "api_call",
-    (REPLACE_PROJECT, REPLACE_PROJECT_ON_MODIFIED),
+    [REPLACE_PROJECT, REPLACE_PROJECT_ON_MODIFIED],
     ids=lambda c: c.name,
 )
 def test_replace_project_schemas(api_call: HttpApiCallCapture):

packages/pytest-simcore/src/pytest_simcore/simcore_webserver_projects_rest_api.py

@@ -76,7 +76,8 @@ def request_desc(self) -> str:
             "dev": None,
             "workspace_id": None,
             "folder_id": None,
-            "trashed_at": None,
+            "trashedAt": None,
+            "trashed_by": None,
         },
         "error": None,
     },
@@ -102,7 +103,6 @@ def request_desc(self) -> str:
             "workbench": {},
             "workspaceId": 123,
             "folderId": 2,
-            "trashedAt": "2021-12-06T10:13:18.100Z",
             "accessRights": {"2": {"read": True, "write": True, "delete": True}},
             "dev": {},
             "classifiers": [],
@@ -115,7 +115,8 @@ def request_desc(self) -> str:
             },
             "workspace_id": None,
             "folder_id": None,
-            "trashed_at": None,
+            "trashedAt": "2021-12-06T10:13:18.100Z",
+            "trashedBy": 3,
         }
     },
 )
@@ -157,7 +158,8 @@ def request_desc(self) -> str:
             },
             "workspace_id": None,
             "folder_id": None,
-            "trashed_at": None,
+            "trashedAt": None,
+            "trashed_by": None,
         }
     },
 )
@@ -287,7 +289,8 @@ def request_desc(self) -> str:
             },
             "workspace_id": None,
             "folder_id": None,
-            "trashed_at": None,
+            "trashedAt": None,
+            "trashed_by": None,
         }
     },
 )
@@ -480,7 +483,8 @@ def request_desc(self) -> str:
             "dev": {},
             "workspace_id": None,
             "folder_id": None,
-            "trashed_at": None,
+            "trashedAt": None,
+            "trashed_by": None,
             "classifiers": [],
             "ui": {
                 "mode": "workbench",
@@ -681,7 +685,8 @@ def request_desc(self) -> str:
                 "dev": {},
                 "workspace_id": None,
                 "folder_id": None,
-                "trashed_at": None,
+                "trashedAt": None,
+                "trashed_by": None,
                 "quality": {
                     "enabled": True,
                     "tsr_target": {
@@ -931,7 +936,8 @@ def request_desc(self) -> str:
             "dev": {},
             "workspace_id": None,
             "folder_id": None,
-            "trashed_at": None,
+            "trashedAt": None,
+            "trashedBy": None,
             "quality": {
                 "enabled": True,
                 "tsr_target": {

services/api-server/tests/mocks/get_job_outputs.json

@@ -147,6 +147,7 @@
         "workspaceId": 5,
         "folderId": 2,
         "trashedAt": null,
+        "trashedBy": null,
         "workbench": {
           "dd875b4f-7663-529f-bd7f-3716b19e28af": {
             "key": "simcore/services/comp/itis/sleeper",

services/web/server/src/simcore_service_webserver/workspaces/_workspaces_repository.py

@@ -82,7 +82,7 @@ async def create_workspace(
         return Workspace.model_validate(row)
 
 
-def _create_base_query(caller_user_id: UserID, product_name: ProductName):
+def _create_base_select_query(caller_user_id: UserID, product_name: ProductName):
     # any other access
     access_rights_subquery = (
         select(
@@ -138,29 +138,34 @@ async def list_workspaces_for_user(
     limit: NonNegativeInt,
     order_by: OrderBy,
 ) -> tuple[int, list[UserWorkspaceWithAccessRights]]:
-    base_query = _create_base_query(caller_user_id=user_id, product_name=product_name)
+    base_select_query = _create_base_select_query(
+        caller_user_id=user_id, product_name=product_name
+    )
 
     if filter_trashed is not None:
-        base_query = base_query.where(
+        base_select_query = base_select_query.where(
             workspaces.c.trashed.is_not(None)
             if filter_trashed
             else workspaces.c.trashed.is_(None)
         )
     if filter_by_text is not None:
-        base_query = base_query.where(
+        base_select_query = base_select_query.where(
             (workspaces.c.name.ilike(f"%{filter_by_text}%"))
             | (workspaces.c.description.ilike(f"%{filter_by_text}%"))
         )
 
     # Select total count from base_query
-    subquery = base_query.subquery()
-    count_query = select(func.count()).select_from(subquery)
+    count_query = select(func.count()).select_from(base_select_query.subquery())
 
     # Ordering and pagination
     if order_by.direction == OrderDirection.ASC:
-        list_query = base_query.order_by(asc(getattr(workspaces.c, order_by.field)))
+        list_query = base_select_query.order_by(
+            asc(getattr(workspaces.c, order_by.field))
+        )
     else:
-        list_query = base_query.order_by(desc(getattr(workspaces.c, order_by.field)))
+        list_query = base_select_query.order_by(
+            desc(getattr(workspaces.c, order_by.field))
+        )
     list_query = list_query.offset(offset).limit(limit)
 
     async with pass_or_acquire_connection(get_asyncpg_engine(app), connection) as conn:
@@ -182,10 +187,12 @@ async def get_workspace_for_user(
     workspace_id: WorkspaceID,
     product_name: ProductName,
 ) -> UserWorkspaceWithAccessRights:
-    base_query = _create_base_query(caller_user_id=user_id, product_name=product_name)
+    select_query = _create_base_select_query(
+        caller_user_id=user_id, product_name=product_name
+    )
 
     async with pass_or_acquire_connection(get_asyncpg_engine(app), connection) as conn:
-        result = await conn.stream(base_query)
+        result = await conn.stream(select_query)
         row = await result.first()
         if row is None:
             raise WorkspaceAccessForbiddenError(

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

@@ -513,12 +513,12 @@ async def workspace(
     # CREATE a workspace
     resp = await client.post("/v0/workspaces", json={"name": "My first workspace"})
     data, _ = await assert_status(resp, status.HTTP_201_CREATED)
-    workspace = WorkspaceGet.model_validate(data)
+    wks = WorkspaceGet.model_validate(data)
 
-    yield workspace
+    yield wks
 
     # DELETE a workspace
-    resp = await client.delete(f"/v0/workspaces/{workspace.workspace_id}")
+    resp = await client.delete(f"/v0/workspaces/{wks.workspace_id}")
     data, _ = await assert_status(resp, status.HTTP_204_NO_CONTENT)