test for cohort description

Author: Karthikeyannhs

tests/fixtures/builders/model/rule.py

@@ -71,6 +71,7 @@ def fix_iteration_date_invariants(iterations: list[rules.Iteration], start_date:
             iteration.iteration_date = current
             previous = current
 
+
 # Iteration cohort factories
 class Rsv75RollingCohortFactory(IterationCohortFactory):
     cohort_label = rules.CohortLabel("rsv_75_rolling")
@@ -79,20 +80,23 @@ class Rsv75RollingCohortFactory(IterationCohortFactory):
     negative_description = rules.Description("rsv_age_range negative description")
     priority = 1
 
+
 class Rsv75to79CohortFactory(IterationCohortFactory):
     cohort_label = rules.CohortLabel("rsv_75to79_2024")
     cohort_group = rules.CohortGroup("rsv_age_range")
     positive_description = rules.Description("rsv_age_range positive description")
     negative_description = rules.Description("rsv_age_range negative description")
     priority = 1
 
+
 class RsvPretendClinicalCohortFactory(IterationCohortFactory):
     cohort_label = rules.CohortLabel("rsv_pretend_clinical_cohort")
     cohort_group = rules.CohortGroup("rsv_clinical_cohort")
     positive_description = rules.Description("rsv_clinical_cohort positive description")
     negative_description = rules.Description("rsv_clinical_cohort negative description")
     priority = 1
 
+
 # Iteration rule factories
 class PersonAgeSuppressionRuleFactory(IterationRuleFactory):
     type = rules.RuleType.suppression
@@ -125,15 +129,3 @@ class ICBSuppressionRuleFactory(IterationRuleFactory):
     attribute_level = rules.RuleAttributeLevel.PERSON
     attribute_name = rules.RuleAttributeName("ICB")
     comparator = rules.RuleComparator("QE1")
-
-
-class ICBSuppressionRuleFactory(IterationRuleFactory):
-    type = rules.RuleType.filter
-    name = rules.RuleName("Not in QE1")
-    description = rules.RuleDescription("Not in QE1")
-    priority = rules.RulePriority(10)
-    operator = rules.RuleOperator.ne
-    attribute_level = rules.RuleAttributeLevel.PERSON
-    attribute_name = rules.RuleAttributeName("ICB")
-    comparator = rules.RuleComparator("QE1")
-

tests/unit/services/calculators/test_eligibility_calculator.py

@@ -18,8 +18,6 @@
 )
 from eligibility_signposting_api.services.calculators.eligibility_calculator import EligibilityCalculator
 from tests.fixtures.builders.model import rule as rule_builder
