Skip to content

Commit 8f0a626

Browse files
committed
@bisgaard-itis review: camelcase or not
1 parent 347d565 commit 8f0a626

File tree

2 files changed

+8
-5
lines changed

2 files changed

+8
-5
lines changed

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ def request_desc(self) -> str:
7777
"workspace_id": None,
7878
"folder_id": None,
7979
"trashedAt": None,
80-
"trashed_by": None,
80+
"trashedBy": None,
8181
},
8282
"error": None,
8383
},
@@ -159,7 +159,7 @@ def request_desc(self) -> str:
159159
"workspace_id": None,
160160
"folder_id": None,
161161
"trashedAt": None,
162-
"trashed_by": None,
162+
"trashedBy": None,
163163
}
164164
},
165165
)
@@ -290,7 +290,7 @@ def request_desc(self) -> str:
290290
"workspace_id": None,
291291
"folder_id": None,
292292
"trashedAt": None,
293-
"trashed_by": None,
293+
"trashedBy": None,
294294
}
295295
},
296296
)
@@ -484,7 +484,7 @@ def request_desc(self) -> str:
484484
"workspace_id": None,
485485
"folder_id": None,
486486
"trashedAt": None,
487-
"trashed_by": None,
487+
"trashedBy": None,
488488
"classifiers": [],
489489
"ui": {
490490
"mode": "workbench",

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,10 @@ async def get_project_for_user(
215215
)
216216

217217
# adds `trashed_by_primary_gid`
218-
if include_trashed_by_primary_gid and project.get("trashed_by") is not None:
218+
if (
219+
include_trashed_by_primary_gid
220+
and project.get("trashed_by", project.get("trashedBy")) is not None
221+
):
219222
project.update(
220223
trashed_by_primary_gid=await _projects_db.get_trashed_by_primary_gid(
221224
app, projects_uuid=project["uuid"]

0 commit comments

Comments
 (0)