ELI-406: no person_data, so error response

src/eligibility_signposting_api/repos/person_repo.py

@@ -40,7 +40,9 @@ def get_eligibility_data(self, nhs_number: NHSNumber) -> Person:
         response = self.table.query(KeyConditionExpression=Key("NHS_NUMBER").eq(nhs_number))
         logger.debug("response %r for %r", response, nhs_number, extra={"response": response, "nhs_number": nhs_number})
 
-        if not (items := response.get("Items")):
+        if not (items := response.get("Items")) or not next(
+            (item for item in items if item.get("ATTRIBUTE_TYPE") == "PERSON"), None
+        ):
             message = f"Person not found with nhs_number {nhs_number}"
             raise NotFoundError(message)
 

tests/integration/conftest.py

@@ -422,6 +422,25 @@ def persisted_person_pc_sw19(person_table: Any, faker: Faker) -> Generator[eligi
         person_table.delete_item(Key={"NHS_NUMBER": row["NHS_NUMBER"], "ATTRIBUTE_TYPE": row["ATTRIBUTE_TYPE"]})
 
 
+@pytest.fixture
+def persisted_person_with_no_person_attribute_type(
+    person_table: Any, faker: Faker
+) -> Generator[eligibility_status.NHSNumber]:
+    nhs_number = eligibility_status.NHSNumber(faker.nhs_number())
+    date_of_birth = eligibility_status.DateOfBirth(faker.date_of_birth(minimum_age=18, maximum_age=65))
+
+    for row in (
+        rows := person_rows_builder(nhs_number, date_of_birth=date_of_birth, postcode="hp1", cohorts=["cohort1"]).data
+    ):
+        if row["ATTRIBUTE_TYPE"] != "PERSON":
+            person_table.put_item(Item=row)
+
+    yield nhs_number
+
+    for row in rows:
+        person_table.delete_item(Key={"NHS_NUMBER": row["NHS_NUMBER"], "ATTRIBUTE_TYPE": row["ATTRIBUTE_TYPE"]})
+
+
 @pytest.fixture(scope="session")
 def rules_bucket(s3_client: BaseClient) -> Generator[BucketName]:
     bucket_name = BucketName(os.getenv("RULES_BUCKET_NAME", "test-rules-bucket"))

tests/integration/repo/test_person_repo.py

@@ -28,11 +28,22 @@ def test_person_found(person_table: Any, persisted_person: NHSNumber):
     )
 
 
-def test_person_not_found(person_table: Any, faker: Faker):
+def test_items_not_found_raises_error(person_table: Any, faker: Faker):
     # Given
     nhs_number = NHSNumber(faker.nhs_number())
     repo = PersonRepo(person_table)
 
     # When, Then
     with pytest.raises(NotFoundError):
         repo.get_eligibility_data(nhs_number)
+
+
+def test_items_found_but_person_attribute_type_not_found_raises_error(
+    person_table: Any, persisted_person_with_no_person_attribute_type: NHSNumber
+):
+    # Given
+    repo = PersonRepo(person_table)
+
+    ## When, Then
+    with pytest.raises(NotFoundError):
+        repo.get_eligibility_data(persisted_person_with_no_person_attribute_type)