changed grouping from name to priority, type

Author: Karthikeyannhs

src/eligibility_signposting_api/services/calculators/eligibility_calculator.py

@@ -28,8 +28,8 @@
     from eligibility_signposting_api.model.campaign_config import (
         CampaignConfig,
         CohortLabel,
-        IterationName, RuleType,
-)
+        IterationName,
+    )
     from eligibility_signposting_api.model.person import Person
 
 logger = logging.getLogger(__name__)
@@ -161,12 +161,13 @@ def build_condition_results(iteration_result: IterationResult, condition_name: C
 
         for group_cohort_code, group in grouped_cohort_results.items():
             if group:
-                unique_rule_codes = set()
+                unique_reasons = set()
                 deduplicated_reasons = []
                 for cohort in group:
                     for reason in cohort.reasons:
-                        if reason.rule_priority not in unique_rule_codes and reason.rule_description:
-                            unique_rule_codes.add(reason.rule_priority)
+                        key = (reason.rule_type, reason.rule_priority)
+                        if key not in unique_reasons:
+                            unique_reasons.add(key)
                             deduplicated_reasons.append(reason)
 
                 non_empty_description = next((c.description for c in group if c.description), group[0].description)

tests/unit/services/calculators/test_eligibility_calculator.py

@@ -735,14 +735,14 @@ def test_build_condition_results_single_condition_single_cohort_not_eligible_wit
 
     def test_build_condition_results_single_condition_multiple_cohorts_same_cohort_code_same_status(self):
         reason_1 = Reason(
-            RuleType.filter,
+            RuleType.suppression,
             eligibility_status.RuleName("Filter Rule 1"),
             RulePriority("1"),
             RuleDescription("Filter Rule Description 2"),
             matcher_matched=True,
         )
         reason_2 = Reason(
-            RuleType.filter,
+            RuleType.suppression,
             eligibility_status.RuleName("Filter Rule 2"),
             RulePriority("2"),
             RuleDescription("Filter Rule Description 2"),
@@ -779,14 +779,14 @@ def test_build_condition_results_single_condition_multiple_cohorts_same_cohort_c
 
     def test_build_condition_results_multiple_cohorts_different_cohort_code_same_status(self):
         reason_1 = Reason(
-            RuleType.filter,
+            RuleType.suppression,
             eligibility_status.RuleName("Filter Rule 1"),
             RulePriority("1"),
             RuleDescription("Filter Rule Description 2"),
             matcher_matched=True,
         )
         reason_2 = Reason(
-            RuleType.filter,
+            RuleType.suppression,
             eligibility_status.RuleName("Filter Rule 2"),
             RulePriority("2"),
             RuleDescription("Filter Rule Description 2"),
@@ -820,14 +820,14 @@ def test_build_condition_results_multiple_cohorts_different_cohort_code_same_sta
 
     def test_build_condition_results_cohorts_status_not_matching_iteration_status(self):
         reason_1 = Reason(
-            RuleType.filter,
+            RuleType.suppression,
             eligibility_status.RuleName("Filter Rule 1"),
             RulePriority("1"),
             RuleDescription("Matching"),
             matcher_matched=True,
         )
         reason_2 = Reason(
-            RuleType.filter,
+            RuleType.suppression,
             eligibility_status.RuleName("Filter Rule 2"),
             RulePriority("2"),
             RuleDescription("Not matching"),
@@ -849,7 +849,7 @@ def test_build_condition_results_cohorts_status_not_matching_iteration_status(se
     @pytest.mark.parametrize(
         ("reason_2", "expected_reasons"),
         [
-            # Same rule name and priority, different description
+            # Same rule name , type, and priority, different description
             (
                 Reason(
                     RuleType.suppression,
@@ -868,7 +868,7 @@ def test_build_condition_results_cohorts_status_not_matching_iteration_status(se
                     )
                 ],
             ),
-            # Different rule name, same priority
+            # Different rule name, same type, same priority
             (
                 Reason(
                     RuleType.suppression,
@@ -887,7 +887,7 @@ def test_build_condition_results_cohorts_status_not_matching_iteration_status(se
                     )
                 ],
             ),
-            # Same rule name, different priority
+            # Same rule name, same type, different priority
             (
                 Reason(
                     RuleType.suppression,
@@ -913,6 +913,32 @@ def test_build_condition_results_cohorts_status_not_matching_iteration_status(se
                     ),
                 ],
             ),
+            # Same rule name, same priority, different type
+            (
+                Reason(
+                    RuleType.filter,
+                    eligibility_status.RuleName("Supress Rule 1"),
+                    RulePriority("2"),
+                    RuleDescription("Matching"),
+                    matcher_matched=True,
+                ),
+                [  # Both reasons expected
+                    Reason(
+                        RuleType.suppression,
+                        eligibility_status.RuleName("Supress Rule 1"),
+                        RulePriority("1"),
+                        RuleDescription("Not matching"),
+                        matcher_matched=True,
+                    ),
+                    Reason(
+                        RuleType.filter,
+                        eligibility_status.RuleName("Supress Rule 1"),
+                        RulePriority("2"),
+                        RuleDescription("Matching"),
+                        matcher_matched=True,
+                    ),
+                ],
+            ),
         ],
     )
     def test_build_condition_results_grouping_reasons(self, reason_2, expected_reasons):