Use attribute type "PERSON", not "PERSON#5123456789".

acerathereinspirative-nhs-nvir · acerathereinspirative-nhs-nvir · commit c804777a7e53 · 2025-04-11T11:10:02.000+01:00
diff --git a/src/eligibility_signposting_api/services/eligibility_services.py b/src/eligibility_signposting_api/services/eligibility_services.py
@@ -71,7 +71,7 @@ def get_attribute_value(iteration_rule: IterationRule, person_data: list[dict[st
         match iteration_rule.attribute_level:
             case RuleAttributeLevel.PERSON:
                 person: dict[str, Any] | None = next(
-                    (r for r in person_data if r.get("ATTRIBUTE_TYPE", "").startswith("PERSON")), None
+                    (r for r in person_data if r.get("ATTRIBUTE_TYPE", "") == "PERSON"), None
                 )
                 attribute_value = person.get(iteration_rule.attribute_name) if person else None
             case _:
diff --git a/tests/integration/conftest.py b/tests/integration/conftest.py
@@ -229,7 +229,7 @@ def persisted_person(eligibility_table: Any, faker: Faker) -> Generator[tuple[NH
     eligibility_table.put_item(
         Item={
             "NHS_NUMBER": f"PERSON#{nhs_number}",
-            "ATTRIBUTE_TYPE": f"PERSON#{nhs_number}",
+            "ATTRIBUTE_TYPE": "PERSON",
             "DATE_OF_BIRTH": date_of_birth.strftime("%Y%m%d"),
             "POSTCODE": postcode,
         }
@@ -238,7 +238,7 @@ def persisted_person(eligibility_table: Any, faker: Faker) -> Generator[tuple[NH
         Item={"NHS_NUMBER": f"PERSON#{nhs_number}", "ATTRIBUTE_TYPE": "COHORTS", "COHORT_MAP": {}}
     )
     yield nhs_number, date_of_birth, postcode
-    eligibility_table.delete_item(Key={"NHS_NUMBER": f"PERSON#{nhs_number}", "ATTRIBUTE_TYPE": f"PERSON#{nhs_number}"})
+    eligibility_table.delete_item(Key={"NHS_NUMBER": f"PERSON#{nhs_number}", "ATTRIBUTE_TYPE": "PERSON"})
     eligibility_table.delete_item(Key={"NHS_NUMBER": f"PERSON#{nhs_number}", "ATTRIBUTE_TYPE": "COHORTS"})
 
 
diff --git a/tests/integration/repo/test_eligibility_repo.py b/tests/integration/repo/test_eligibility_repo.py
@@ -23,7 +23,7 @@ def test_person_found(eligibility_table: Any, persisted_person: tuple[NHSNumber,
         contains_inanyorder(
             {
                 "NHS_NUMBER": f"PERSON#{nhs_number}",
-                "ATTRIBUTE_TYPE": f"PERSON#{nhs_number}",
+                "ATTRIBUTE_TYPE": "PERSON",
                 "DATE_OF_BIRTH": date_of_birth.strftime("%Y%m%d"),
                 "POSTCODE": postcode,
             },
diff --git a/tests/unit/services/test_eligibility_services.py b/tests/unit/services/test_eligibility_services.py
@@ -58,10 +58,11 @@ def test_simple_rule_eligible(faker: Faker):
         return_value=[
             {
                 "NHS_NUMBER": f"PERSON#{nhs_number}",
-                "ATTRIBUTE_TYPE": f"PERSON#{nhs_number}",
+                "ATTRIBUTE_TYPE": "PERSON",
                 "DATE_OF_BIRTH": date_of_birth.strftime("%Y%m%d"),
                 "POSTCODE": postcode,
-            }
+            },
+            {"NHS_NUMBER": f"PERSON#{nhs_number}", "ATTRIBUTE_TYPE": "COHORT", "COHORT_MAP": {}},
         ]
     )
     rules_repo.get_campaign_configs = MagicMock(
@@ -113,10 +114,11 @@ def test_simple_rule_ineligible(faker: Faker):
         return_value=[
             {
                 "NHS_NUMBER": f"PERSON#{nhs_number}",
-                "ATTRIBUTE_TYPE": f"PERSON#{nhs_number}",
+                "ATTRIBUTE_TYPE": "PERSON",
                 "DATE_OF_BIRTH": date_of_birth.strftime("%Y%m%d"),
                 "POSTCODE": postcode,
-            }
+            },
+            {"NHS_NUMBER": f"PERSON#{nhs_number}", "ATTRIBUTE_TYPE": "COHORT", "COHORT_MAP": {}},
         ]
     )
     rules_repo.get_campaign_configs = MagicMock(

Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ def get_attribute_value(iteration_rule: IterationRule, person_data: list[dict[st`
`71`	`71`	`match iteration_rule.attribute_level:`
`72`	`72`	`case RuleAttributeLevel.PERSON:`
`73`	`73`	`person: dict[str, Any] \| None = next(`
`74`		`- (r for r in person_data if r.get("ATTRIBUTE_TYPE", "").startswith("PERSON")), None`
	`74`	`+ (r for r in person_data if r.get("ATTRIBUTE_TYPE", "") == "PERSON"), None`
`75`	`75`	`)`
`76`	`76`	`attribute_value = person.get(iteration_rule.attribute_name) if person else None`
`77`	`77`	`case _:`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ def test_person_found(eligibility_table: Any, persisted_person: tuple[NHSNumber,`
`23`	`23`	`contains_inanyorder(`
`24`	`24`	`{`
`25`	`25`	`"NHS_NUMBER": f"PERSON#{nhs_number}",`
`26`		`- "ATTRIBUTE_TYPE": f"PERSON#{nhs_number}",`
	`26`	`+ "ATTRIBUTE_TYPE": "PERSON",`
`27`	`27`	`"DATE_OF_BIRTH": date_of_birth.strftime("%Y%m%d"),`
`28`	`28`	`"POSTCODE": postcode,`
`29`	`29`	`},`
Original file line number	Diff line number	Diff line change
`@@ -58,10 +58,11 @@ def test_simple_rule_eligible(faker: Faker):`
`58`	`58`	`return_value=[`
`59`	`59`	`{`
`60`	`60`	`"NHS_NUMBER": f"PERSON#{nhs_number}",`
`61`		`- "ATTRIBUTE_TYPE": f"PERSON#{nhs_number}",`
	`61`	`+ "ATTRIBUTE_TYPE": "PERSON",`
`62`	`62`	`"DATE_OF_BIRTH": date_of_birth.strftime("%Y%m%d"),`
`63`	`63`	`"POSTCODE": postcode,`
`64`		`- }`
	`64`	`+ },`
	`65`	`+ {"NHS_NUMBER": f"PERSON#{nhs_number}", "ATTRIBUTE_TYPE": "COHORT", "COHORT_MAP": {}},`
`65`	`66`	`]`
`66`	`67`	`)`
`67`	`68`	`rules_repo.get_campaign_configs = MagicMock(`
`@@ -113,10 +114,11 @@ def test_simple_rule_ineligible(faker: Faker):`
`113`	`114`	`return_value=[`
`114`	`115`	`{`
`115`	`116`	`"NHS_NUMBER": f"PERSON#{nhs_number}",`
`116`		`- "ATTRIBUTE_TYPE": f"PERSON#{nhs_number}",`
	`117`	`+ "ATTRIBUTE_TYPE": "PERSON",`
`117`	`118`	`"DATE_OF_BIRTH": date_of_birth.strftime("%Y%m%d"),`
`118`	`119`	`"POSTCODE": postcode,`
`119`		`- }`
	`120`	`+ },`
	`121`	`+ {"NHS_NUMBER": f"PERSON#{nhs_number}", "ATTRIBUTE_TYPE": "COHORT", "COHORT_MAP": {}},`
`120`	`122`	`]`
`121`	`123`	`)`
`122`	`124`	`rules_repo.get_campaign_configs = MagicMock(`