fix test

Author: matusdrobuliak66

packages/postgres-database/src/simcore_postgres_database/migration/versions/42ec7816c0b4_computational_collection_runs.py

@@ -1,7 +1,7 @@
 """computational collection runs
 
 Revision ID: 42ec7816c0b4
-Revises: 4f6fd2586491
+Revises: d159ac30983c
 Create Date: 2025-07-01 13:30:02.736058+00:00
 
 """
@@ -12,7 +12,7 @@
 
 # revision identifiers, used by Alembic.
 revision = "42ec7816c0b4"
-down_revision = "4f6fd2586491"
+down_revision = "d159ac30983c"
 branch_labels = None
 depends_on = None
 
@@ -55,6 +55,11 @@ def upgrade():
     op.add_column(
         "comp_runs", sa.Column("collection_run_id", sa.String(), nullable=False)
     )
+    op.create_unique_constraint(
+        "comp_runs_project_collection_run_id_unique_constraint",
+        "comp_runs",
+        ["project_uuid", "collection_run_id"],
+    )
 
     # Data migration: Create collection run records for existing comp_runs
     op.execute(

packages/postgres-database/src/simcore_postgres_database/models/comp_runs.py

@@ -113,4 +113,5 @@
     sa.UniqueConstraint("project_uuid", "user_id", "iteration"),
     sa.Index("ix_comp_runs_user_id", "user_id"),
     sa.Index("ix_comp_runs_collection_run_id", "collection_run_id"),
+    sa.UniqueConstraint("project_uuid", "collection_run_id"),
 )

services/director-v2/tests/unit/with_dbs/comp_scheduler/test_api_rpc_computations.py

@@ -10,10 +10,14 @@
 from datetime import UTC, datetime, timedelta
 from typing import Any
 
+from faker import Faker
 from models_library.api_schemas_directorv2.comp_runs import (
+    ComputationCollectionRunRpcGetPage,
+    ComputationCollectionRunTaskRpcGetPage,
     ComputationRunRpcGetPage,
     ComputationTaskRpcGetPage,
 )
+from models_library.computations import CollectionRunID
 from models_library.projects import ProjectAtDB
 from models_library.projects_state import RunningState
 from servicelib.rabbitmq import RabbitMQRPCClient
@@ -22,6 +26,9 @@
 )
 from simcore_postgres_database.models.comp_pipeline import StateType
 from simcore_service_director_v2.models.comp_pipelines import CompPipelineAtDB
+from simcore_service_director_v2.models.comp_run_snapshot_tasks import (
+    CompRunSnapshotTaskDBGet,
+)
 from simcore_service_director_v2.models.comp_runs import CompRunsAtDB
 from simcore_service_director_v2.models.comp_tasks import CompTaskAtDB
 
@@ -219,3 +226,85 @@ async def test_rpc_list_computation_runs_history(
     )
     assert output.total == 3
     assert isinstance(output, ComputationRunRpcGetPage)
+
+
+async def test_rpc_list_computation_collection_runs_page_and_collection_run_tasks_page(
+    fake_workbench_without_outputs: dict[str, Any],  # <-- Has 4 nodes
+    fake_workbench_adjacency: dict[str, Any],
+    create_registered_user: Callable[..., dict[str, Any]],
+    project: Callable[..., Awaitable[ProjectAtDB]],
+    create_pipeline: Callable[..., Awaitable[CompPipelineAtDB]],
+    create_tasks: Callable[..., Awaitable[list[CompTaskAtDB]]],
+    create_comp_run_snapshot_tasks: Callable[
+        ..., Awaitable[list[CompRunSnapshotTaskDBGet]]
+    ],
+    create_comp_run: Callable[..., Awaitable[CompRunsAtDB]],
+    rpc_client: RabbitMQRPCClient,
+    faker: Faker,
+):
+    user = create_registered_user()
+    projects = [
+        await project(user, workbench=fake_workbench_without_outputs) for _ in range(3)
+    ]
+
+    default_collection_run_id = CollectionRunID(f"{faker.uuid4(cast_to=None)}")
+    not_default_collection_run_id = CollectionRunID(f"{faker.uuid4(cast_to=None)}")
+
+    collection_run_id_project_list = [
+        default_collection_run_id,
+        default_collection_run_id,
+        not_default_collection_run_id,
+    ]
+
+    for proj, collection_run_id in zip(projects, collection_run_id_project_list):
+        await create_pipeline(
+            project_id=f"{proj.uuid}",
+            dag_adjacency_list=fake_workbench_adjacency,
+        )
+        await create_tasks(
+            user=user, project=proj, state=StateType.PUBLISHED, progress=None
+        )
+        run = await create_comp_run(
+            user=user,
+            project=proj,
+            result=RunningState.SUCCESS,
+            started=datetime.now(tz=UTC) - timedelta(minutes=120),
+            ended=datetime.now(tz=UTC) - timedelta(minutes=100),
+            iteration=1,
+            dag_adjacency_list=fake_workbench_adjacency,
+            collection_run_id=f"{collection_run_id}",
+        )
+        await create_comp_run_snapshot_tasks(
+            user=user,
+            project=proj,
+            run_id=run.run_id,
+        )
+
+    output = await rpc_computations.list_computation_collection_runs_page(
+        rpc_client, product_name="osparc", user_id=user["id"], project_ids=None
+    )
+    assert output.total == 2
+    assert len(output.items) == 2
+    assert isinstance(output, ComputationCollectionRunRpcGetPage)
+    assert len(output.items[0].project_ids) == 1
+    assert len(output.items[1].project_ids) == 2
+
+    output = await rpc_computations.list_computation_collection_run_tasks_page(
+        rpc_client,
+        product_name="osparc",
+        user_id=user["id"],
+        collection_run_id=default_collection_run_id,
+    )
+    assert output.total == 8
+    assert len(output.items) == 8
+    isinstance(output, ComputationCollectionRunTaskRpcGetPage)
+
+    output = await rpc_computations.list_computation_collection_run_tasks_page(
+        rpc_client,
+        product_name="osparc",
+        user_id=user["id"],
+        collection_run_id=not_default_collection_run_id,
+    )
+    assert output.total == 4
+    assert len(output.items) == 4
+    isinstance(output, ComputationCollectionRunTaskRpcGetPage)