[NDR-348] Initial split of search e2e tests

lambdas/tests/e2e/api/fhir/conftest.py

@@ -175,3 +175,24 @@ def retrieve_document_with_retry(doc_id, condition):
     }
     session = create_mtls_session()
     return fetch_with_retry_mtls(session, retrieve_url, headers, condition)
+
+
+def search_document_reference(
+    nhs_number,
+    client_cert_path=None,
+    client_key_path=None,
+    resource_type="DocumentReference",
+):
+    """Helper to perform search by NHS number with optional mTLS certs."""
+    url = f"https://{MTLS_ENDPOINT}/{resource_type}?subject:identifier=https://fhir.nhs.uk/Id/nhs-number|{nhs_number}"
+    headers = {
+        "X-Correlation-Id": "1234",
+    }
+
+    # Use provided certs if available, else defaults
+    if client_cert_path and client_key_path:
+        session = create_mtls_session(client_cert_path, client_key_path)
+    else:
+        session = create_mtls_session()
+
+    return session.get(url, headers=headers)

lambdas/tests/e2e/api/fhir/test_search_document_fhir_api_failure.py

@@ -0,0 +1,32 @@
+import pytest
+
+from tests.e2e.api.fhir.conftest import (
+    search_document_reference,
+)
+from tests.e2e.helpers.data_helper import PdmDataHelper
+
+pdm_data_helper = PdmDataHelper()
+
+
+@pytest.mark.parametrize(
+    "nhs_number,expected_status,expected_code,expected_diagnostics",
+    [
+        ("9999999993", 400, "INVALID_SEARCH_DATA", "Invalid patient number 9999999993"),
+        ("123", 400, "INVALID_SEARCH_DATA", "Invalid patient number 123"),
+    ],
+)
+def test_search_edge_cases(
+    nhs_number,
+    expected_status,
+    expected_code,
+    expected_diagnostics,
+):
+    response = search_document_reference(nhs_number)
+    assert response.status_code == expected_status
+
+    body = response.json()
+    issue = body["issue"][0]
+    details = issue.get("details", {})
+    coding = details.get("coding", [{}])[0]
+    assert coding.get("code") == expected_code
+    assert issue.get("diagnostics") == expected_diagnostics

lambdas/tests/e2e/api/fhir/test_search_patient_fhir_api.py → lambdas/tests/e2e/api/fhir/test_search_document_fhir_api_success.py

@@ -1,44 +1,20 @@
 from datetime import datetime, timezone
 
-import pytest
-
 from enums.document_retention import DocumentRetentionDays
 from tests.e2e.api.fhir.conftest import (
-    MTLS_ENDPOINT,
     PDM_SNOMED,
     TEST_NHS_NUMBER,
     UNKNOWN_TEST_NHS_NUMBER,
     create_and_store_pdm_record,
-    create_mtls_session,
+    search_document_reference,
 )
 from tests.e2e.conftest import APIM_ENDPOINT
 from tests.e2e.helpers.data_helper import PdmDataHelper
 
 pdm_data_helper = PdmDataHelper()
 
 
-def search_document_reference(
-    nhs_number,
-    client_cert_path=None,
-    client_key_path=None,
-    resource_type="DocumentReference",
-):
-    """Helper to perform search by NHS number with optional mTLS certs."""
-    url = f"https://{MTLS_ENDPOINT}/{resource_type}?subject:identifier=https://fhir.nhs.uk/Id/nhs-number|{nhs_number}"
-    headers = {
-        "X-Correlation-Id": "1234",
-    }
-
-    # Use provided certs if available, else defaults
-    if client_cert_path and client_key_path:
-        session = create_mtls_session(client_cert_path, client_key_path)
-    else:
-        session = create_mtls_session()
-
-    return session.get(url, headers=headers)
-
-
-def test_search_nonexistent_document_references_for_patient_details():
+def test_search_nonexistent_document_references_for_valid_patient_details():
     response = search_document_reference(UNKNOWN_TEST_NHS_NUMBER)
     assert response.status_code == 200
 
@@ -50,7 +26,7 @@ def test_search_nonexistent_document_references_for_patient_details():
     assert bundle["entry"] == []
 
 
-def test_search_patient_details(test_data):
+def test_search_document_reference_for_valid_patient_details(test_data):
     created_record = create_and_store_pdm_record(test_data)
     expected_record_id = created_record["id"]
 
