Updated logic and tests as per Edds comment.

Author: ayeshalshukri1-nhs

src/eligibility_signposting_api/services/eligibility_services.py

@@ -85,15 +85,15 @@ def evaluate_rule(iteration_rule: IterationRule, attribute_value: Any) -> bool:
             case RuleOperator.equals:
                 return attribute_value == iteration_rule.comparator
             case RuleOperator.gt:
-                return int(attribute_value or 0) > int(iteration_rule.comparator)
+                return bool(attribute_value) and int(attribute_value) > int(iteration_rule.comparator)
             case RuleOperator.lt:
-                return int(attribute_value or 0) < int(iteration_rule.comparator)
+                return bool(attribute_value) and int(attribute_value) < int(iteration_rule.comparator)
             case RuleOperator.ne:
-                return attribute_value != iteration_rule.comparator
+                return bool(attribute_value) and attribute_value != iteration_rule.comparator
             case RuleOperator.gte:
-                return int(attribute_value or 0) >= int(iteration_rule.comparator)
+                return bool(attribute_value) and int(attribute_value) >= int(iteration_rule.comparator)
             case RuleOperator.lte:
-                return int(attribute_value or 0) <= int(iteration_rule.comparator)
+                return bool(attribute_value) and int(attribute_value) <= int(iteration_rule.comparator)
             case RuleOperator.contains:
                 return attribute_value and iteration_rule.comparator in str(attribute_value)
             case RuleOperator.not_contains:

tests/unit/services/test_eligibility_services.py

@@ -165,6 +165,12 @@ def test_equals_rule():
     assert not EligibilityService.evaluate_rule(rule, None)
     assert not EligibilityService.evaluate_rule(rule, "99")
 
+    rule = IterationRuleFactory.build(operator=RuleOperator.equals, comparator="-1")
+    assert EligibilityService.evaluate_rule(rule, "-1")
+    assert not EligibilityService.evaluate_rule(rule, "0")
+    assert not EligibilityService.evaluate_rule(rule, "")
+    assert not EligibilityService.evaluate_rule(rule, None)
+
 
 def test_greater_than_rule():
     rule = IterationRuleFactory.build(operator=RuleOperator.gt, comparator="100")
@@ -174,24 +180,44 @@ def test_greater_than_rule():
     assert not EligibilityService.evaluate_rule(rule, "")
     assert not EligibilityService.evaluate_rule(rule, None)
 
+    rule = IterationRuleFactory.build(operator=RuleOperator.gt, comparator="-1")
+    assert EligibilityService.evaluate_rule(rule, "0")
+    assert not EligibilityService.evaluate_rule(rule, "-1")
+    assert not EligibilityService.evaluate_rule(rule, "-2")
+    assert not EligibilityService.evaluate_rule(rule, "")
+    assert not EligibilityService.evaluate_rule(rule, None)
+
 
 def test_less_than_rule():
     rule = IterationRuleFactory.build(operator=RuleOperator.lt, comparator="100")
     assert EligibilityService.evaluate_rule(rule, "42")
     assert EligibilityService.evaluate_rule(rule, "99")
     assert not EligibilityService.evaluate_rule(rule, "100")
     assert not EligibilityService.evaluate_rule(rule, "101")
-    assert EligibilityService.evaluate_rule(rule, "")
-    assert EligibilityService.evaluate_rule(rule, None)
+    assert not EligibilityService.evaluate_rule(rule, "")
+    assert not EligibilityService.evaluate_rule(rule, None)
+
+    rule = IterationRuleFactory.build(operator=RuleOperator.lt, comparator="-1")
+    assert EligibilityService.evaluate_rule(rule, "-2")
+    assert not EligibilityService.evaluate_rule(rule, "-1")
+    assert not EligibilityService.evaluate_rule(rule, "0")
+    assert not EligibilityService.evaluate_rule(rule, "")
+    assert not EligibilityService.evaluate_rule(rule, None)
 
 
 def test_not_equals_rule():
     rule = IterationRuleFactory.build(operator=RuleOperator.ne, comparator="27")
     assert EligibilityService.evaluate_rule(rule, "98")
-    assert EligibilityService.evaluate_rule(rule, "")
-    assert EligibilityService.evaluate_rule(rule, None)
+    assert not EligibilityService.evaluate_rule(rule, "")
+    assert not EligibilityService.evaluate_rule(rule, None)
     assert not EligibilityService.evaluate_rule(rule, "27")
 
+    rule = IterationRuleFactory.build(operator=RuleOperator.ne, comparator="-1")
+    assert not EligibilityService.evaluate_rule(rule, "-1")
+    assert EligibilityService.evaluate_rule(rule, "0")
+    assert not EligibilityService.evaluate_rule(rule, "")
+    assert not EligibilityService.evaluate_rule(rule, None)
+
 
 def test_greater_than_or_equal_rule():
     rule = IterationRuleFactory.build(operator=RuleOperator.gte, comparator="100")
@@ -201,14 +227,28 @@ def test_greater_than_or_equal_rule():
     assert not EligibilityService.evaluate_rule(rule, "")
     assert not EligibilityService.evaluate_rule(rule, None)
 
+    rule = IterationRuleFactory.build(operator=RuleOperator.gte, comparator="-1")
+    assert EligibilityService.evaluate_rule(rule, "0")
+    assert EligibilityService.evaluate_rule(rule, "-1")
+    assert not EligibilityService.evaluate_rule(rule, "-2")
+    assert not EligibilityService.evaluate_rule(rule, "")
+    assert not EligibilityService.evaluate_rule(rule, None)
+
 
 def test_less_than_or_equal_rule():
     rule = IterationRuleFactory.build(operator=RuleOperator.lte, comparator="100")
     assert EligibilityService.evaluate_rule(rule, "99")
     assert EligibilityService.evaluate_rule(rule, "100")
     assert not EligibilityService.evaluate_rule(rule, "101")
-    assert EligibilityService.evaluate_rule(rule, "")
-    assert EligibilityService.evaluate_rule(rule, None)
+    assert not EligibilityService.evaluate_rule(rule, "")
+    assert not EligibilityService.evaluate_rule(rule, None)
+
+    rule = IterationRuleFactory.build(operator=RuleOperator.lte, comparator="-1")
+    assert EligibilityService.evaluate_rule(rule, "-2")
+    assert EligibilityService.evaluate_rule(rule, "-1")
+    assert not EligibilityService.evaluate_rule(rule, "0")
+    assert not EligibilityService.evaluate_rule(rule, "")
+    assert not EligibilityService.evaluate_rule(rule, None)
 
 
 def test_contains_rule():