RuleStop is set to bool

Author: Karthikeyannhs

src/eligibility_signposting_api/model/rules.py

@@ -81,17 +81,6 @@ class RuleAttributeLevel(StrEnum):
     COHORT = "COHORT"
 
 
-class RuleStop(StrEnum):
-    YES = "Y"
-    NO = "N"
-
-    @classmethod
-    def _missing_(cls, value: object) -> RuleStop:
-        if isinstance(value, str) and value.upper() == cls.YES.value:
-            return cls.YES
-        return cls.NO
-
-
 class IterationCohort(BaseModel):
     cohort_label: CohortLabel | None = Field(None, alias="CohortLabel")
     priority: int | None = Field(None, alias="Priority")
@@ -110,7 +99,13 @@ class IterationRule(BaseModel):
     operator: RuleOperator = Field(..., alias="Operator")
     comparator: RuleComparator = Field(..., alias="Comparator")
     attribute_target: RuleAttributeTarget | None = Field(None, alias="AttributeTarget")
-    rule_stop: RuleStop | None = Field(None, alias="RuleStop")
+    rule_stop: bool = Field(default=False, alias="RuleStop")
+
+    @field_validator("rule_stop", mode="before")
+    def parse_yn_to_bool(cls, v: str | bool) -> bool:  # noqa: N805
+        if isinstance(v, str):
+            return v.upper() == "Y"
+        return bool(v)
 
     model_config = {"populate_by_name": True, "extra": "ignore"}
 

src/eligibility_signposting_api/services/calculators/eligibility_calculator.py

@@ -152,5 +152,5 @@ def evaluate_priority_group(
 
         worst_group_status = eligibility.Status.worst(best_status, worst_status_so_far_for_condition)
         if worst_group_status.is_exclusion:
-            is_rule_stop = any(rule.rule_stop == rules.RuleStop.YES for rule in exclude_capable_rules)
+            is_rule_stop = any(rule.rule_stop for rule in exclude_capable_rules)
         return worst_group_status, actionable_reasons, exclusion_reasons, is_rule_stop

tests/fixtures/builders/model/rule.py

@@ -22,7 +22,7 @@ class IterationCohortFactory(ModelFactory[rules.IterationCohort]): ...
 class IterationRuleFactory(ModelFactory[rules.IterationRule]):
     attribute_target = None
     cohort_label = None
-    rule_stop = None
+    rule_stop = False
 
 
 class IterationFactory(ModelFactory[rules.Iteration]):