Fix rule filterMatch mapping and action typing

Author: cursoragent

src/sentry/api/endpoints/project_rules.py

@@ -775,8 +775,12 @@ def format_request_data(
         if target_type is not None:
             action["config"]["target_type"] = ActionTarget.get_name(target_type)
 
+    filter_match = data.get("filterMatch", "any-short")
+    if filter_match == "any":
+        filter_match = DataConditionGroup.Type.ANY_SHORT_CIRCUIT.value
+
     action_filters = {
-        "logicType": data.get("filterMatch", "any-short"),
+        "logicType": filter_match,
         "conditions": translated_filter_list,
         "actions": translated_actions,
     }

src/sentry/workflow_engine/migration_helpers/rule_action.py

@@ -1,16 +1,22 @@
 import logging
-from typing import Any, cast
+from typing import Any, TypedDict
 
-from sentry.workflow_engine.endpoints.validators.base.action import ActionData
 from sentry.workflow_engine.models.action import Action
 from sentry.workflow_engine.typings.notification_action import issue_alert_action_translator_mapping
 
 logger = logging.getLogger(__name__)
 
 
+class NotificationActionData(TypedDict):
+    type: str
+    data: dict[str, Any]
+    integration_id: int | None
+    config: dict[str, str | int | None]
+
+
 def translate_rule_data_actions_to_notification_actions(
     actions: list[dict[str, Any]], skip_failures: bool
-) -> list[ActionData]:
+) -> list[NotificationActionData]:
     """
     Builds notification actions from action field in Rule's data blob.
     Will only create actions that are valid, and log any errors.
@@ -20,7 +26,7 @@ def translate_rule_data_actions_to_notification_actions(
     :return: list of notification actions (Action)
     """
 
-    notification_actions: list[ActionData] = []
+    notification_actions: list[NotificationActionData] = []
 
     for action in actions:
         # Fetch the registry ID
@@ -76,7 +82,7 @@ def translate_rule_data_actions_to_notification_actions(
                 "config": translator.action_config,
             }
 
-            notification_actions.append(cast(ActionData, notification_action_data))
+            notification_actions.append(notification_action_data)
         except Exception as e:
             if not skip_failures:
                 raise

tests/sentry/api/endpoints/test_project_rules.py

@@ -12,7 +12,7 @@
 from rest_framework import status
 from slack_sdk.web import SlackResponse
 
-from sentry.api.endpoints.project_rules import get_max_alerts
+from sentry.api.endpoints.project_rules import format_request_data, get_max_alerts
 from sentry.constants import ObjectStatus
 from sentry.incidents.endpoints.serializers.utils import (
     get_fake_id_from_object_id,
@@ -395,6 +395,24 @@ def run_test(
         assert RuleActivity.objects.filter(rule=rule, type=RuleActivityType.CREATED.value).exists()
         return response
 
+    def test_format_request_data_maps_any_filter_match_to_any_short(self) -> None:
+        payload = {
+            "name": "my rule",
+            "status": "active",
+            "frequency": 30,
+            "conditions": [],
+            "filters": [],
+            "actions": [],
+            "filterMatch": "any",
+        }
+
+        workflow_payload = format_request_data(payload)
+
+        assert (
+            workflow_payload["actionFilters"][0]["logicType"]
+            == DataConditionGroup.Type.ANY_SHORT_CIRCUIT.value
+        )
+
     def test_simple(self) -> None:
         self.run_test(actions=self.notify_issue_owners_action, conditions=self.first_seen_condition)