test for rules stop

tests/unit/model/test_rules.py

@@ -2,7 +2,7 @@
 from dateutil.relativedelta import relativedelta
 from faker import Faker
 
-from tests.fixtures.builders.model.rule import IterationFactory, RawCampaignConfigFactory
+from tests.fixtures.builders.model.rule import IterationFactory, IterationRuleFactory, RawCampaignConfigFactory
 
 
 def test_campaign_must_have_at_least_one_iteration():
@@ -59,3 +59,20 @@ def test_iteration_must_have_active_iteration_from_its_start(faker: Faker):
         r".*1st iteration starts later",
     ):
         RawCampaignConfigFactory.build(start_date=start_date, iterations=[iteration])
+
+
+@pytest.mark.parametrize(
+    ("rule_stop", "expected"),
+    [
+        ("Y", True),
+        ("N", False),
+        ("", False),
+        (None, False),
+    ],
+)
+def test_rules_stop_in_iteration_rules_assigns_yn_to_bool(rule_stop: str, expected):
+    # Given, When
+    iteration_rules = IterationRuleFactory.build(rule_stop=rule_stop)
+
+    # Then
+    assert iteration_rules.rule_stop is expected

tests/unit/services/calculators/test_eligibility_calculator.py

@@ -8,7 +8,6 @@
 from eligibility_signposting_api.model import rules
 from eligibility_signposting_api.model import rules as rules_model
 from eligibility_signposting_api.model.eligibility import ConditionName, DateOfBirth, NHSNumber, Postcode, Status
-from eligibility_signposting_api.model.rules import IterationRule
 from eligibility_signposting_api.services.calculators.eligibility_calculator import EligibilityCalculator
 from tests.fixtures.builders.model import rule as rule_builder
 from tests.fixtures.builders.repos.person import person_rows_builder
@@ -831,24 +830,14 @@ def test_rules_stop_behavior(rule_stop: str | None, expected_status: Status, tes
 
     # Base rule template
     # Not using model factory to create Iteration rules since it sets boolean values for "Y"/"N"
-    simple_age_data = {
-        "Name": "Exclude too young less than 75",
-        "Description": "Exclude too young less than 75",
-        "AttributeLevel": "PERSON",
-        "AttributeName": "DATE_OF_BIRTH",
-        "Operator": "Y>",
-        "Comparator": "-75",
-    }
-
-    # Build rule variations
-    rule_variants = [
-        {"Type": "S", "Priority": 10, "RuleStop": rule_stop},
-        {"Type": "S", "Priority": 10},
-        {"Type": "F", "Priority": 15},
+    iteration_rules = [
+        rule_builder.PersonAgeSuppressionRuleFactory.build(
+            type=rules.RuleType.suppression, priority=10, rule_stop=rule_stop
+        ),
+        rule_builder.PersonAgeSuppressionRuleFactory.build(type=rules.RuleType.suppression, priority=10),
+        rule_builder.PersonAgeSuppressionRuleFactory.build(type=rules.RuleType.filter, 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",