continue fixing

Author: giancarloromeo

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

@@ -315,16 +315,23 @@ async def _get_project(
             .group_by(project_to_groups.c.project_uuid)
         ).subquery("access_rights_subquery")
 
+        _workbench_subquery = _build_workbench_subquery()
+
         query = (
             sa.select(
                 *PROJECT_DB_COLS,
-                _build_workbench_subquery().c.workbench,
+                sa.func.coalesce(_workbench_subquery.c.workbench, "{}").label(
+                    "workbench"
+                ),
                 users.c.primary_gid.label("trashed_by_primary_gid"),
                 access_rights_subquery.c.access_rights,
             )
             .select_from(
-                projects.join(access_rights_subquery, isouter=True).outerjoin(
-                    users, projects.c.trashed_by == users.c.id
+                projects.join(access_rights_subquery, isouter=True)
+                .outerjoin(users, projects.c.trashed_by == users.c.id)
+                .outerjoin(
+                    _workbench_subquery,
+                    projects.c.uuid == _workbench_subquery.c.project_uuid,
                 )
             )
             .where(

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

@@ -184,8 +184,8 @@ def _reraise_if_not_unique_uuid_error(err: UniqueViolation):
                             assert row  # nosec
 
                             selected_values = ProjectDict(row.items())
-                            if workbench:
-                                selected_values["workbench"] = workbench
+                            # if workbench:
+                            selected_values["workbench"] = workbench
                             project_index = selected_values.pop("id")
 
                         except UniqueViolation as err:
@@ -1097,13 +1097,19 @@ async def _update_project_workbench(
             # update timestamps
             new_project_data["lastChangeDate"] = now_str()
 
+            # After moving workbench from project DB table to project_nodes table:
+            workbench = new_project_data.pop("workbench")
+            # TODO: UPDATE project_nodes table
+
             result = await db_connection.execute(
                 projects.update()
                 .values(**convert_to_db_names(new_project_data))
                 .where(projects.c.id == current_project[projects.c.id.key])
                 .returning(literal_column("*"))
             )
+
             project = await result.fetchone()
+
             assert project  # nosec
             if product_name:
                 await self.upsert_project_linked_product(
@@ -1115,7 +1121,9 @@ async def _update_project_workbench(
                 db_connection, project_id=project[projects.c.id]
             )
             return (
-                convert_to_schema_names(project, user_email, tags=tags),
+                convert_to_schema_names(
+                    project, user_email, tags=tags, workbench=workbench
+                ),
                 changed_entries,
             )
         msg = "linter unhappy without this"