-from tests.fixtures.builders.model.rule import Rsv75RollingCohortFactory, Rsv75to79CohortFactory, \
-    RsvPretendClinicalCohortFactory
 from tests.fixtures.builders.repos.person import person_rows_builder
 from tests.fixtures.matchers.eligibility import (
     is_cohort_result,
@@ -1024,37 +1022,14 @@ def test_eligibility_results_when_multiple_cohorts(
     )
 
 
-@pytest.mark.parametrize(
-    ("person_cohorts", "expected_cohort_results", "test_comment"),
-    [
-        (
-            ["rsv_75_rolling"],
-            ["rsv_age_range"],
-            "rsv_75_rolling is actionable, others are not-eligible",
-        ),
-        (
-            ["rsv_75_rolling", "rsv_75to79_2024"],
-            ["rsv_age_range"],
-            "rsv_75_rolling, rsv_75to79_2024 is actionable, rsv_pretend_clinical_cohort are not-eligible",
-        ),
-        (
-            ["rsv_75_rolling", "rsv_75to79_2024", "rsv_pretend_clinical_cohort"],
-            ["rsv_age_range", "rsv_clinical_cohort"],
-            "all are actionable",
-        ),
-    ],
-)
-def test_grouped_description_for_multiple_clinical_risk_cohort_if_best_status_is_actionable(
-    person_cohorts: list[str],
-    expected_cohort_results: list[str],
-    test_comment: str,
+def test_grouped_description_for_multiple_clinical_risk_cohort_if_best_status_is_not_eligible(
     faker: Faker,
 ):
     # Given
     nhs_number = NHSNumber(faker.nhs_number())
     date_of_birth = DateOfBirth(faker.date_of_birth(minimum_age=66, maximum_age=74))
 
-    person_rows = person_rows_builder(nhs_number, date_of_birth=date_of_birth, cohorts=person_cohorts, postcode="hp")
+    person_rows = person_rows_builder(nhs_number, date_of_birth=date_of_birth, cohorts=[])
     campaign_configs = [
         rule_builder.CampaignConfigFactory.build(
             target="RSV",
@@ -1063,7 +1038,7 @@ def test_grouped_description_for_multiple_clinical_risk_cohort_if_best_status_is
                     iteration_cohorts=[
                         rule_builder.Rsv75RollingCohortFactory.build(),
                         rule_builder.Rsv75to79CohortFactory.build(),
-                        rule_builder.RsvPretendClinicalCohortFactory.build()
+                        rule_builder.RsvPretendClinicalCohortFactory.build(),
                     ],
                     iteration_rules=[rule_builder.PostcodeSuppressionRuleFactory.build()],
                 )
@@ -1083,39 +1058,48 @@ def test_grouped_description_for_multiple_clinical_risk_cohort_if_best_status_is
             has_items(
                 is_condition()
                 .with_condition_name(ConditionName("RSV"))
-                .and_status(Status.actionable)
+                .and_status(Status.not_eligible)
                 .and_cohort_results(
-                    contains_exactly(*[is_cohort_result().with_cohort_code(code) for code in expected_cohort_results])
+                    contains_exactly(
+                        is_cohort_result()
+                        .with_cohort_code("rsv_age_range")
+                        .with_description("rsv_age_range negative description"),
+                        is_cohort_result()
+                        .with_cohort_code("rsv_clinical_cohort")
+                        .with_description("rsv_clinical_cohort negative description"),
+                    )
                 )
             )
         ),
-        test_comment,
     )
 
 
 @pytest.mark.parametrize(
-    ("person_cohorts", "expected_cohort_results", "test_comment"),
+    ("person_cohorts", "expected_cohort_group_and_description", "test_comment"),
     [
         (
             ["rsv_75_rolling"],
-            ["rsv_age_range"],
+            [("rsv_age_range", "rsv_age_range positive description")],
             "rsv_75_rolling is not-actionable, others are not-eligible",
         ),
         (
             ["rsv_75_rolling", "rsv_75to79_2024"],
-            ["rsv_age_range"],
+            [("rsv_age_range", "rsv_age_range positive description")],
             "rsv_75_rolling, rsv_75to79_2024 is not-actionable, rsv_pretend_clinical_cohort are not-eligible",
         ),
         (
             ["rsv_75_rolling", "rsv_75to79_2024", "rsv_pretend_clinical_cohort"],
-            ["rsv_age_range", "rsv_clinical_cohort"],
+            [
+                ("rsv_age_range", "rsv_age_range positive description"),
+                ("rsv_clinical_cohort", "rsv_clinical_cohort positive description"),
+            ],
             "all are not-actionable",
         ),
     ],
 )
 def test_grouped_description_for_multiple_clinical_risk_cohort_if_best_status_is_not_actionable(
     person_cohorts: list[str],
-    expected_cohort_results: list[str],
+    expected_cohort_group_and_description: list[tuple[str, str]],
     test_comment: str,
     faker: Faker,
 ):
@@ -1132,7 +1116,7 @@ def test_grouped_description_for_multiple_clinical_risk_cohort_if_best_status_is
                     iteration_cohorts=[
                         rule_builder.Rsv75RollingCohortFactory.build(),
                         rule_builder.Rsv75to79CohortFactory.build(),
-                        rule_builder.RsvPretendClinicalCohortFactory.build()
+                        rule_builder.RsvPretendClinicalCohortFactory.build(),
                     ],
                     iteration_rules=[rule_builder.PostcodeSuppressionRuleFactory.build()],
                 )
