fix(aci milestone 3): bug fix metric detector serializers

src/sentry/incidents/endpoints/serializers/workflow_engine_detector.py

@@ -3,7 +3,7 @@
 from typing import Any, DefaultDict
 
 from django.contrib.auth.models import AnonymousUser
-from django.db.models import Q
+from django.db.models import Q, Subquery
 
 from sentry.api.serializers import Serializer, serialize
 from sentry.incidents.endpoints.serializers.alert_rule import AlertRuleSerializerResponse
@@ -26,9 +26,11 @@
     Action,
     AlertRuleDetector,
     DataCondition,
+    DataConditionGroup,
     DataConditionGroupAction,
     DataSourceDetector,
     Detector,
+    DetectorWorkflow,
 )
 from sentry.workflow_engine.models.workflow_action_group_status import WorkflowActionGroupStatus
 from sentry.workflow_engine.types import DetectorPriorityLevel
@@ -209,6 +211,7 @@ def get_attrs(
         self, item_list: Sequence[Detector], user: User | RpcUser | AnonymousUser, **kwargs: Any
     ) -> defaultdict[Detector, dict[str, Any]]:
         detectors = {item.id: item for item in item_list}
+        detector_ids = [item.id for item in item_list]
         result: DefaultDict[Detector, dict[str, Any]] = defaultdict(dict)
 
         detector_workflow_condition_group_ids = [
@@ -220,13 +223,20 @@ def get_attrs(
             condition_group__in=detector_workflow_condition_group_ids,
             condition_result__in=[DetectorPriorityLevel.HIGH, DetectorPriorityLevel.MEDIUM],
         )
-
+        workflow_dcg_ids = DataConditionGroup.objects.filter(
+            workflowdataconditiongroup__workflow__in=Subquery(
+                DetectorWorkflow.objects.filter(detector__in=detector_ids).values_list(
+                    "workflow_id", flat=True
+                )
+            )
+        ).values_list("id", flat=True)
         action_filter_data_condition_groups = DataCondition.objects.filter(
             comparison__in=[
                 detector_trigger.condition_result
                 for detector_trigger in detector_trigger_data_conditions
             ],
-        ).exclude(condition_group__in=detector_workflow_condition_group_ids)
+            condition_group__in=Subquery(workflow_dcg_ids),
+        )
 
         dcgas = DataConditionGroupAction.objects.filter(
             condition_group__in=[

tests/sentry/incidents/serializers/test_workflow_engine_base.py

@@ -40,6 +40,7 @@ def setUp(self) -> None:
         self.resolve_trigger_data_condition = migrate_resolve_threshold_data_condition(
             self.alert_rule
         )
+
         self.expected_critical_action = [
             {
                 "id": str(self.critical_trigger_action.id),

tests/sentry/incidents/serializers/test_workflow_engine_detector.py

@@ -8,7 +8,12 @@
 )
 from sentry.incidents.models.alert_rule import AlertRuleTriggerAction
 from sentry.incidents.models.incident import IncidentTrigger, TriggerStatus
-from sentry.workflow_engine.migration_helpers.alert_rule import migrate_metric_action
+from sentry.workflow_engine.migration_helpers.alert_rule import (
+    migrate_alert_rule,
+    migrate_metric_action,
+    migrate_metric_data_conditions,
+    migrate_resolve_threshold_data_condition,
+)
 from tests.sentry.incidents.serializers.test_workflow_engine_base import (
     TestWorkflowEngineSerializer,
 )
@@ -68,6 +73,43 @@ def test_sentry_app(self, mock_sentry_app_components_preparer: Any) -> None:
         )
         self.sentry_app_action, _, _ = migrate_metric_action(self.sentry_app_trigger_action)
 
+        other_sentry_app = self.create_sentry_app(
+            organization=self.organization,
+            published=True,
+            verify_install=False,
+            name="Not Awesome App",
+            schema={"elements": [self.create_alert_rule_action_schema()]},
+        )
+        self.create_sentry_app_installation(
+            slug=other_sentry_app.slug, organization=self.organization, user=self.user
+        )
+
+        # add some other workflow engine objects to ensure that our filtering is working properly
+        other_alert_rule = self.create_alert_rule()
+        critical_trigger = self.create_alert_rule_trigger(
+            alert_rule=other_alert_rule, label="critical"
+        )
+        critical_trigger_action = self.create_alert_rule_trigger_action(
+            alert_rule_trigger=critical_trigger
+        )
+        migrate_alert_rule(other_alert_rule)
+        migrate_metric_data_conditions(critical_trigger)
+
+        migrate_metric_action(critical_trigger_action)
+        migrate_resolve_threshold_data_condition(other_alert_rule)
+
+        other_sentry_app_action = self.create_alert_rule_trigger_action(
+            alert_rule_trigger=critical_trigger,
+            type=AlertRuleTriggerAction.Type.SENTRY_APP,
+            target_identifier=other_sentry_app.id,
+            target_type=AlertRuleTriggerAction.TargetType.SENTRY_APP,
+            sentry_app=other_sentry_app,
+            sentry_app_config=[
+                {"name": "title", "value": "An alert"},
+            ],
+        )
+        migrate_metric_action(other_sentry_app_action)
+
         # add a sentry app action and update expected actions
         sentry_app_action_data = {
             "id": str(self.sentry_app_trigger_action.id),