Skip to content

Commit 705ae27

Browse files
fix
1 parent acef022 commit 705ae27

File tree

4 files changed

+7
-10
lines changed

4 files changed

+7
-10
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -316,7 +316,7 @@ async def create_project( # pylint: disable=too-many-arguments,too-many-branche
316316
# Folder ID is not part of the project resource
317317
predefined_project.pop("folderId")
318318

319-
if from_study:
319+
if from_study: # Either clone or creation of template out of study
320320
# 1.1 prepare copy
321321
(
322322
new_project,

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

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -74,17 +74,10 @@ async def _aggregate_data_to_projects_from_other_sources(
7474
for prj, prj_type in zip(db_projects, db_project_types, strict=False)
7575
]
7676

77-
projects_with_state: list[ProjectDict] = await _paralell_update(
77+
updated_projects: list[ProjectDict] = await _paralell_update(
7878
*update_state_per_project,
7979
)
8080

81-
updated_projects = []
82-
for project, project_type in zip(
83-
projects_with_state, db_project_types, strict=True
84-
):
85-
project["type"] = project_type
86-
updated_projects.append(project)
87-
8881
return updated_projects
8982

9083

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@
4040
from simcore_postgres_database.aiopg_errors import UniqueViolation
4141
from simcore_postgres_database.models.groups import user_to_groups
4242
from simcore_postgres_database.models.project_to_groups import project_to_groups
43+
from simcore_postgres_database.models.projects import ProjectTemplateType
4344
from simcore_postgres_database.models.projects_nodes import projects_nodes
4445
from simcore_postgres_database.models.projects_tags import projects_tags
4546
from simcore_postgres_database.models.projects_to_folders import projects_to_folders
@@ -283,6 +284,9 @@ async def insert_project(
283284
if (force_as_template or user_id is None)
284285
else ProjectType.STANDARD.value
285286
),
287+
"template_type": (
288+
ProjectTemplateType.TEMPLATE.value if force_as_template else None
289+
),
286290
"prj_owner": user_id if user_id else None,
287291
"hidden": hidden,
288292
# NOTE: this is very bad and leads to very weird conversions.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636

3737
logger = logging.getLogger(__name__)
3838

39-
DB_EXCLUSIVE_COLUMNS = ["type", "id", "published", "hidden"]
39+
DB_EXCLUSIVE_COLUMNS = ["id", "published", "hidden"]
4040
SCHEMA_NON_NULL_KEYS = ["thumbnail"]
4141

4242
PermissionStr = Literal["read", "write", "delete"]

0 commit comments

Comments
 (0)