Skip to content

Commit 8d33e2d

Browse files
fix tests
1 parent 8530b50 commit 8d33e2d

File tree

3 files changed

+7
-5
lines changed

3 files changed

+7
-5
lines changed

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -296,8 +296,6 @@ def request_desc(self) -> str:
296296
"state": {"value": "NOT_STARTED"},
297297
},
298298
"workspace_id": None,
299-
"type": "STANDARD",
300-
"templateType": None,
301299
"folder_id": None,
302300
"trashedAt": None,
303301
"trashedBy": None,

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ def _reraise_if_not_unique_uuid_error(err: UniqueViolation):
176176
*[
177177
c
178178
for c in projects.columns
179-
if c.name not in ["type", "hidden", "published"]
179+
if c.name not in ["hidden", "published"]
180180
]
181181
)
182182
)

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

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
import sqlalchemy as sa
1010
from aiopg.sa.connection import SAConnection
1111
from aiopg.sa.result import RowProxy
12-
from models_library.projects import ProjectAtDB, ProjectID
12+
from models_library.projects import ProjectAtDB, ProjectID, ProjectTemplateType
1313
from models_library.projects_nodes import Node
1414
from models_library.projects_nodes_io import NodeIDStr
1515
from models_library.users import UserID
@@ -90,9 +90,13 @@ def convert_to_schema_names(
9090
converted_value = col_value
9191
if isinstance(col_value, datetime) and col_name not in {"trashed"}:
9292
converted_value = format_datetime(col_value)
93-
elif col_name == "prj_owner":
93+
if col_name == "prj_owner":
9494
# this entry has to be converted to the owner e-mail address
9595
converted_value = user_email
96+
if col_name == "type" and isinstance(col_value, ProjectType):
97+
converted_value = col_value.value
98+
if col_name == "template_type" and isinstance(col_value, ProjectTemplateType):
99+
converted_value = col_value.value
96100

97101
if col_name in SCHEMA_NON_NULL_KEYS and col_value is None:
98102
converted_value = ""

0 commit comments

Comments
 (0)