fix: repo

Author: giancarloromeo

services/director-v2/src/simcore_service_director_v2/modules/db/repositories/projects.py

@@ -2,9 +2,11 @@
 
 import sqlalchemy as sa
 from models_library.projects import ProjectAtDB, ProjectID
-from models_library.projects_nodes import Node
 from models_library.projects_nodes_io import NodeID
-from simcore_postgres_database.utils_projects_nodes import ProjectNode, ProjectNodesRepo
+from simcore_postgres_database.utils_projects_nodes import (
+    ProjectNodesRepo,
+    make_workbench_subquery,
+)
 from simcore_postgres_database.utils_repos import pass_or_acquire_connection
 
 from ....core.errors import ProjectNotFoundError
@@ -14,48 +16,47 @@
 logger = logging.getLogger(__name__)
 
 
-def _project_node_to_node(project_node: ProjectNode) -> Node:
-    """Converts a ProjectNode from the database to a Node model for the API.
-
-    Handles field mapping and excludes database-specific fields that are not
-    part of the Node model.
-    """
-    node_data = project_node.model_dump_as_node()
-    return Node.model_validate(node_data)
-
-
 class ProjectsRepository(BaseRepository):
     async def get_project(self, project_id: ProjectID) -> ProjectAtDB:
+        workbench_subquery = make_workbench_subquery()
+
         async with self.db_engine.connect() as conn:
-            row = (
-                await conn.execute(
-                    sa.select(projects).where(projects.c.uuid == str(project_id))
+            query = (
+                sa.select(
+                    projects,
+                    sa.func.coalesce(
+                        workbench_subquery.c.workbench, sa.text("'{}'::json")
+                    ).label("workbench"),
+                )
+                .select_from(
+                    projects.outerjoin(
+                        workbench_subquery,
+                        projects.c.uuid == workbench_subquery.c.project_uuid,
+                    )
                 )
-            ).one_or_none()
+                .where(projects.c.uuid == str(project_id))
+            )
+            result = await conn.execute(query)
+            row = result.one_or_none()
             if not row:
                 raise ProjectNotFoundError(project_id=project_id)
-
-            repo = ProjectNodesRepo(project_uuid=project_id)
-            nodes = await repo.list(conn)
-
-        project_workbench = {
-            f"{node.node_id}": _project_node_to_node(node) for node in nodes
-        }
-        data = {**row._asdict(), "workbench": project_workbench}
-        return ProjectAtDB.model_validate(data)
+            return ProjectAtDB.model_validate(row)
 
     async def is_node_present_in_workbench(
         self, project_id: ProjectID, node_uuid: NodeID
     ) -> bool:
         async with pass_or_acquire_connection(self.db_engine) as conn:
-            result = await conn.execute(
-                sa.select(projects_nodes.c.project_node_id).where(
+            stmt = (
+                sa.select(sa.literal(1))
+                .where(
                     projects_nodes.c.project_uuid == str(project_id),
                     projects_nodes.c.node_id == str(node_uuid),
                 )
+                .limit(1)
             )
-            project_node = result.one_or_none()
-            return project_node is not None
+
+            result = await conn.execute(stmt)
+            return result.scalar_one_or_none() is not None
 
     async def get_project_id_from_node(self, node_id: NodeID) -> ProjectID:
         async with self.db_engine.connect() as conn: