adding unit test

Author: matusdrobuliak66

services/web/server/src/simcore_service_webserver/director_v2/_computations_service.py

@@ -22,7 +22,9 @@
     check_user_project_permission,
     get_project_dict_legacy,
 )
-from ..projects.projects_metadata_service import get_project_custom_metadata
+from ..projects.projects_metadata_service import (
+    get_project_custom_metadata_or_empty_dict,
+)
 from ..rabbitmq import get_rabbitmq_rpc_client
 
 
@@ -50,10 +52,12 @@ async def list_computations_latest_iteration(
         order_by=order_by,
     )
 
-    # Get projects metadata
+    # Get projects metadata (NOTE: MD: can be improved with a single batch call)
     _projects_metadata = await limited_gather(
         *[
-            get_project_custom_metadata(app, project_uuid=item.project_uuid)
+            get_project_custom_metadata_or_empty_dict(
+                app, project_uuid=item.project_uuid
+            )
             for item in _runs_get.items
         ],
         limit=20,

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

@@ -11,6 +11,7 @@
 from ..db.plugin import get_database_engine
 from . import _metadata_repository
 from ._access_rights_service import validate_project_ownership
+from .exceptions import ProjectNotFoundError
 
 _logger = logging.getLogger(__name__)
 
@@ -28,11 +29,26 @@ async def get_project_custom_metadata_for_user(
 async def get_project_custom_metadata(
     app: web.Application, project_uuid: ProjectID
 ) -> MetadataDict:
+    """Can Raise ProjectNotFoundError"""
     return await _metadata_repository.get_project_custom_metadata(
         engine=get_database_engine(app), project_uuid=project_uuid
     )
 
 
+async def get_project_custom_metadata_or_empty_dict(
+    app: web.Application, project_uuid: ProjectID
+) -> MetadataDict:
+    try:
+        output = await _metadata_repository.get_project_custom_metadata(
+            engine=get_database_engine(app), project_uuid=project_uuid
+        )
+    except ProjectNotFoundError:
+        # This is a valid case when the project is not found
+        # but we still want to return an empty dict
+        output = {}
+    return output
+
+
 async def set_project_custom_metadata(
     app: web.Application,
     user_id: UserID,

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

@@ -128,6 +128,7 @@ async def batch_get_project_name(
 
     query = (
         sql.select(
+            projects.c.uuid,
             projects.c.name,
         )
         .select_from(projects)
@@ -145,7 +146,7 @@ async def batch_get_project_name(
     )
     async with pass_or_acquire_connection(get_asyncpg_engine(app), connection) as conn:
         result = await conn.stream(query)
-        rows = {row.uuid: row.trashed_by_primary_gid async for row in result}
+        rows = {row.uuid: row.name async for row in result}
 
     return [rows.get(project_uuid) for project_uuid in projects_uuids_str]
 

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

@@ -1,6 +1,6 @@
-from ._metadata_service import get_project_custom_metadata
+from ._metadata_service import get_project_custom_metadata_or_empty_dict
 
-__all__: tuple[str, ...] = ("get_project_custom_metadata",)
+__all__: tuple[str, ...] = ("get_project_custom_metadata_or_empty_dict",)
 
 
 # nopycln: file

services/web/server/tests/unit/with_dbs/01/test_director_v2_handlers.py

@@ -134,18 +134,18 @@ async def test_stop_computation(
 @pytest.fixture
 def mock_rpc_list_computations_latest_iteration_tasks(
     mocker: MockerFixture,
+    user_project: ProjectDict,
 ) -> ComputationRunRpcGetPage:
+    project_uuid = user_project["uuid"]
+    example = ComputationRunRpcGet.model_config["json_schema_extra"]["examples"][0]
+    example["project_uuid"] = project_uuid
+    example["info"]["project_metadata"]["root_parent_project_id"] = project_uuid
+
     return mocker.patch(
         "simcore_service_webserver.director_v2._computations_service.computations.list_computations_latest_iteration_page",
         spec=True,
         return_value=ComputationRunRpcGetPage(
-            items=[
-                ComputationRunRpcGet.model_validate(
-                    ComputationRunRpcGet.model_config["json_schema_extra"]["examples"][
-                        0
-                    ]
-                )
-            ],
+            items=[ComputationRunRpcGet.model_validate(example)],
             total=1,
         ),
     )
@@ -189,6 +189,7 @@ async def test_list_computations_latest_iteration(
     )
     if user_role != UserRole.ANONYMOUS:
         assert ComputationRunRestGet.model_validate(data[0])
+        assert data[0]["rootProjectName"] == user_project["name"]
 
     url = client.app.router["list_computations_latest_iteration_tasks"].url_for(
         project_id=f"{user_project['uuid']}"