ref(ACI): Update evaluate_value return

src/sentry/workflow_engine/models/data_condition.py

@@ -209,7 +209,10 @@ def evaluate_value(self, value: T) -> DataConditionResult:
             )
             return None
 
-        return self.get_condition_result() if result else None
+        if isinstance(result, bool):
+            return self.get_condition_result() if result else None
+
+        return result
 
 
 def is_slow_condition(condition: DataCondition) -> bool:

tests/sentry/workflow_engine/models/test_data_condition.py

@@ -1,11 +1,17 @@
+from enum import IntEnum
 from unittest import mock
 
 import pytest
 
 from sentry.testutils.cases import TestCase
 from sentry.workflow_engine.models.data_condition import Condition, DataConditionEvaluationException
 from sentry.workflow_engine.types import DetectorPriorityLevel
-from tests.sentry.workflow_engine.test_base import DataConditionHandlerMixin
+from tests.sentry.workflow_engine.test_base import BaseWorkflowTest, DataConditionHandlerMixin
+
+
+class MockDataConditionEnum(IntEnum):
+    FOO = 1
+    BAR = 2
 
 
 class GetConditionResultTest(TestCase):
@@ -38,14 +44,34 @@ def test_boolean(self):
         assert dc.get_condition_result() is True
 
 
-class EvaluateValueTest(DataConditionHandlerMixin, TestCase):
+class EvaluateValueTest(DataConditionHandlerMixin, BaseWorkflowTest):
     def test(self):
         dc = self.create_data_condition(
             type=Condition.GREATER, comparison=1.0, condition_result=DetectorPriorityLevel.HIGH
         )
         assert dc.evaluate_value(2) == DetectorPriorityLevel.HIGH
         assert dc.evaluate_value(1) is None
 
+    def test_dict_comparison_result(self):
+        def evaluate_value(
+            value: int, comparison: dict[str, DetectorPriorityLevel]
+        ) -> DetectorPriorityLevel:
+            return (
+                DetectorPriorityLevel.HIGH
+                if comparison["baz"].value > 1
+                else DetectorPriorityLevel.OK
+            )
+
+        dc = self.setup_condition_mocks(
+            evaluate_value, ["sentry.workflow_engine.models.data_condition"]
+        )
+        dc.update(comparison={"baz": MockDataConditionEnum.BAR})
+        assert dc.evaluate_value(2) == DetectorPriorityLevel.HIGH
+
+        dc.update(comparison={"baz": MockDataConditionEnum.FOO})
+        assert dc.evaluate_value(0) == DetectorPriorityLevel.OK
+        self.teardown_condition_mocks()
+
     def test_bad_condition(self):
         with pytest.raises(ValueError):
             # Raises ValueError because the condition is invalid