Injects person data reader and campaign processor into eligibility calculator

Author: shweta-nhs

src/eligibility_signposting_api/services/calculators/eligibility_calculator.py

@@ -8,6 +8,8 @@
 from typing import TYPE_CHECKING, Any
 
 from eligibility_signposting_api.audit.audit_context import AuditContext
+from eligibility_signposting_api.services.processors.campaign_evaluator import CampaignEvaluator
+from eligibility_signposting_api.services.processors.person_data_reader import PersonDataReader
 
 if TYPE_CHECKING:
     from eligibility_signposting_api.model.rules import (
@@ -58,42 +60,12 @@ class EligibilityCalculator:
     person_data: Row
     campaign_configs: Collection[rules.CampaignConfig]
 
-    results: list[eligibility_status.Condition] = field(default_factory=list)
-
-    @property
-    def active_campaigns(self) -> list[rules.CampaignConfig]:
-        return [cc for cc in self.campaign_configs if cc.campaign_live]
-
-    def campaigns_grouped_by_condition_name(
-        self, conditions: list[str], category: str
-    ) -> Iterator[tuple[eligibility_status.ConditionName, list[rules.CampaignConfig]]]:
-        """Generator that yields campaign groups filtered by condition names and campaign category."""
-
-        mapping = {
-            "ALL": {"V", "S"},
-            "VACCINATIONS": {"V"},
-            "SCREENING": {"S"},
-        }
-
-        allowed_types = mapping.get(category, set())
+    campaign_evaluator: CampaignEvaluator = field(default_factory=CampaignEvaluator)
+    person_data_reader: PersonDataReader = field(default_factory=PersonDataReader)
 
-        filter_all_conditions = "ALL" in conditions
+    results: list[eligibility_status.Condition] = field(default_factory=list)
 
-        for condition_name, campaign_group in groupby(
-            sorted(self.active_campaigns, key=attrgetter("target")),
-            key=attrgetter("target"),
-        ):
-            campaigns = list(campaign_group)
-            if campaigns[0].type in allowed_types and (filter_all_conditions or str(condition_name) in conditions):
-                yield condition_name, campaigns
 
-    @property
-    def person_cohorts(self) -> set[str]:
-        cohorts_row: Mapping[str, dict[str, dict[str, dict[str, Any]]]] = next(
-            (row for row in self.person_data if row.get("ATTRIBUTE_TYPE") == "COHORTS"),
-            {},
-        )
-        return set(cohorts_row.get("COHORT_MAP", {}).get("cohorts", {}).get("M", {}).keys())
 
     @staticmethod
     def get_the_best_cohort_memberships(
@@ -164,7 +136,10 @@ def evaluate_eligibility(
         actions: list[SuggestedAction] | None = []
         action_rule_priority, action_rule_name = None, None
 
-        for condition_name, campaign_group in self.campaigns_grouped_by_condition_name(conditions, category):
+        requested_grouped_campaigns = self.campaign_evaluator.get_requested_grouped_campaigns(self.campaign_configs,
+                                                                                              conditions,
+                                                                                              category)
+        for condition_name, campaign_group in requested_grouped_campaigns:
             best_active_iteration: Iteration | None
             best_candidate: IterationResult
             best_campaign_id: CampaignID | None
@@ -289,7 +264,8 @@ def get_cohort_results(self, active_iteration: rules.Iteration) -> dict[str, Coh
         filter_rules, suppression_rules = self.get_rules_by_type(active_iteration)
         for cohort in sorted(active_iteration.iteration_cohorts, key=attrgetter("priority")):
             # Base Eligibility - check
-            if cohort.cohort_label in self.person_cohorts or cohort.is_magic_cohort:
+            person_cohorts = self.person_data_reader.get_person_cohorts(self.person_data)
+            if cohort.cohort_label in person_cohorts or cohort.is_magic_cohort:
                 # Eligibility - check
                 if self.is_eligible_by_filter_rules(cohort, cohort_results, filter_rules):
                     # Actionability - evaluation

src/eligibility_signposting_api/services/calculators/rule_calculator.py

@@ -7,7 +7,7 @@
 from hamcrest.core.string_description import StringDescription
 
 from eligibility_signposting_api.model import eligibility_status, rules
-from eligibility_signposting_api.services.rules.operators import OperatorRegistry
+from eligibility_signposting_api.services.operators.operators import OperatorRegistry
 
 Row = Collection[Mapping[str, Any]]
 

…gnposting_api/services/rules/__init__.py …sting_api/services/operators/__init__.pysrc/eligibility_signposting_api/services/rules/__init__.py renamed to src/eligibility_signposting_api/services/operators/__init__.py src/eligibility_signposting_api/services/rules/__init__.py renamed to src/eligibility_signposting_api/services/operators/__init__.py

@@ -14,7 +14,7 @@ class CampaignEvaluator:
     def get_active_campaigns(self, campaign_configs: Collection[rules.CampaignConfig]) -> list[rules.CampaignConfig]:
         return [cc for cc in campaign_configs if cc.campaign_live]
 
-    def campaigns_grouped_by_condition_name(
+    def get_requested_grouped_campaigns(
         self, campaign_configs: Collection[rules.CampaignConfig], conditions: list[str], category: str
     ) -> Iterator[tuple[eligibility_status.ConditionName, list[rules.CampaignConfig]]]:
         mapping = {

…nposting_api/services/rules/operators.py …ting_api/services/operators/operators.pysrc/eligibility_signposting_api/services/rules/operators.py renamed to src/eligibility_signposting_api/services/operators/operators.py src/eligibility_signposting_api/services/rules/operators.py renamed to src/eligibility_signposting_api/services/operators/operators.py

@@ -5,7 +5,9 @@
 from polyfactory import Use
 from polyfactory.factories.pydantic_factory import ModelFactory
 
-from eligibility_signposting_api.model import rules
+from eligibility_signposting_api.model import rules, eligibility_status
+from eligibility_signposting_api.model.eligibility_status import Reason, RuleName, RuleType, RulePriority, \
+    RuleDescription
 
 
 def past_date(days_behind: int = 365) -> date:

src/eligibility_signposting_api/services/processors/__init__.py

@@ -2383,38 +2383,6 @@ def test_should_not_include_actions_when_include_actions_flag_is_false_when_stat
     )
 
 
-@pytest.mark.parametrize(
-    ("campaign_target", "campaign_type", "conditions_filter", "category_filter", "expected_result"),
-    [
-        # Multiple matching campaigns under the same condition
-        ("RSV", "V", ["RSV"], "VACCINATIONS", [("RSV", "V")]),
-        ("RSV", "V", ["COVID"], "VACCINATIONS", []),
-        ("RSV", "S", ["RSV"], "ALL", [("RSV", "S")]),
-        ("RSV", "S", ["ALL"], "ALL", [("RSV", "S")]),
-        ("RSV", "S", ["RSV"], "VACCINATIONS", []),
-        # Multiple campaigns with different types under the same condition name
-        ("RSV", "V", ["RSV"], "ALL", [("RSV", "V")]),
-        # Campaign is live but condition not in filter (no yield)
-        ("FLU", "V", ["COVID", "RSV"], "ALL", []),
-        # Category is ALL and condition filter includes ALL (everything matches)
-        ("FLU", "S", ["ALL"], "ALL", [("FLU", "S")]),
-        # Condition filter is unknown (should not match anything)
-        ("COVID", "V", ["UNKNOWN"], "VACCINATIONS", []),
-        # Campaign with the target matching one of several condition filters
-        ("FLU", "V", ["COVID", "FLU"], "VACCINATIONS", [("FLU", "V")]),
-    ],
-)
-def test_campaigns_grouped_by_condition_name_filters_correctly(
-    campaign_target, campaign_type, conditions_filter, category_filter, expected_result
-):
-    campaign = rule_builder.CampaignConfigFactory.build(target=campaign_target, type=campaign_type, campaign_live=True)
-
-    calculator = EligibilityCalculator(person_data=[], campaign_configs=[campaign])
-    result = list(calculator.campaigns_grouped_by_condition_name(conditions_filter, category_filter))
-
-    assert_that([(str(name), group[0].type) for name, group in result], is_(expected_result))
-
-
 @pytest.mark.parametrize(
     (
         "test_comment",

…sting_api/services/campaign_evaluator.py …ervices/processors/campaign_evaluator.pysrc/eligibility_signposting_api/services/campaign_evaluator.py renamed to src/eligibility_signposting_api/services/processors/campaign_evaluator.py src/eligibility_signposting_api/services/campaign_evaluator.py renamed to src/eligibility_signposting_api/services/processors/campaign_evaluator.py

@@ -3,7 +3,7 @@
 from hamcrest import assert_that, equal_to
 
 from eligibility_signposting_api.model.rules import RuleOperator
-from eligibility_signposting_api.services.rules.operators import Operator, OperatorRegistry
+from eligibility_signposting_api.services.operators.operators import Operator, OperatorRegistry
 
 # Test cases: person_data, rule_operator, rule_value, expected, test_comment
 cases: list[tuple[str | None, RuleOperator, str | None, bool, str]] = []