fix tests

Author: matusdrobuliak66

services/director-v2/src/simcore_service_director_v2/api/rpc/_computations.py

@@ -14,7 +14,6 @@
 from models_library.services_types import ServiceRunID
 from models_library.users import UserID
 from servicelib.rabbitmq import RPCRouter
-from simcore_postgres_database.models import comp_runs
 from simcore_service_director_v2.models.comp_tasks import ComputationTaskForRpcDBGet
 
 from ...modules.db.repositories.comp_runs import CompRunsRepository
@@ -37,15 +36,17 @@ async def list_computations_latest_iteration_page(
     order_by: OrderBy | None = None,
 ) -> ComputationRunRpcGetPage:
     comp_runs_repo = CompRunsRepository.instance(db_engine=app.state.engine)
-    total, comp_runs = await comp_runs_repo.list_for_user__only_latest_iterations(
-        product_name=product_name,
-        user_id=user_id,
-        offset=offset,
-        limit=limit,
-        order_by=order_by,
+    total, comp_runs_output = (
+        await comp_runs_repo.list_for_user__only_latest_iterations(
+            product_name=product_name,
+            user_id=user_id,
+            offset=offset,
+            limit=limit,
+            order_by=order_by,
+        )
     )
     return ComputationRunRpcGetPage(
-        items=comp_runs,
+        items=comp_runs_output,
         total=total,
     )
 

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

@@ -1,4 +1,5 @@
 import asyncio
+from decimal import Decimal
 
 from aiohttp import web
 from models_library.api_schemas_directorv2.comp_runs import (
@@ -82,6 +83,7 @@ async def list_computations_latest_iteration_tasks(
 
     _service_run_ids = [item.service_run_id for item in _tasks_get.items]
     _is_product_billable = await is_product_billable(app, product_name=product_name)
+    _service_run_osparc_credits: list[Decimal | None]
     if _is_product_billable:
         # NOTE: MD: can be improved with a single batch call
         _service_run_osparc_credits = await asyncio.gather(

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

@@ -154,18 +154,17 @@ def mock_rpc_list_computations_latest_iteration_tasks(
 @pytest.fixture
 def mock_rpc_list_computations_latest_iteration_tasks_page(
     mocker: MockerFixture,
+    user_project: ProjectDict,
 ) -> ComputationTaskRpcGetPage:
+    workbench_ids = list(user_project["workbench"].keys())
+    example = ComputationTaskRpcGet.model_config["json_schema_extra"]["examples"][0]
+    example["node_id"] = workbench_ids[0]
+
     return mocker.patch(
         "simcore_service_webserver.director_v2._computations_service.computations.list_computations_latest_iteration_tasks_page",
         spec=True,
         return_value=ComputationTaskRpcGetPage(
-            items=[
-                ComputationTaskRpcGet.model_validate(
-                    ComputationTaskRpcGet.model_config["json_schema_extra"]["examples"][
-                        0
-                    ]
-                )
-            ],
+            items=[ComputationTaskRpcGet.model_validate(example)],
             total=1,
         ),
     )