Use NewType for condition name.

Author: acerathereinspirative-nhs-nvir

src/eligibility_signposting_api/model/eligibility.py

@@ -6,6 +6,7 @@
 NHSNumber = NewType("NHSNumber", str)
 DateOfBirth = NewType("DateOfBirth", date)
 Postcode = NewType("Postcode", str)
+ConditionName = NewType("ConditionName", str)
 
 
 class Status(Enum):
@@ -16,7 +17,7 @@ class Status(Enum):
 
 @dataclass
 class Condition:
-    condition: str
+    condition_name: ConditionName
     status: Status
 
 

src/eligibility_signposting_api/services/eligibility_services.py

@@ -5,7 +5,7 @@
 from dateutil.relativedelta import relativedelta
 from wireup import service
 
-from eligibility_signposting_api.model.eligibility import Condition, EligibilityStatus, NHSNumber, Status
+from eligibility_signposting_api.model.eligibility import Condition, ConditionName, EligibilityStatus, NHSNumber, Status
 from eligibility_signposting_api.model.rules import CampaignConfig, IterationRule, RuleAttributeLevel, RuleOperator
 from eligibility_signposting_api.repos import EligibilityRepo, NotFoundError, RulesRepo
 
@@ -49,10 +49,11 @@ def get_eligibility_status(self, nhs_number: NHSNumber | None = None) -> Eligibi
     def evaluate_eligibility(
         campaign_configs: list[CampaignConfig], person_data: list[dict[str, Any]]
     ) -> EligibilityStatus:
-        conditions: dict[str, Condition] = {}
+        conditions: dict[ConditionName, Condition] = {}
         for campaign_config in campaign_configs:
+            condition_name = ConditionName(campaign_config.target)
             condition = conditions.setdefault(
-                campaign_config.target, Condition(condition=campaign_config.target, status=Status.actionable)
+                condition_name, Condition(condition_name=condition_name, status=Status.actionable)
             )
             for iteration_rule in [
                 iteration_rule

src/eligibility_signposting_api/views/eligibility.py

@@ -49,7 +49,7 @@ def build_eligibility_response(eligibility_status: EligibilityStatus) -> Eligibi
     return EligibilityResponse(  # pyright: ignore[reportCallIssue]
         processed_suggestions=[  # pyright: ignore[reportCallIssue]
             ProcessedSuggestion(  # pyright: ignore[reportCallIssue]
-                condition=condition.condition,
+                condition=condition.condition_name,
                 status=STATUS_MAPPING[condition.status],
                 status_text=f"{condition.status}",  # pyright: ignore[reportCallIssue]
                 eligibility_cohorts=[],  # pyright: ignore[reportCallIssue]

tests/unit/services/test_eligibility_services.py

@@ -6,7 +6,7 @@
 from faker import Faker
 from hamcrest import assert_that, empty, has_item
 
-from eligibility_signposting_api.model.eligibility import DateOfBirth, NHSNumber, Postcode, Status
+from eligibility_signposting_api.model.eligibility import ConditionName, DateOfBirth, NHSNumber, Postcode, Status
 from eligibility_signposting_api.model.rules import RuleAttributeLevel, RuleOperator, RuleType
 from eligibility_signposting_api.repos import EligibilityRepo, NotFoundError, RulesRepo
 from eligibility_signposting_api.services import EligibilityService, UnknownPersonError
@@ -101,7 +101,7 @@ def test_simple_rule_eligible(faker: Faker):
     assert_that(
         actual,
         is_eligibility_status().with_conditions(
-            has_item(is_condition().with_condition("RSV").and_status(Status.actionable))
+            has_item(is_condition().with_condition_name(ConditionName("RSV")).and_status(Status.actionable))
         ),
     )
 
@@ -162,7 +162,7 @@ def test_simple_rule_ineligible(faker: Faker):
     assert_that(
         actual,
         is_eligibility_status().with_conditions(
-            has_item(is_condition().with_condition("RSV").and_status(Status.not_actionable))
+            has_item(is_condition().with_condition_name(ConditionName("RSV")).and_status(Status.not_actionable))
         ),
     )