continue fixing

Author: giancarloromeo

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

@@ -3,7 +3,10 @@
 import sqlalchemy as sa
 from models_library.projects import NodesDict, ProjectID
 from models_library.projects_nodes import Node, NodeID
-from simcore_postgres_database.utils_projects_nodes import ProjectNode
+from simcore_postgres_database.utils_projects_nodes import (
+    ProjectNode,
+    ProjectNodesNodeNotFoundError,
+)
 
 from ..tables import projects_nodes
 from ._base import BaseRepository
@@ -50,3 +53,17 @@ async def exists_node(self, project_id: ProjectID, node_id: NodeID) -> bool:
                 )
             ).fetchone()
             return result is not None
+
+    async def get_project_id_from_node(self, node_id: NodeID) -> ProjectID:
+        async with self.db_engine.acquire() as conn:
+            result = await (
+                await conn.execute(
+                    sa.select(projects_nodes.c.project_uuid).where(
+                        projects_nodes.c.node_id == f"{node_id}"
+                    )
+                )
+            ).fetchone()
+            if result is None:
+                raise ProjectNodesNodeNotFoundError(node_id=node_id)
+
+            return ProjectID(result[0])

services/director-v2/tests/unit/with_dbs/test_modules_db_repositories_projects.py

@@ -13,9 +13,6 @@
 from pytest_simcore.helpers.monkeypatch_envs import setenvs_from_dict
 from pytest_simcore.helpers.typing_env import EnvVarsDict
 from simcore_postgres_database.utils_projects_nodes import ProjectNodesNodeNotFoundError
-from simcore_service_director_v2.modules.db.repositories.projects import (
-    ProjectsRepository,
-)
 from simcore_service_director_v2.modules.db.repositories.projects_nodes import (
     ProjectsNodesRepository,
 )
@@ -81,7 +78,7 @@ async def project(
     return await project(registered_user(), workbench=workbench)
 
 
-async def test_is_node_present_in_workbench(
+async def test_exists_node(
     initialized_app: FastAPI,
     project: ProjectAtDB,
     workbench: dict[str, Any],
@@ -117,15 +114,18 @@ async def test_is_node_present_in_workbench(
 
 
 async def test_get_project_id_from_node(
-    initialized_app: FastAPI, project: ProjectAtDB, faker: Faker
+    initialized_app: FastAPI,
+    project: ProjectAtDB,
+    workbench: dict[str, Any],
+    faker: Faker,
 ):
-    project_repository = get_repository(initialized_app, ProjectsRepository)
-    for node_uuid in project.workbench:
+    project_nodes_repo = get_repository(initialized_app, ProjectsNodesRepository)
+    for node_uuid in workbench:
         assert (
-            await project_repository.get_project_id_from_node(NodeID(node_uuid))
+            await project_nodes_repo.get_project_id_from_node(NodeID(node_uuid))
             == project.uuid
         )
 
     not_existing_node_id = faker.uuid4(cast_to=None)
     with pytest.raises(ProjectNodesNodeNotFoundError):
-        await project_repository.get_project_id_from_node(not_existing_node_id)
+        await project_nodes_repo.get_project_id_from_node(not_existing_node_id)