simplify

Author: kcons

src/sentry/workflow_engine/processors/action.py

@@ -192,7 +192,7 @@ def get_unique_active_actions(
 def fire_actions(
     actions: BaseQuerySet[Action],
     event_data: WorkflowEventData,
-    workflow_uuid_map: dict[int, str] | None = None,
+    workflow_uuid_map: dict[int, str],
 ) -> None:
     deduped_actions = get_unique_active_actions(actions)
 

src/sentry/workflow_engine/tasks/actions.py

@@ -25,15 +25,15 @@
 def build_trigger_action_task_params(
     action: Action,
     event_data: WorkflowEventData,
-    workflow_uuid_map: dict[int, str] | None = None,
+    workflow_uuid_map: dict[int, str],
 ) -> dict[str, object]:
     """
     Build parameters for trigger_action task invocation.
 
     Args:
         action: The action to trigger.
         event_data: The event data to use for the action.
-        workflow_uuid_map: Optional mapping of workflow_id to notification_uuid.
+        workflow_uuid_map: Mapping of workflow_id to notification_uuid.
     """
     event_id = None
     activity_id = None
@@ -45,9 +45,12 @@ def build_trigger_action_task_params(
     elif isinstance(event_data.event, Activity):
         activity_id = event_data.event.id
 
+    # workflow_id is annotated in the queryset by filter_recently_fired_workflow_actions
+    workflow_id = getattr(action, "workflow_id", None)
+
     task_params = {
         "action_id": action.id,
-        "workflow_id": getattr(action, "workflow_id", None),
+        "workflow_id": workflow_id,
         "event_id": event_id,
         "activity_id": activity_id,
         "group_id": event_data.event.group_id,
@@ -58,11 +61,8 @@ def build_trigger_action_task_params(
     }
 
     # Add notification_uuid if available from workflow_uuid_map
-    # workflow_id is annotated in the queryset by filter_recently_fired_workflow_actions
-    if workflow_uuid_map:
-        workflow_id = getattr(action, "workflow_id", None)
-        if workflow_id is not None and workflow_id in workflow_uuid_map:
-            task_params["notification_uuid"] = workflow_uuid_map[workflow_id]
+    if workflow_id is not None and workflow_id in workflow_uuid_map:
+        task_params["notification_uuid"] = workflow_uuid_map[workflow_id]
 
     return task_params
 

tests/sentry/workflow_engine/tasks/test_actions.py

@@ -14,7 +14,6 @@ def setUp(self) -> None:
         self.group = self.create_group(project=self.project)
 
     def test_build_trigger_action_task_params_basic(self) -> None:
-        """Test basic parameter building without workflow_uuid_map"""
         mock_group_event = Mock(spec=GroupEvent)
         mock_group_event.event_id = "event-123"
         mock_group_event.occurrence_id = "occurrence-456"
@@ -26,7 +25,7 @@ def test_build_trigger_action_task_params_basic(self) -> None:
         # Annotate workflow_id on action as the queryset would
         setattr(action, "workflow_id", 42)
 
-        params = build_trigger_action_task_params(action, event_data)
+        params = build_trigger_action_task_params(action, event_data, {})
 
         assert params["action_id"] == 1
         assert params["workflow_id"] == 42
@@ -36,7 +35,6 @@ def test_build_trigger_action_task_params_basic(self) -> None:
         assert "notification_uuid" not in params
 
     def test_build_trigger_action_task_params_with_workflow_uuid_map(self) -> None:
-        """Test that notification_uuid is added when workflow_id is in workflow_uuid_map"""
         mock_group_event = Mock(spec=GroupEvent)
         mock_group_event.event_id = "event-123"
         mock_group_event.occurrence_id = "occurrence-456"
@@ -58,7 +56,6 @@ def test_build_trigger_action_task_params_with_workflow_uuid_map(self) -> None:
         assert params["notification_uuid"] == expected_notification_uuid
 
     def test_build_trigger_action_task_params_workflow_not_in_map(self) -> None:
-        """Test that notification_uuid is not added when workflow_id is not in workflow_uuid_map"""
         mock_group_event = Mock(spec=GroupEvent)
         mock_group_event.event_id = "event-123"
         mock_group_event.occurrence_id = "occurrence-456"
@@ -80,7 +77,6 @@ def test_build_trigger_action_task_params_workflow_not_in_map(self) -> None:
         assert "notification_uuid" not in params
 
     def test_build_trigger_action_task_params_no_workflow_id(self) -> None:
-        """Test that notification_uuid is not added when action has no workflow_id"""
         mock_group_event = Mock(spec=GroupEvent)
         mock_group_event.event_id = "event-123"
         mock_group_event.occurrence_id = "occurrence-456"