@@ -1154,22 +1138,53 @@ def test_grouped_description_for_multiple_clinical_risk_cohort_if_best_status_is
                 .with_condition_name(ConditionName("RSV"))
                 .and_status(Status.not_actionable)
                 .and_cohort_results(
-                    contains_exactly(*[is_cohort_result().with_cohort_code(code) for code in expected_cohort_results])
-                )
+                    contains_exactly(
+                        *[
+                            is_cohort_result().with_cohort_code(item[0]).with_description(item[1])
+                            for item in expected_cohort_group_and_description
+                        ]
+                    )
+                ),
             )
         ),
         test_comment,
     )
 
 
-def test_grouped_description_for_multiple_clinical_risk_cohort_if_best_status_is_not_eligible(
+@pytest.mark.parametrize(
+    ("person_cohorts", "expected_cohort_group_and_description", "test_comment"),
+    [
+        (
+            ["rsv_75_rolling"],
+            [("rsv_age_range", "rsv_age_range positive description")],
+            "rsv_75_rolling is actionable, others are not-eligible",
+        ),
+        (
+            ["rsv_75_rolling", "rsv_75to79_2024"],
+            [("rsv_age_range", "rsv_age_range positive description")],
+            "rsv_75_rolling, rsv_75to79_2024 is actionable, rsv_pretend_clinical_cohort are not-eligible",
+        ),
+        (
+            ["rsv_75_rolling", "rsv_75to79_2024", "rsv_pretend_clinical_cohort"],
+            [
+                ("rsv_age_range", "rsv_age_range positive description"),
+                ("rsv_clinical_cohort", "rsv_clinical_cohort positive description"),
+            ],
+            "all are actionable",
+        ),
+    ],
+)
+def test_grouped_description_for_multiple_clinical_risk_cohort_if_best_status_is_actionable(
+    person_cohorts: list[str],
+    expected_cohort_group_and_description: list[tuple[str, str]],
+    test_comment: str,
     faker: Faker,
 ):
     # Given
     nhs_number = NHSNumber(faker.nhs_number())
     date_of_birth = DateOfBirth(faker.date_of_birth(minimum_age=66, maximum_age=74))
 
-    person_rows = person_rows_builder(nhs_number, date_of_birth=date_of_birth, cohorts=[])
+    person_rows = person_rows_builder(nhs_number, date_of_birth=date_of_birth, cohorts=person_cohorts, postcode="hp")
     campaign_configs = [
         rule_builder.CampaignConfigFactory.build(
             target="RSV",
@@ -1178,7 +1193,7 @@ def test_grouped_description_for_multiple_clinical_risk_cohort_if_best_status_is
                     iteration_cohorts=[
                         rule_builder.Rsv75RollingCohortFactory.build(),
                         rule_builder.Rsv75to79CohortFactory.build(),
-                        rule_builder.RsvPretendClinicalCohortFactory.build()
+                        rule_builder.RsvPretendClinicalCohortFactory.build(),
                     ],
                     iteration_rules=[rule_builder.PostcodeSuppressionRuleFactory.build()],
                 )
@@ -1198,15 +1213,16 @@ def test_grouped_description_for_multiple_clinical_risk_cohort_if_best_status_is
             has_items(
                 is_condition()
                 .with_condition_name(ConditionName("RSV"))
-                .and_status(Status.not_eligible)
+                .and_status(Status.actionable)
                 .and_cohort_results(
                     contains_exactly(
                         *[
-                            is_cohort_result().with_cohort_code(code)
-                            for code in ["rsv_age_range", "rsv_clinical_cohort"]
+                            is_cohort_result().with_cohort_code(item[0]).with_description(item[1])
+                            for item in expected_cohort_group_and_description
                         ]
                     )
                 )
             )
         ),
+        test_comment,
     )