chore(ACI): Cleanup tests, use fixtures (#88752)

Create and use fixtures more for consistency so we're not using fixtures
in some places and manually creating objects in others

Author: ceorourke

src/sentry/testutils/factories.py

@@ -171,6 +171,8 @@
 from sentry.utils.performance_issues.performance_problem import PerformanceProblem
 from sentry.workflow_engine.models import (
     Action,
+    ActionAlertRuleTriggerAction,
+    AlertRuleDetector,
     AlertRuleWorkflow,
     DataCondition,
     DataConditionGroup,
@@ -2262,10 +2264,10 @@ def create_alert_rule_workflow(
         **kwargs,
     ) -> AlertRuleWorkflow:
         if rule_id is None and alert_rule_id is None:
-            raise ValueError("Either rule or alert_rule must be provided")
+            raise ValueError("Either rule_id or alert_rule_id must be provided")
 
         if rule_id is not None and alert_rule_id is not None:
-            raise ValueError("Only one of rule or alert_rule can be provided")
+            raise ValueError("Only one of rule_id or alert_rule_id can be provided")
 
         if workflow is None:
             workflow = Factories.create_workflow()
@@ -2274,6 +2276,41 @@ def create_alert_rule_workflow(
             alert_rule_id=alert_rule_id, rule_id=rule_id, workflow=workflow, **kwargs
         )
 
+    @staticmethod
+    @assume_test_silo_mode(SiloMode.REGION)
+    def create_alert_rule_detector(
+        alert_rule_id: int | None = None,
+        rule_id: int | None = None,
+        detector: Detector | None = None,
+        **kwargs,
+    ) -> AlertRuleDetector:
+        if rule_id is None and alert_rule_id is None:
+            raise ValueError("Either rule_id or alert_rule_id must be provided")
+
+        if rule_id is not None and alert_rule_id is not None:
+            raise ValueError("Only one of rule_id or alert_rule_id can be provided")
+
+        if detector is None:
+            detector = Factories.create_detector()
+
+        return AlertRuleDetector.objects.create(
+            alert_rule_id=alert_rule_id, rule_id=rule_id, detector=detector, **kwargs
+        )
+
+    @staticmethod
+    @assume_test_silo_mode(SiloMode.REGION)
+    def create_action_alert_rule_trigger_action(
+        alert_rule_trigger_action_id: int,
+        action: Action | None = None,
+        **kwargs,
+    ) -> ActionAlertRuleTriggerAction:
+        if action is None:
+            action = Factories.create_action()
+
+        return ActionAlertRuleTriggerAction.objects.create(
+            action=action, alert_rule_trigger_action_id=alert_rule_trigger_action_id
+        )
+
     @staticmethod
     @assume_test_silo_mode(SiloMode.REGION)
     def create_data_condition_group_action(

src/sentry/testutils/fixtures.py

@@ -668,7 +668,16 @@ def create_data_condition_group_action(self, *args, **kwargs):
     def create_detector_workflow(self, *args, **kwargs):
         return Factories.create_detector_workflow(*args, **kwargs)
 
+    def create_alert_rule_detector(self, *args, **kwargs):
+        # TODO: this is only needed during the ACI migration
+        return Factories.create_alert_rule_detector(*args, **kwargs)
+
+    def create_action_alert_rule_trigger_action(self, *args, **kwargs):
+        # TODO: this is only needed during the ACI migration
+        return Factories.create_action_alert_rule_trigger_action(*args, **kwargs)
+
     def create_alert_rule_workflow(self, *args, **kwargs):
+        # TODO: this is only needed during the ACI migration
         return Factories.create_alert_rule_workflow(*args, **kwargs)
 
     def create_workflow_data_condition_group(self, *args, **kwargs):

src/sentry/testutils/helpers/backups.py

@@ -114,13 +114,7 @@
 from sentry.users.models.userip import UserIP
 from sentry.users.models.userrole import UserRole, UserRoleUser
 from sentry.utils import json
-from sentry.workflow_engine.models import (
-    Action,
-    AlertRuleDetector,
-    AlertRuleWorkflow,
-    DataConditionAlertRuleTrigger,
-    DataConditionGroup,
-)
+from sentry.workflow_engine.models import Action, DataConditionAlertRuleTrigger, DataConditionGroup
 from sentry.workflow_engine.models.action_group_status import ActionGroupStatus
 
 __all__ = [
@@ -696,8 +690,8 @@ def create_exhaustive_organization(
         )
         detector.workflow_condition_group = detector_conditions
 
-        AlertRuleDetector.objects.create(detector=detector, alert_rule_id=alert.id)
-        AlertRuleWorkflow.objects.create(workflow=workflow, alert_rule_id=alert.id)
+        self.create_alert_rule_detector(detector=detector, alert_rule_id=alert.id)
+        self.create_alert_rule_workflow(workflow=workflow, alert_rule_id=alert.id)
         ActionGroupStatus.objects.create(action=send_notification_action, group=group)
         DataConditionAlertRuleTrigger.objects.create(
             data_condition=data_condition, alert_rule_trigger_id=trigger.id

tests/sentry/workflow_engine/migration_helpers/test_migrate_alert_rule.py

@@ -21,10 +21,9 @@
 from sentry.integrations.pagerduty.client import PAGERDUTY_DEFAULT_SEVERITY
 from sentry.models.rulesnooze import RuleSnooze
 from sentry.notifications.models.notificationaction import ActionService, ActionTarget
-from sentry.silo.base import SiloMode
 from sentry.snuba.models import QuerySubscription
 from sentry.testutils.cases import APITestCase
-from sentry.testutils.silo import assume_test_silo_mode, assume_test_silo_mode_of
+from sentry.testutils.silo import assume_test_silo_mode_of
 from sentry.users.services.user.service import user_service
 from sentry.workflow_engine.migration_helpers.alert_rule import (
     PRIORITY_MAP,
@@ -268,8 +267,12 @@ class BaseMetricAlertMigrationTest(APITestCase, BaseWorkflowTest):
     def create_metric_alert_lookup_tables(
         self, alert_rule: AlertRule, detector: Detector, workflow: Workflow
     ) -> tuple[AlertRuleDetector, AlertRuleWorkflow]:
-        alert_rule_detector = self.create_alert_rule_detector(alert_rule, detector)
-        alert_rule_workflow = self.create_alert_rule_workflow(alert_rule, workflow)
+        alert_rule_detector = self.create_alert_rule_detector(
+            alert_rule_id=alert_rule.id, detector=detector
+        )
+        alert_rule_workflow = self.create_alert_rule_workflow(
+            alert_rule_id=alert_rule.id, workflow=workflow
+        )
         return (
             alert_rule_detector,
             alert_rule_workflow,
@@ -411,31 +414,12 @@ def create_migrated_metric_alert_rule_action_objects(
         data_condition_group_action = self.create_data_condition_group_action(
             action, action_filter.condition_group
         )
-        action_alert_rule_trigger_action = ActionAlertRuleTriggerAction.objects.create(
-            action_id=action.id,
+        action_alert_rule_trigger_action = self.create_action_alert_rule_trigger_action(
+            action=action,
             alert_rule_trigger_action_id=alert_rule_trigger_action.id,
         )
         return action, data_condition_group_action, action_alert_rule_trigger_action
 
-    @staticmethod
-    @assume_test_silo_mode(SiloMode.REGION)
-    def create_alert_rule_detector(alert_rule: AlertRule, detector: Detector) -> AlertRuleDetector:
-        return AlertRuleDetector.objects.create(alert_rule_id=alert_rule.id, detector=detector)
-
-    @staticmethod
-    @assume_test_silo_mode(SiloMode.REGION)
-    def create_alert_rule_workflow(alert_rule: AlertRule, workflow: Workflow) -> AlertRuleWorkflow:
-        return AlertRuleWorkflow.objects.create(alert_rule_id=alert_rule.id, workflow=workflow)
-
-    @staticmethod
-    @assume_test_silo_mode(SiloMode.REGION)
-    def create_action_alert_rule_trigger_action(
-        action: Action, alert_rule_trigger_action: AlertRuleTriggerAction
-    ) -> ActionAlertRuleTriggerAction:
-        return ActionAlertRuleTriggerAction.objects.create(
-            action=action, alert_rule_trigger_action_id=alert_rule_trigger_action.id
-        )
-
 
 class DualWriteAlertRuleTest(APITestCase):
     def setUp(self):