ELI-578 unit test fixed

Author: Karthikeyannhs

src/eligibility_signposting_api/model/consumer_mapping.py

@@ -6,6 +6,7 @@
 
 ConsumerId = NewType("ConsumerId", str)
 
+
 class ConsumerMapping(RootModel[dict[ConsumerId, list[CampaignID]]]):
     def get(self, key: ConsumerId, default: list[CampaignID] | None = None) -> list[CampaignID] | None:
         return self.root.get(key, default)

src/eligibility_signposting_api/repos/consumer_mapping_repo.py

@@ -5,7 +5,7 @@
 from wireup import Inject, service
 
 from eligibility_signposting_api.model.campaign_config import CampaignID
-from eligibility_signposting_api.model.consumer_mapping import ConsumerMapping, ConsumerId
+from eligibility_signposting_api.model.consumer_mapping import ConsumerId, ConsumerMapping
 
 BucketName = NewType("BucketName", str)
 

src/eligibility_signposting_api/services/eligibility_services.py

@@ -4,6 +4,7 @@
 
 from eligibility_signposting_api.model import eligibility_status
 from eligibility_signposting_api.model.campaign_config import CampaignConfig
+from eligibility_signposting_api.model.consumer_mapping import ConsumerId
 from eligibility_signposting_api.repos import CampaignRepo, NotFoundError, PersonRepo
 from eligibility_signposting_api.repos.consumer_mapping_repo import ConsumerMappingRepo
 from eligibility_signposting_api.services.calculators import eligibility_calculator as calculator
