test: fix identifier checks

src/dioptra/restapi/v1/utils.py

@@ -288,6 +288,7 @@ def build_plugin_snapshot_ref(plugin: models.Plugin) -> dict[str, Any]:
         The PluginSnapshotRef dictionary.
     """
     return {
+        "id": plugin.resource_id,
         "snapshot_id": plugin.resource_snapshot_id,
         "name": plugin.name,
         "group": build_group_ref(plugin.resource.owner),
@@ -401,6 +402,7 @@ def build_queue_snapshot_ref(queue: models.Queue) -> dict[str, Any]:
         The QueueSnapshotRef dictionary.
     """
     return {
+        "id": queue.resource_id,
         "snapshot_id": queue.resource_snapshot_id,
         "name": queue.name,
         "group": build_group_ref(queue.resource.owner),

tests/unit/restapi/lib/asserts.py

@@ -79,37 +79,43 @@ def assert_base_resource_ref_contents_matches_expectations(
 def assert_queue_ref_contents_matches_expectations(
     queue: dict[str, Any],
     expected_queue_id: int,
+    expected_queue_snapshot_id: int,
     expected_group_id: int,
 ) -> None:
     assert isinstance(queue["name"], str)
     assert_base_resource_ref_contents_matches_expectations(
         resource=queue, expected_group_id=expected_group_id
     )
-    assert queue["snapshotId"] == expected_queue_id
+    assert queue["id"] == expected_queue_id
+    assert queue["snapshotId"] == expected_queue_snapshot_id
 
 
 def assert_experiment_ref_contents_matches_expectations(
     experiment: dict[str, Any],
     expected_experiment_id: int,
+    expected_experiment_snapshot_id: int,
     expected_group_id: int,
 ) -> None:
     assert isinstance(experiment["name"], str)
     assert_base_resource_ref_contents_matches_expectations(
         resource=experiment, expected_group_id=expected_group_id
     )
-    assert experiment["snapshotId"] == expected_experiment_id
+    assert experiment["id"] == expected_experiment_id
+    assert experiment["snapshotId"] == expected_experiment_snapshot_id
 
 
 def assert_entrypoint_ref_contents_matches_expectations(
     entrypoint: dict[str, Any],
     expected_entrypoint_id: int,
+    expected_entrypoint_snapshot_id: int,
     expected_group_id: int,
 ) -> None:
     assert isinstance(entrypoint["name"], str)
     assert_base_resource_ref_contents_matches_expectations(
         resource=entrypoint, expected_group_id=expected_group_id
     )
-    assert entrypoint["snapshotId"] == expected_entrypoint_id
+    assert entrypoint["id"] == expected_entrypoint_id
+    assert entrypoint["snapshotId"] == expected_entrypoint_snapshot_id
 
 
 def assert_draft_response_contents_matches_expectations(

tests/unit/restapi/v1/test_job.py

@@ -99,16 +99,19 @@ def assert_job_response_contents_matches_expectations(
     asserts.assert_queue_ref_contents_matches_expectations(
         queue=response["queue"],
         expected_queue_id=expected_contents["queue_id"],
+        expected_queue_snapshot_id=expected_contents["queue_snapshot_id"],
         expected_group_id=expected_contents["group_id"],
     )
     asserts.assert_experiment_ref_contents_matches_expectations(
         experiment=response["experiment"],
         expected_experiment_id=expected_contents["experiment_id"],
+        expected_experiment_snapshot_id=expected_contents["experiment_snapshot_id"],
         expected_group_id=expected_contents["group_id"],
     )
     asserts.assert_entrypoint_ref_contents_matches_expectations(
         entrypoint=response["entrypoint"],
         expected_entrypoint_id=expected_contents["entrypoint_id"],
+        expected_entrypoint_snapshot_id=expected_contents["entrypoint_snapshot_id"],
         expected_group_id=expected_contents["group_id"],
     )
 
@@ -393,6 +396,9 @@ def test_create_job(
       *Note: group_id is given as an arg for registration in the service layer
     """
 
+    queue_id = registered_queues["queue1"]["id"]
+    experiment_id = registered_experiments["experiment1"]["id"]
+    entrypoint_id = registered_entrypoints["entrypoint1"]["id"]
     queue_snapshot_id = registered_queues["queue1"]["snapshot"]
     experiment_snapshot_id = registered_experiments["experiment1"]["snapshot"]
     entrypoint_snapshot_id = registered_entrypoints["entrypoint1"]["snapshot"]
@@ -408,9 +414,12 @@ def test_create_job(
             "values": values,
             "user_id": auth_account["id"],
             "group_id": registered_experiments["experiment1"]["group"]["id"],
-            "queue_id": queue_snapshot_id,
-            "experiment_id": experiment_snapshot_id,
-            "entrypoint_id": entrypoint_snapshot_id,
+            "queue_id": queue_id,
+            "experiment_id": experiment_id,
+            "entrypoint_id": entrypoint_id,
+            "queue_snapshot_id": queue_snapshot_id,
+            "experiment_snapshot_id": experiment_snapshot_id,
+            "entrypoint_snapshot_id": entrypoint_snapshot_id,
         },
     )