fix(aci): allow percent freq intervals (#85907)

Author: cathteng

src/sentry/workflow_engine/handlers/condition/event_frequency_handlers.py

@@ -2,6 +2,7 @@
 
 from sentry.rules.conditions.event_frequency import (
     COMPARISON_INTERVALS,
+    PERCENT_INTERVALS,
     STANDARD_INTERVALS,
     percent_increase,
 )
@@ -68,7 +69,7 @@ class PercentSessionsCountHandler(EventFrequencyCountHandler):
     comparison_json_schema = {
         "type": "object",
         "properties": {
-            "interval": {"type": "string", "enum": list(STANDARD_INTERVALS.keys())},
+            "interval": {"type": "string", "enum": list(PERCENT_INTERVALS.keys())},
             "value": {"type": "number", "minimum": 0, "maximum": 100},
             "filters": {
                 "type": "array",
@@ -85,7 +86,7 @@ class PercentSessionsPercentHandler(EventFrequencyPercentHandler):
     comparison_json_schema = {
         "type": "object",
         "properties": {
-            "interval": {"type": "string", "enum": list(STANDARD_INTERVALS.keys())},
+            "interval": {"type": "string", "enum": list(PERCENT_INTERVALS.keys())},
             "value": {"type": "number", "minimum": 0, "maximum": 100},
             "comparison_interval": {"type": "string", "enum": list(COMPARISON_INTERVALS.keys())},
             "filters": {

tests/sentry/workflow_engine/handlers/condition/test_event_frequency_handlers.py

@@ -2,6 +2,8 @@
 from jsonschema import ValidationError
 
 from sentry.rules.conditions.event_frequency import (
+    PERCENT_INTERVALS,
+    STANDARD_INTERVALS,
     ComparisonType,
     EventFrequencyCondition,
     EventFrequencyPercentCondition,
@@ -140,6 +142,8 @@ def setUp(self):
             "comparisonType": ComparisonType.PERCENT,
             "comparisonInterval": "1d",
         }
+        self.intervals = STANDARD_INTERVALS
+        self.other_intervals = PERCENT_INTERVALS
 
     def test_percent(self):
         dc = self.create_data_condition(
@@ -245,6 +249,18 @@ def test_json_schema(self):
                 condition_result=True,
             )
 
+        invalid_interval = list(set(self.other_intervals.keys()) - set(self.intervals.keys()))[0]
+        with pytest.raises(ValidationError):
+            self.create_data_condition(
+                type=self.condition,
+                comparison={
+                    "interval": invalid_interval,
+                    "value": 100,
+                    "comparison_interval": "1d",
+                },
+                condition_result=True,
+            )
+
 
 class TestEventUniqueUserFrequencyCountCondition(TestEventFrequencyCountCondition):
     def setUp(self):
@@ -276,24 +292,28 @@ def setUp(self):
         super().setUp()
         self.condition = Condition.PERCENT_SESSIONS_COUNT
         self.payload: dict[str, int | str] = {
-            "interval": "1h",
+            "interval": "30m",  # only percent sessions allows 30m
             "id": EventFrequencyPercentCondition.id,
             "value": 17,
             "comparisonType": ComparisonType.COUNT,
         }
+        self.intervals = PERCENT_INTERVALS
+        self.other_intervals = STANDARD_INTERVALS
 
 
 class TestPercentSessionsPercentCondition(TestEventFrequencyPercentCondition):
     def setUp(self):
         super().setUp()
         self.condition = Condition.PERCENT_SESSIONS_PERCENT
         self.payload: dict[str, int | str] = {
-            "interval": "1h",
+            "interval": "30m",  # only percent sessions allows 30m
             "id": EventFrequencyPercentCondition.id,
             "value": 17,
             "comparisonType": ComparisonType.PERCENT,
             "comparisonInterval": "1d",
         }
+        self.intervals = PERCENT_INTERVALS
+        self.other_intervals = STANDARD_INTERVALS
 
 
 class TestEventUniqueUserFrequencyConditionWithConditions(ConditionTestCase):