@@ -79,7 +55,40 @@ def test_search_patient_details(test_data):
     )
 
 
-def test_multiple_cancelled_search_patient_details(test_data):
+def test_search_multiple_document_references_for_valid_patient_details(test_data):
+    expected_record_ids = [
+        create_and_store_pdm_record(test_data)["id"] for _ in range(3)
+    ]
+
+    response = search_document_reference(TEST_NHS_NUMBER)
+    assert response.status_code == 200
+
+    bundle = response.json()
+    entries = bundle.get("entry", [])
+    assert entries
+
+    # Find the entries with the matching record_id's
+    for record_id in expected_record_ids:
+        matching_entry = next(
+            (
+                e
+                for e in entries
+                if e["resource"].get("id") == f"{PDM_SNOMED}~{record_id}"
+            ),
+            None,
+        )
+        assert matching_entry
+
+        attachment_url = matching_entry["resource"]["content"][0]["attachment"]["url"]
+        assert (
+            f"https://{APIM_ENDPOINT}/national-document-repository/FHIR/R4/DocumentReference/{PDM_SNOMED}~{record_id}"
+            in attachment_url
+        )
+
+
+def test_search_multiple_cancelled_document_references_for_valid_patient_details(
+    test_data,
+):
     record_ids = [
         create_and_store_pdm_record(test_data, doc_status="cancelled")["id"]
         for _ in range(2)
@@ -106,31 +115,7 @@ def test_multiple_cancelled_search_patient_details(test_data):
         assert entry["resource"].get("docStatus") == "cancelled"
 
 
-@pytest.mark.parametrize(
-    "nhs_number,expected_status,expected_code,expected_diagnostics",
-    [
-        ("9999999993", 400, "INVALID_SEARCH_DATA", "Invalid patient number 9999999993"),
-        ("123", 400, "INVALID_SEARCH_DATA", "Invalid patient number 123"),
-    ],
-)
-def test_search_edge_cases(
-    nhs_number,
-    expected_status,
-    expected_code,
-    expected_diagnostics,
-):
-    response = search_document_reference(nhs_number)
-    assert response.status_code == expected_status
-
-    body = response.json()
-    issue = body["issue"][0]
-    details = issue.get("details", {})
-    coding = details.get("coding", [{}])[0]
-    assert coding.get("code") == expected_code
-    assert issue.get("diagnostics") == expected_diagnostics
-
-
-def test_search_patient_details_deleted_are_not_returned(test_data):
+def test_search_deleted_document_references_are_not_returned(test_data):
     created_record_1 = create_and_store_pdm_record(test_data)
     expected_record_id_1 = created_record_1["id"]
 
@@ -174,3 +159,49 @@ def test_search_patient_details_deleted_are_not_returned(test_data):
         None,
     )
     assert non_matching_entry is None
+
+
+def test_search_mixed_deleted_and_not_deleted_document_references(test_data):
+    non_deleted_record = create_and_store_pdm_record(test_data)
+    expected_non_deleted_id = non_deleted_record["id"]
+
+    deletion_date = datetime.now(timezone.utc)
+    document_ttl_days = DocumentRetentionDays.SOFT_DELETE
+    ttl_seconds = document_ttl_days * 24 * 60 * 60
+    document_reference_ttl = int(deletion_date.timestamp() + ttl_seconds)
+
+    deleted_record = create_and_store_pdm_record(
+        test_data,
+        doc_status="deprecated",
+        Deleted=deletion_date.strftime("%Y-%m-%dT%H:%M:%S.%fZ"),
+        ttl=document_reference_ttl,
+    )
+    deleted_record_id = deleted_record["id"]
+
+    response = search_document_reference(TEST_NHS_NUMBER)
+    assert response.status_code == 200
+
+    bundle = response.json()
+    entries = bundle.get("entry", [])
+
+    # Assert the non-deleted record is returned
+    matching_non_deleted = next(
+        (
+            e
+            for e in entries
+            if e["resource"].get("id") == f"{PDM_SNOMED}~{expected_non_deleted_id}"
+        ),
+        None,
+    )
+    assert matching_non_deleted
+
+    # Assert the deleted record isn't returned
+    matching_deleted = next(
+        (
+            e
+            for e in entries
+            if e["resource"].get("id") == f"{PDM_SNOMED}~{deleted_record_id}"
+        ),
+        None,
+    )
+    assert matching_deleted is None