@@ -46,18 +47,27 @@ def get_eligibility_status(
         if nhs_number:
             try:
                 person_data = self.person_repo.get_eligibility_data(nhs_number)
-                campaign_configs = list(self.campaign_repo.get_campaign_configs())
-                permitted_campaign_ids = self.consumer_mapping.get_permitted_campaign_ids(consumer_id)
-                permitted_campaign_configs: list[CampaignConfig] = [
-                    campaign for campaign in campaign_configs
-                    if campaign.id in permitted_campaign_ids
-                ]
-
             except NotFoundError as e:
                 raise UnknownPersonError from e
             else:
-                calc: calculator.EligibilityCalculator = self.calculator_factory.get(person_data,
-                                                                                     permitted_campaign_configs)
+                campaign_configs: list[CampaignConfig] = list(self.campaign_repo.get_campaign_configs())
+                permitted_campaign_configs = self.__collect_permitted_campaign_configs(
+                    campaign_configs, ConsumerId(consumer_id)
+                )
+                calc: calculator.EligibilityCalculator = self.calculator_factory.get(
+                    person_data, permitted_campaign_configs
+                )
                 return calc.get_eligibility_status(include_actions, conditions, category)
 
         raise UnknownPersonError  # pragma: no cover
+
+    def __collect_permitted_campaign_configs(
+        self, campaign_configs: list[CampaignConfig], consumer_id: ConsumerId
+    ) -> list[CampaignConfig]:
+        permitted_campaign_ids = self.consumer_mapping.get_permitted_campaign_ids(ConsumerId(consumer_id))
+        if permitted_campaign_ids:
+            permitted_campaign_configs: list[CampaignConfig] = [
+                campaign for campaign in campaign_configs if campaign.id in permitted_campaign_ids
+            ]
+            return permitted_campaign_configs
+        return []

tests/fixtures/builders/model/rule.py

@@ -93,7 +93,7 @@ class IterationFactory(ModelFactory[Iteration]):
 
 class RawCampaignConfigFactory(ModelFactory[CampaignConfig]):
     iterations = Use(IterationFactory.batch, size=2)
-    id         = "42-hi5tch-hi5kers-gu5ide-t2o-t3he-gal6axy"
+    id = "42-hi5tch-hi5kers-gu5ide-t2o-t3he-gal6axy"
     start_date = Use(past_date)
     end_date = Use(future_date)
 

tests/integration/conftest.py

@@ -21,16 +21,17 @@
 from eligibility_signposting_api.model.campaign_config import (
     AvailableAction,
     CampaignConfig,
+    CampaignID,
     EndDate,
     RuleCode,
     RuleEntry,
     RuleName,
     RuleText,
     RuleType,
     StartDate,
-    StatusText, CampaignID,
+    StatusText,
 )
-from eligibility_signposting_api.model.consumer_mapping import ConsumerMapping, ConsumerId
+from eligibility_signposting_api.model.consumer_mapping import ConsumerId, ConsumerMapping
 from eligibility_signposting_api.processors.hashing_service import HashingService, HashSecretName
 from eligibility_signposting_api.repos import SecretRepo
 from eligibility_signposting_api.repos.campaign_repo import BucketName
@@ -727,19 +728,21 @@ 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 consumer_mapping(s3_client: BaseClient, consumer_mapping_bucket: BucketName) -> Generator[ConsumerMapping]:
     consumer_mapping = ConsumerMapping.model_validate({})
-    consumer_mapping.root[ConsumerId("23-mic7heal-jor6don")] = [
-        CampaignID("42-hi5tch-hi5kers-gu5ide-t2o-t3he-gal6axy")
-    ]
+    consumer_mapping.root[ConsumerId("23-mic7heal-jor6don")] = [CampaignID("42-hi5tch-hi5kers-gu5ide-t2o-t3he-gal6axy")]
 
     consumer_mapping_data = consumer_mapping.model_dump(by_alias=True)
     s3_client.put_object(
-        Bucket=consumer_mapping_bucket, Key=f"consumer_mapping.json", Body=json.dumps(consumer_mapping_data), ContentType="application/json"
+        Bucket=consumer_mapping_bucket,
+        Key="consumer_mapping.json",
+        Body=json.dumps(consumer_mapping_data),
+        ContentType="application/json",
     )
     yield consumer_mapping
-    s3_client.delete_object(Bucket=consumer_mapping_bucket, Key=f"consumer_mapping.json")
+    s3_client.delete_object(Bucket=consumer_mapping_bucket, Key="consumer_mapping.json")
 
 
 @pytest.fixture

tests/integration/in_process/test_eligibility_endpoint.py

@@ -30,8 +30,7 @@ def test_nhs_number_given(
         secretsmanager_client: BaseClient,  # noqa: ARG002
     ):
         # Given
-        headers = {"nhs-login-nhs-number": str(persisted_person),
-                   "Consumer-ID": "23-mic7heal-jor6don"}
+        headers = {"nhs-login-nhs-number": str(persisted_person), "Consumer-ID": "23-mic7heal-jor6don"}
 
         # When
         response = client.get(f"/patient-check/{persisted_person}", headers=headers)

tests/unit/services/test_eligibility_services.py

@@ -14,10 +14,10 @@
 def test_eligibility_service_returns_from_repo():
     # Given
     person_repo = MagicMock(spec=PersonRepo)
-    consumer_mapping_repo = MagicMock(spec=ConsumerMappingRepo)
     campaign_repo = MagicMock(spec=CampaignRepo)
+    consumer_mapping_repo = MagicMock(spec=ConsumerMappingRepo)
     person_repo.get_eligibility = MagicMock(return_value=[])
-    service = EligibilityService(person_repo, campaign_repo, EligibilityCalculatorFactory(), consumer_mapping_repo)
+    service = EligibilityService(person_repo, campaign_repo, consumer_mapping_repo, EligibilityCalculatorFactory())
 
     # When
     actual = service.get_eligibility_status(
@@ -32,9 +32,16 @@ def test_eligibility_service_for_nonexistent_nhs_number():
     # Given
     person_repo = MagicMock(spec=PersonRepo)
     campaign_repo = MagicMock(spec=CampaignRepo)
+    consumer_mapping_repo = MagicMock(spec=ConsumerMappingRepo)
     person_repo.get_eligibility_data = MagicMock(side_effect=NotFoundError)
-    service = EligibilityService(person_repo, campaign_repo, EligibilityCalculatorFactory())
+    service = EligibilityService(person_repo, campaign_repo, consumer_mapping_repo, EligibilityCalculatorFactory())
 
     # When
     with pytest.raises(UnknownPersonError):
-        service.get_eligibility_status(NHSNumber("1234567890"), include_actions="Y", conditions=["ALL"], category="ALL")
+        service.get_eligibility_status(
+            NHSNumber("1234567890"),
+            include_actions="Y",
+            conditions=["ALL"],
+            category="ALL",
+            consumer_id="test_consumer_id",
+        )

tests/unit/views/test_eligibility.py

@@ -60,6 +60,7 @@ def get_eligibility_status(
         _include_actions: str,
         _conditions: list[str],
         _category: str,
+        _consumer_id: str,
     ) -> EligibilityStatus:
         return EligibilityStatusFactory.build()
 
@@ -74,6 +75,7 @@ def get_eligibility_status(
         _include_actions: str,
         _conditions: list[str],
         _category: str,
+        _consumer_id: str,
     ) -> EligibilityStatus:
         raise UnknownPersonError
 
@@ -100,7 +102,7 @@ def test_security_headers_present_on_successful_response(app: Flask, client: Fla
         get_app_container(app).override.service(AuditService, new=FakeAuditService()),
     ):
         # When
-        headers = {"nhs-login-nhs-number": "9876543210"}
+        headers = {"nhs-login-nhs-number": "9876543210", "Consumer-Id": "test_consumer_id"}
         response = client.get("/patient-check/9876543210", headers=headers)
 
         # Then