fixes

Author: ameliahsu

src/sentry/workflow_engine/endpoints/organization_data_condition_index.py

@@ -1,8 +1,7 @@
 from typing import NotRequired, TypedDict
 
 from drf_spectacular.utils import extend_schema
-from rest_framework import serializers, status
-from rest_framework.response import Response
+from rest_framework import serializers
 
 from sentry.api.api_owners import ApiOwner
 from sentry.api.api_publish_status import ApiPublishStatus
@@ -19,17 +18,11 @@
 from sentry.apidocs.parameters import GlobalParams
 from sentry.apidocs.utils import inline_sentry_response_serializer
 from sentry.workflow_engine.endpoints.serializers import DataConditionHandlerSerializer
-from sentry.workflow_engine.models.data_condition import IGNORED_CONDITIONS
+from sentry.workflow_engine.models.data_condition import LEGACY_CONDITIONS
 from sentry.workflow_engine.registry import condition_handler_registry
 from sentry.workflow_engine.types import DataConditionHandler
 
 
-class DataConditionRequestSerializer(serializers.Serializer):
-    type = serializers.ChoiceField(
-        choices=[type.value for type in DataConditionHandler.Type],
-    )
-
-
 class DataConditionHandlerResponse(TypedDict):
     condition_id: str
     type: str
@@ -63,17 +56,16 @@ def get(self, request, organization):
         """
         Returns a list of data conditions for a given org
         """
-        serializer = DataConditionRequestSerializer(data=request.GET)
-        if not serializer.is_valid():
-            return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
-        serialized = serializer.validated_data
-
-        type = serialized.get("type")
+        type = request.GET.get("type")
+        try:
+            DataConditionHandler.Type(type)
+        except ValueError:
+            raise serializers.ValidationError("Invalid group")
 
         data_conditions = []
 
         for condition, handler in condition_handler_registry.registrations.items():
-            if condition not in IGNORED_CONDITIONS and handler.type == type:
+            if condition not in LEGACY_CONDITIONS and handler.type == type:
                 condition_json = {"condition_id": condition}
 
                 condition_json.update(

src/sentry/workflow_engine/models/data_condition.py

@@ -83,7 +83,7 @@ class Condition(StrEnum):
 ] + PERCENT_CONDITIONS
 
 # Conditions that are not supported in the UI
-IGNORED_CONDITIONS = [
+LEGACY_CONDITIONS = [
     Condition.EVERY_EVENT,
     Condition.EVENT_CREATED_BY_DETECTOR,
     Condition.EVENT_SEEN_COUNT,

tests/sentry/workflow_engine/endpoints/test_organization_data_condition_index.py

@@ -19,7 +19,7 @@ def setUp(self):
             "sentry.workflow_engine.registry.condition_handler_registry",
             new=self.registry,
         )
-        self.registry_patcher.__enter__()
+        self.registry_patcher.start()
 
         @self.registry.register(Condition.REAPPEARED_EVENT)
         @dataclass(frozen=True)
@@ -56,7 +56,7 @@ class TestIgnoredCondition(DataConditionHandler):
 
     def tearDown(self) -> None:
         super().tearDown()
-        self.registry_patcher.__exit__(None, None, None)
+        self.registry_patcher.stop()
 
 
 @region_silo_test