test fixes and lint fixes

Author: Karthikeyannhs

src/eligibility_signposting_api/model/rules.py

@@ -29,6 +29,7 @@
 StartDate = NewType("StartDate", date)
 EndDate = NewType("EndDate", date)
 CohortLabel = NewType("CohortLabel", str)
+RuleStop = NewType("RuleStop", bool)
 
 
 class RuleType(StrEnum):
@@ -99,7 +100,7 @@ class IterationRule(BaseModel):
     operator: RuleOperator = Field(..., alias="Operator")
     comparator: RuleComparator = Field(..., alias="Comparator")
     attribute_target: RuleAttributeTarget | None = Field(None, alias="AttributeTarget")
-    rule_stop: bool = Field(default=False, alias="RuleStop")
+    rule_stop: RuleStop | None = Field(None, alias="RuleStop")
 
     @field_validator("rule_stop", mode="before")
     def parse_yn_to_bool(cls, v: str) -> bool:  # noqa: N805

tests/unit/services/calculators/test_eligibility_calculator.py

@@ -847,8 +847,6 @@ def test_rules_stop_behavior(rule_stop: str | None, expected_status: Status, tes
         {"Type": "F", "Priority": 15},
     ]
 
-    iteration_rules = [IterationRule.model_validate({**simple_age_data, **variant}) for variant in rule_variants]
-
     # Build campaign configuration
     campaign_config = rule_builder.CampaignConfigFactory.build(
         target="RSV",
@@ -858,7 +856,9 @@ def test_rules_stop_behavior(rule_stop: str | None, expected_status: Status, tes
             )
         ],
     )
-    campaign_config.iterations[0].iteration_rules.extend(iteration_rules)
+    campaign_config.iterations[0].iteration_rules.extend(
+        [IterationRule.model_validate({**simple_age_data, **variant}) for variant in rule_variants]
+    )
 
     calculator = EligibilityCalculator(person_rows, [campaign_config])