override get and filter

Author: ceorourke

src/sentry/api/serializers/models/rule.py

@@ -347,7 +347,7 @@ def _fetch_workflows(self, item_list: Sequence[Workflow]) -> BaseQuerySet[Workfl
             to_attr="prefetched_wdcgs",
         )
         workflows = (
-            Workflow.objects.filter(id__in=[wf.id for wf in item_list], status=ObjectStatus.ACTIVE)
+            Workflow.objects.filter(id__in=[wf.id for wf in item_list])
             .select_related("when_condition_group")
             .prefetch_related("when_condition_group__conditions")
             .prefetch_related(workflow_dcg_prefetch)

src/sentry/digests/notifications.py

@@ -6,7 +6,6 @@
 from typing import Any, NamedTuple, TypeAlias
 
 from sentry import features, tsdb
-from sentry.constants import ObjectStatus
 from sentry.digests.types import IdentifierKey, Notification, Record, RecordWithRuleObjects
 from sentry.eventstore.models import Event
 from sentry.models.group import Group, GroupStatus
@@ -172,9 +171,9 @@ def get_rules_from_workflows(project: Project, workflow_ids: set[int]) -> dict[i
         return rules
 
     # Fetch all workflows in bulk
-    workflows = Workflow.objects.filter(
-        organization_id=project.organization_id, status=ObjectStatus.ACTIVE
-    ).in_bulk(workflow_ids)
+    workflows = Workflow.objects.filter(organization_id=project.organization_id).in_bulk(
+        workflow_ids
+    )
 
     # We are only processing the workflows in the digest if under the new flag
     # This should be ok since we should only add workflow_ids to redis when under this flag

src/sentry/incidents/endpoints/organization_alert_rule_details.py

@@ -25,7 +25,6 @@
 )
 from sentry.apidocs.examples.metric_alert_examples import MetricAlertExamples
 from sentry.apidocs.parameters import GlobalParams, MetricAlertParams
-from sentry.constants import ObjectStatus
 from sentry.incidents.endpoints.bases import OrganizationAlertRuleEndpoint
 from sentry.incidents.endpoints.serializers.alert_rule import (
     AlertRuleSerializer,
@@ -69,9 +68,7 @@ def fetch_alert_rule(
 
     if features.has("organizations:workflow-engine-rule-serializers", organization):
         try:
-            detector = Detector.objects.get(
-                alertruledetector__alert_rule_id=alert_rule.id, status=ObjectStatus.ACTIVE
-            )
+            detector = Detector.objects.get(alertruledetector__alert_rule_id=alert_rule.id)
             return Response(
                 serialize(
                     detector,
@@ -146,9 +143,7 @@ def update_alert_rule(
             if features.has("organizations:workflow-engine-rule-serializers", organization):
                 validator.save()
                 try:
-                    detector = Detector.objects.get(
-                        alertruledetector__alert_rule_id=alert_rule.id, status=ObjectStatus.ACTIVE
-                    )
+                    detector = Detector.objects.get(alertruledetector__alert_rule_id=alert_rule.id)
                     return Response(
                         serialize(
                             detector,

src/sentry/incidents/endpoints/organization_alert_rule_index.py

@@ -125,9 +125,7 @@ def create_metric_alert(
         alert_rule = validator.save()
         if features.has("organizations:workflow-engine-rule-serializers", organization):
             try:
-                detector = Detector.objects.get(
-                    alertruledetector__alert_rule_id=alert_rule.id, status=ObjectStatus.ACTIVE
-                )
+                detector = Detector.objects.get(alertruledetector__alert_rule_id=alert_rule.id)
                 return Response(
                     serialize(
                         detector,
@@ -162,7 +160,6 @@ def fetch_metric_alert(
         if features.has("organizations:workflow-engine-rule-serializers", organization):
             detectors = Detector.objects.filter(
                 alertruledetector__alert_rule_id__in=[alert_rule.id for alert_rule in alert_rules],
-                status=ObjectStatus.ACTIVE,
             )
             if not len(detectors):
                 return Response(status=status.HTTP_404_NOT_FOUND)

src/sentry/incidents/endpoints/project_alert_rule_task_details.py

@@ -8,7 +8,6 @@
 from sentry.api.base import region_silo_endpoint
 from sentry.api.bases.project import ProjectEndpoint, ProjectSettingPermission
 from sentry.api.serializers import serialize
-from sentry.constants import ObjectStatus
 from sentry.incidents.endpoints.serializers.workflow_engine_detector import (
     WorkflowEngineDetectorSerializer,
 )
@@ -51,7 +50,6 @@ def get(self, request: Request, project, task_uuid) -> Response:
                     try:
                         detector = Detector.objects.get(
                             alertruledetector__alert_rule_id=alert_rule.id,
-                            status=ObjectStatus.ACTIVE,
                         )
                     except Detector.DoesNotExist:
                         raise Http404

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

@@ -6,7 +6,6 @@
 from django.db.models import Subquery
 
 from sentry.api.serializers import Serializer, serialize
-from sentry.constants import ObjectStatus
 from sentry.incidents.endpoints.serializers.workflow_engine_action import (
     WorkflowEngineActionSerializer,
 )
@@ -45,7 +44,6 @@ def get_attrs(
                     detector_trigger.condition_group
                     for detector_trigger in detector_triggers.values()
                 ],
-                status=ObjectStatus.ACTIVE,
             ).values_list("id", flat=True)
         )
         workflow_dcg_ids = DataConditionGroup.objects.filter(
@@ -89,9 +87,7 @@ def serialize(
         **kwargs: Any,
     ) -> dict[str, Any]:
         # XXX: we are assuming that the obj/DataCondition is a detector trigger
-        detector = Detector.objects.get(
-            workflow_condition_group=obj.condition_group, status=ObjectStatus.ACTIVE
-        )
+        detector = Detector.objects.get(workflow_condition_group=obj.condition_group)
 
         alert_rule_trigger_id = DataConditionAlertRuleTrigger.objects.values_list(
             "alert_rule_trigger_id", flat=True

src/sentry/incidents/subscription_processor.py

@@ -322,7 +322,6 @@ def process_update(self, subscription_update: QuerySubscriptionUpdate) -> None:
                 detector = Detector.objects.get(
                     data_sources__source_id=str(self.subscription.id),
                     data_sources__type=DATA_SOURCE_SNUBA_QUERY_SUBSCRIPTION,
-                    status=ObjectStatus.ACTIVE,
                 )
                 comparison_delta = detector.config.get("comparison_delta")
             except Detector.DoesNotExist:

src/sentry/notifications/notification_action/metric_alert_registry/handlers/email_metric_alert_handler.py

@@ -1,4 +1,3 @@
-from sentry.constants import ObjectStatus
 from sentry.incidents.action_handlers import email_users
 from sentry.incidents.models.incident import TriggerStatus
 from sentry.incidents.typings.metric_detector import (
@@ -42,9 +41,7 @@ def send_alert(
         project: Project,
     ) -> None:
 
-        detector = Detector.objects.get(
-            id=alert_context.action_identifier_id, status=ObjectStatus.ACTIVE
-        )
+        detector = Detector.objects.get(id=alert_context.action_identifier_id)
         if not detector:
             raise ValueError("Detector not found")
 

src/sentry/notifications/notification_action/metric_alert_registry/handlers/msteams_metric_alert_handler.py

@@ -1,4 +1,3 @@
-from sentry.constants import ObjectStatus
 from sentry.incidents.models.incident import TriggerStatus
 from sentry.incidents.typings.metric_detector import (
     AlertContext,
@@ -35,9 +34,7 @@ def send_alert(
 
         from sentry.integrations.msteams.utils import send_incident_alert_notification
 
-        detector = Detector.objects.get(
-            id=alert_context.action_identifier_id, status=ObjectStatus.ACTIVE
-        )
+        detector = Detector.objects.get(id=alert_context.action_identifier_id)
         if not detector:
             raise ValueError("Detector not found")
 

src/sentry/notifications/notification_action/metric_alert_registry/handlers/slack_metric_alert_handler.py

@@ -1,4 +1,3 @@
-from sentry.constants import ObjectStatus
 from sentry.incidents.models.incident import TriggerStatus
 from sentry.incidents.typings.metric_detector import (
     AlertContext,
@@ -34,9 +33,7 @@ def send_alert(
         project: Project,
     ) -> None:
 
-        detector = Detector.objects.get(
-            id=alert_context.action_identifier_id, status=ObjectStatus.ACTIVE
-        )
+        detector = Detector.objects.get(id=alert_context.action_identifier_id)
         if not detector:
             raise ValueError("Detector not found")
 

src/sentry/uptime/models.py

@@ -254,7 +254,6 @@ def get_active_auto_monitor_count_for_org(organization: Organization) -> int:
             ProjectUptimeSubscriptionMode.AUTO_DETECTED_ONBOARDING,
             ProjectUptimeSubscriptionMode.AUTO_DETECTED_ACTIVE,
         ],
-        status=ObjectStatus.ACTIVE,
     ).count()
 
 

src/sentry/uptime/subscriptions/subscriptions.py

@@ -190,7 +190,6 @@ def create_project_uptime_subscription(
             type=UptimeDomainCheckFailure.slug,
             project__organization=project.organization,
             config__mode=ProjectUptimeSubscriptionMode.MANUAL,
-            status=ObjectStatus.ACTIVE,
         ).count()
         if (
             not override_manual_org_limit
@@ -446,7 +445,6 @@ def is_url_auto_monitored_for_project(project: Project, url: str) -> bool:
                 ProjectUptimeSubscriptionMode.AUTO_DETECTED_ONBOARDING.value,
                 ProjectUptimeSubscriptionMode.AUTO_DETECTED_ACTIVE.value,
             ),
-            status=ObjectStatus.ACTIVE,
         )
         .select_related("data_sources")
         .values_list("data_sources__source_id", flat=True)
@@ -467,7 +465,6 @@ def get_auto_monitored_detectors_for_project(project: Project) -> list[Detector]
                 ProjectUptimeSubscriptionMode.AUTO_DETECTED_ONBOARDING.value,
                 ProjectUptimeSubscriptionMode.AUTO_DETECTED_ACTIVE.value,
             ),
-            status=ObjectStatus.ACTIVE,
         )
     )
 

src/sentry/workflow_engine/endpoints/organization_detector_details.py

@@ -60,7 +60,7 @@ def convert_args(self, request: Request, detector_id, *args, **kwargs):
         args, kwargs = super().convert_args(request, *args, **kwargs)
         try:
             detector = Detector.objects.select_related("project").get(
-                id=detector_id, status=ObjectStatus.ACTIVE
+                id=detector_id,
             )
             if detector.project.organization_id != kwargs["organization"].id:
                 raise ResourceDoesNotExist

src/sentry/workflow_engine/endpoints/organization_detector_index.py

@@ -18,7 +18,6 @@
     RESPONSE_UNAUTHORIZED,
 )
 from sentry.apidocs.parameters import DetectorParams, GlobalParams, OrganizationParams
-from sentry.constants import ObjectStatus
 from sentry.db.models.query import in_icontains, in_iexact
 from sentry.issues import grouptype
 from sentry.models.organization import Organization
@@ -97,7 +96,7 @@ def get(self, request: Request, organization: Organization) -> Response:
         Return a list of detectors for a given organization.
         """
         projects = self.get_projects(request, organization)
-        queryset = Detector.objects.filter(project_id__in=projects, status=ObjectStatus.ACTIVE)
+        queryset = Detector.objects.filter(project_id__in=projects)
 
         if raw_query := request.GET.get("query"):
             tokenized_query = tokenize_query(raw_query)

src/sentry/workflow_engine/endpoints/organization_workflow_index.py

@@ -18,7 +18,6 @@
     RESPONSE_UNAUTHORIZED,
 )
 from sentry.apidocs.parameters import GlobalParams, OrganizationParams, WorkflowParams
-from sentry.constants import ObjectStatus
 from sentry.db.models.query import in_icontains, in_iexact
 from sentry.search.utils import tokenize_query
 from sentry.workflow_engine.endpoints.serializers import WorkflowSerializer
@@ -43,7 +42,7 @@ def convert_args(self, request: Request, workflow_id, *args, **kwargs):
         args, kwargs = super().convert_args(request, *args, **kwargs)
         try:
             kwargs["workflow"] = Workflow.objects.get(
-                organization=kwargs["organization"], id=workflow_id, status=ObjectStatus.ACTIVE
+                organization=kwargs["organization"], id=workflow_id
             )
         except Workflow.DoesNotExist:
             raise ResourceDoesNotExist
@@ -81,9 +80,7 @@ def get(self, request, organization):
         """
         sort_by = SortByParam.parse(request.GET.get("sortBy", "id"), SORT_COL_MAP)
 
-        queryset = Workflow.objects.filter(
-            organization_id=organization.id, status=ObjectStatus.ACTIVE
-        )
+        queryset = Workflow.objects.filter(organization_id=organization.id)
 
         if raw_query := request.GET.get("query"):
             tokenized_query = tokenize_query(raw_query)

src/sentry/workflow_engine/endpoints/validators/detector_workflow.py

@@ -5,7 +5,6 @@
 
 from sentry import audit_log
 from sentry.api.serializers.rest_framework.base import CamelSnakeSerializer
-from sentry.constants import ObjectStatus
 from sentry.utils.audit import create_audit_entry
 from sentry.workflow_engine.models.detector import Detector
 from sentry.workflow_engine.models.detector_workflow import DetectorWorkflow
@@ -47,14 +46,12 @@ def create(self, validated_data):
                 detector = Detector.objects.get(
                     project__organization=self.context["organization"],
                     id=validated_data["detector_id"],
-                    status=ObjectStatus.ACTIVE,
                 )
                 if not can_edit_detector(detector, self.context["request"]):
                     raise PermissionDenied
                 workflow = Workflow.objects.get(
                     organization=self.context["organization"],
                     id=validated_data["workflow_id"],
-                    status=ObjectStatus.ACTIVE,
                 )
             except (Detector.DoesNotExist, Workflow.DoesNotExist) as e:
                 raise serializers.ValidationError(str(e))

src/sentry/workflow_engine/migration_helpers/issue_alert_migration.py

@@ -88,7 +88,7 @@ def _create_detector_lookup(self) -> Detector:
         if self.is_dry_run:
             created = True
             error_detector = Detector.objects.filter(
-                type=ErrorGroupType.slug, project=self.project, status=ObjectStatus.ACTIVE
+                type=ErrorGroupType.slug, project=self.project
             ).first()
             if error_detector:
                 created = not AlertRuleDetector.objects.filter(

src/sentry/workflow_engine/models/detector.py

@@ -3,7 +3,7 @@
 import builtins
 import logging
 from collections.abc import Callable
-from typing import TYPE_CHECKING, Any
+from typing import TYPE_CHECKING, Any, ClassVar
 
 from django.conf import settings
 from django.db import models
@@ -15,6 +15,7 @@
 from sentry.constants import ObjectStatus
 from sentry.db.models import DefaultFieldsModel, FlexibleForeignKey, region_silo_model
 from sentry.db.models.fields.hybrid_cloud_foreign_key import HybridCloudForeignKey
+from sentry.db.models.manager.base import BaseManager
 from sentry.issues import grouptype
 from sentry.issues.grouptype import GroupType
 from sentry.models.owner_base import OwnerModel
@@ -27,6 +28,20 @@
 logger = logging.getLogger(__name__)
 
 
+class DetectorManager(BaseManager["Detector"]):
+    def filter(self, *args, **kwargs):
+        # Only add the default status if no status is explicitly provided
+        if "status" not in kwargs:
+            kwargs["status"] = ObjectStatus.ACTIVE
+        return super().filter(*args, **kwargs)
+
+    def get(self, *args, **kwargs):
+        # Only add the default status if no status is explicitly provided
+        if "status" not in kwargs:
+            kwargs["status"] = ObjectStatus.ACTIVE
+        return super().get(*args, **kwargs)
+
+
 @region_silo_model
 class Detector(DefaultFieldsModel, OwnerModel, JSONConfigBase):
     __relocation_scope__ = RelocationScope.Organization
@@ -63,6 +78,8 @@ class Detector(DefaultFieldsModel, OwnerModel, JSONConfigBase):
     # The user that created the detector
     created_by_id = HybridCloudForeignKey(settings.AUTH_USER_MODEL, null=True, on_delete="SET_NULL")
 
+    objects: ClassVar[DetectorManager] = DetectorManager()
+
     class Meta(OwnerModel.Meta):
         constraints = OwnerModel.Meta.constraints
 

src/sentry/workflow_engine/models/workflow.py

@@ -1,5 +1,5 @@
 from dataclasses import replace
-from typing import Any
+from typing import Any, ClassVar
 
 from django.conf import settings
 from django.db import models
@@ -10,13 +10,28 @@
 from sentry.constants import ObjectStatus
 from sentry.db.models import DefaultFieldsModel, FlexibleForeignKey, region_silo_model, sane_repr
 from sentry.db.models.fields.hybrid_cloud_foreign_key import HybridCloudForeignKey
+from sentry.db.models.manager.base import BaseManager
 from sentry.models.owner_base import OwnerModel
 from sentry.workflow_engine.models.data_condition import DataCondition, is_slow_condition
 from sentry.workflow_engine.types import WorkflowEventData
 
 from .json_config import JSONConfigBase
 
 
+class WorkflowManager(BaseManager["Workflow"]):
+    def filter(self, *args, **kwargs):
+        # Only add the default status if no status is explicitly provided
+        if "status" not in kwargs:
+            kwargs["status"] = ObjectStatus.ACTIVE
+        return super().filter(*args, **kwargs)
+
+    def get(self, *args, **kwargs):
+        # Only add the default status if no status is explicitly provided
+        if "status" not in kwargs:
+            kwargs["status"] = ObjectStatus.ACTIVE
+        return super().get(*args, **kwargs)
+
+
 @region_silo_model
 class Workflow(DefaultFieldsModel, OwnerModel, JSONConfigBase):
     """
@@ -61,6 +76,8 @@ class Workflow(DefaultFieldsModel, OwnerModel, JSONConfigBase):
         "additionalProperties": False,
     }
 
+    objects: ClassVar[WorkflowManager] = WorkflowManager()
+
     __repr__ = sane_repr("name", "organization_id")
 
     class Meta: