all tests passing

Author: TOEL2

src/eligibility_signposting_api/services/processors/rule_processor.py

@@ -94,7 +94,9 @@ def is_actionable(
             if not applicable_rules:
                 continue
 
-            status, group_exclusion_reasons, rule_stop = self.evaluate_rules_priority_group(person, rule_group)
+            status, group_exclusion_reasons, rule_stop = self.evaluate_rules_priority_group(
+                person, iter(applicable_rules)
+            )
             if status.is_exclusion:
                 is_actionable = False
                 suppression_reasons.extend(group_exclusion_reasons)

tests/integration/conftest.py

@@ -480,14 +480,17 @@ def campaign_config(s3_client: BaseClient, rules_bucket: BucketName) -> Generato
     yield campaign
     s3_client.delete_object(Bucket=rules_bucket, Key=f"{campaign.name}.json")
 
+
 @pytest.fixture(scope="class")
 def campaign_config_with_and_rule(s3_client: BaseClient, rules_bucket: BucketName) -> Generator[CampaignConfig]:
     campaign: CampaignConfig = rule.CampaignConfigFactory.build(
         target="RSV",
         iterations=[
             rule.IterationFactory.build(
                 iteration_rules=[
-                    rule.PostcodeSuppressionRuleFactory.build(cohort_label="cohort2",),
+                    rule.PostcodeSuppressionRuleFactory.build(
+                        cohort_label="cohort2",
+                    ),
                     rule.PersonAgeSuppressionRuleFactory.build(),
                 ],
                 iteration_cohorts=[
@@ -502,7 +505,7 @@ def campaign_config_with_and_rule(s3_client: BaseClient, rules_bucket: BucketNam
                         cohort_group="cohort_group2",
                         positive_description="positive_description",
                         negative_description="negative_description",
-                    )
+                    ),
                 ],
             )
         ],

tests/integration/in_process/test_eligibility_endpoint.py

@@ -237,7 +237,6 @@ def test_actionable(
             ),
         )
 
-
     def test_actionable_with_and_rule(
         self,
         client: FlaskClient,
@@ -289,6 +288,7 @@ def test_actionable_with_and_rule(
             ),
         )
 
+
 class TestMagicCohortResponse:
     def test_not_eligible_by_rule_when_only_magic_cohort_is_present(
         self,

tests/unit/services/processors/test_rule_processor.py

@@ -150,26 +150,17 @@ def test_general_rule_should_not_evaluate_in_isolation_without_matching_specific
     rule_processor,
 ):
     # Person is in COHORT_B
-    cohort = rule_builder.IterationCohortFactory.build(
-        cohort_label="COHORT_B",
-        positive_description="Eligible"
-    )
+    cohort = rule_builder.IterationCohortFactory.build(cohort_label="COHORT_B", positive_description="Eligible")
     cohort_results = {}
 
     # Rule 1: cohort-specific to COHORT_A — should be filtered out
     rule_specific = rule_builder.IterationRuleFactory.build(
-        priority=510,
-        type=RuleType.suppression,
-        cohort_label="COHORT_A",
-        name="SPECIFIC_RULE"
+        priority=510, type=RuleType.suppression, cohort_label="COHORT_A", name="SPECIFIC_RULE"
     )
 
     # Rule 2: General rule
     rule_general = rule_builder.IterationRuleFactory.build(
-        priority=510,
-        type=RuleType.suppression,
-        cohort_label=None,
-        name="GENERAL_RULE"
+        priority=510, type=RuleType.suppression, cohort_label=None, name="GENERAL_RULE"
     )
 
     suppression_rules = [rule_specific, rule_general]
@@ -184,7 +175,6 @@ def test_general_rule_should_not_evaluate_in_isolation_without_matching_specific
     assert_that(cohort_results["COHORT_B"].status, is_(Status.actionable))
 
 
-
 @patch.object(RuleProcessor, "evaluate_rules_priority_group")
 @patch.object(RuleProcessor, "get_exclusion_rules", side_effect=lambda cohort, rules_to_filter: rules_to_filter)  # noqa: ARG005
 def test_is_eligible_by_filter_rules_eligible(
@@ -305,8 +295,8 @@ def test_evaluate_suppression_rules_stops_on_rule_stop(
     assert_that(cohort_results["COHORT_A"].status, is_(Status.not_actionable))
     assert_that(cohort_results["COHORT_A"].reasons, is_([mock_reason_p1]))
     assert_that(cohort_results["COHORT_A"].audit_rules, is_([mock_reason_p1]))
-    mock_evaluate_rules_priority_group.assert_called_once()
-    mock_get_exclusion_rules.assert_called_once_with(cohort, suppression_rules)
+    assert_that(mock_evaluate_rules_priority_group.call_count, is_(1))
+    mock_get_exclusion_rules.assert_called_once_with(cohort, [suppression_rule_p1])
 
 
 @patch.object(RuleProcessor, "evaluate_rules_priority_group")
@@ -338,7 +328,7 @@ def test_evaluate_suppression_rules_does_not_stop_on_rule_stop_when_status_is_ac
     assert_that(cohort_results["COHORT_A"].audit_rules, is_([mock_reason_p2]))
 
     assert_that(mock_evaluate_rules_priority_group.call_count, is_(2))
-    assert_that(mock_get_exclusion_rules.call_count, is_(1))
+    assert_that(mock_get_exclusion_rules.call_count, is_(2))
 
 
 def test_is_base_eligible(mock_person_data_reader):