test(integration): inline fresh run_id setup and remove payload helper

Author: marshallmcdonnell

tests/integration/campaign_payload_utils.py

@@ -4,13 +4,13 @@
 
 import asyncio
 import json
+import uuid
 from typing import Any
 
 import httpx
 import pytest
 import websockets
 
-from tests.integration.campaign_payload_utils import campaign_with_fresh_ids
 from tests.integration.conftest import (
     get_api_key,
     get_orchestrator_url,
@@ -29,7 +29,8 @@ async def test_event_campaign_completes_via_websocket(
     base_url = get_orchestrator_url()
     ws_url = get_orchestrator_ws_url()
     api_key = get_api_key()
-    campaign_data = campaign_with_fresh_ids(event_campaign_json)
+    campaign_data = json.loads(json.dumps(event_campaign_json))
+    campaign_data['run_id'] = str(uuid.uuid4())
 
     received_events: list[dict[str, Any]] = []
     campaign_complete = False

tests/integration/test_event_campaign_e2e.py

@@ -19,7 +19,6 @@
 import pytest
 import websockets
 
-from tests.integration.campaign_payload_utils import campaign_with_fresh_ids
 from tests.integration.conftest import (
     get_api_key,
     get_orchestrator_url,
@@ -44,8 +43,7 @@ async def test_full_campaign_loop_with_websocket(
     base_url = get_orchestrator_url()
     ws_url = get_orchestrator_ws_url()
     api_key = get_api_key()
-    campaign_data = campaign_with_fresh_ids(load_campaign_json())
-    # avoid 409 conflicts by changing the run ID out
+    campaign_data = json.loads(json.dumps(load_campaign_json()))
     campaign_data['run_id'] = str(uuid.uuid4())
 
     # Track received events

tests/integration/test_full_loop_e2e.py

@@ -25,7 +25,6 @@
 )
 from intersect_orchestrator.app.core.campaign_orchestrator import CampaignOrchestrator
 from intersect_orchestrator.app.core.repository import InMemoryCampaignRepository
-from tests.integration.campaign_payload_utils import campaign_with_fresh_ids
 
 if TYPE_CHECKING:
     import pathlib
@@ -46,7 +45,8 @@ def test_submit_iterative_campaign_creates_state(
         iterative_campaign_json: dict,
     ) -> None:
         """Submitting the iterative campaign should create state, Petri net, and initial events."""
-        campaign_data = campaign_with_fresh_ids(iterative_campaign_json)
+        campaign_data = json.loads(json.dumps(iterative_campaign_json))
+        campaign_data['run_id'] = str(uuid.uuid4())
         campaign = Campaign(**campaign_data)
 
         repository = InMemoryCampaignRepository()
@@ -90,7 +90,8 @@ def test_iterative_campaign_completes_all_iterations(
         * ``RANDOM_NUMBER_SERVICE_AVAILABLE`` is not set (service not present), or
         * a competing orchestrator service is subscribed to the same queue.
         """
-        campaign_data = campaign_with_fresh_ids(iterative_campaign_json)
+        campaign_data = json.loads(json.dumps(iterative_campaign_json))
+        campaign_data['run_id'] = str(uuid.uuid4())
         campaign = Campaign(**campaign_data)
 
         repository = InMemoryCampaignRepository()