changed grouping from name to priority

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,
-    )
+        IterationName, RuleType,
+)
     from eligibility_signposting_api.model.person import Person
 
 logger = logging.getLogger(__name__)
@@ -165,8 +165,8 @@ def build_condition_results(iteration_result: IterationResult, condition_name: C
                 deduplicated_reasons = []
                 for cohort in group:
                     for reason in cohort.reasons:
-                        if reason.rule_name not in unique_rule_codes and reason.rule_description:
-                            unique_rule_codes.add(reason.rule_name)
+                        if reason.rule_priority not in unique_rule_codes and reason.rule_description:
+                            unique_rule_codes.add(reason.rule_priority)
                             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

@@ -845,3 +845,98 @@ def test_build_condition_results_cohorts_status_not_matching_iteration_status(se
         assert_that(len(result.cohort_results), is_(1))
         assert_that(result.cohort_results[0].cohort_code, is_("COHORT_X"))
         assert_that(result.cohort_results[0].status, is_(Status.not_eligible))
+
+    @pytest.mark.parametrize(
+        ("reason_2", "expected_reasons"),
+        [
+            # Same rule name and priority, different description
+            (
+                Reason(
+                    RuleType.suppression,
+                    eligibility_status.RuleName("Supress Rule 1"),
+                    RulePriority("1"),
+                    RuleDescription("Matching"),
+                    matcher_matched=True,
+                ),
+                [  # Only reason_1 expected
+                    Reason(
+                        RuleType.suppression,
+                        eligibility_status.RuleName("Supress Rule 1"),
+                        RulePriority("1"),
+                        RuleDescription("Not matching"),
+                        matcher_matched=True,
+                    )
+                ],
+            ),
+            # Different rule name, same priority
+            (
+                Reason(
+                    RuleType.suppression,
+                    eligibility_status.RuleName("Supress Rule 2"),
+                    RulePriority("1"),
+                    RuleDescription("Matching"),
+                    matcher_matched=True,
+                ),
+                [  # Only reason_1 expected
+                    Reason(
+                        RuleType.suppression,
+                        eligibility_status.RuleName("Supress Rule 1"),
+                        RulePriority("1"),
+                        RuleDescription("Not matching"),
+                        matcher_matched=True,
+                    )
+                ],
+            ),
+            # Same rule name, different priority
+            (
+                Reason(
+                    RuleType.suppression,
+                    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.suppression,
+                        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):
+        reason_1 = Reason(
+            RuleType.suppression,
+            eligibility_status.RuleName("Supress Rule 1"),
+            RulePriority("1"),
+            RuleDescription("Not matching"),
+            matcher_matched=True,
+        )
+
+        cohort_group_results = [
+            CohortGroupResult(
+                "COHORT_Y",
+                Status.not_actionable,
+                [reason_1, reason_2],
+                "Cohort Y Description",
+                [],
+            )
+        ]
+
+        iteration_result = IterationResult(Status.not_actionable, cohort_group_results, [])
+
+        result = EligibilityCalculator.build_condition_results(iteration_result, ConditionName("RSV"))
+
+        assert_that(len(result.cohort_results), is_(1))
+        assert_that(result.cohort_results[0].reasons, contains_inanyorder(*expected_reasons))