Feature/cdapibug 150

bruno/APIM/Get_Auth_Token.bru

@@ -20,15 +20,10 @@ script:pre-request {
     const jwt = require("jsonwebtoken");
     const fs = require("node:fs");
     const crypto = require("node:crypto");
-<<<<<<< Updated upstream
-    const secret = bru.getEnvVar("JWT_SECRET");
-    const privateKeyPath = bru.getEnvVar("PRIVATE_KEY_PATH");
-=======
 
     const secret = bru.getEnvVar("JWT_SECRET");
     const privateKeyPath = bru.getEnvVar("PRIVATE_KEY_PATH");
 
->>>>>>> Stashed changes
     if (!secret) {
       throw new Error("JWT_SECRET environment variable is missing.");
     }
@@ -38,10 +33,6 @@ script:pre-request {
     }
 
     const privateKey = fs.readFileSync(privateKeyPath);
-<<<<<<< Updated upstream
-=======
-
->>>>>>> Stashed changes
     const payload = {
       sub: secret,
       iss: secret,

bruno/APIM/Test_CDAPI-150_Organization_Identifier_With_Empty_String.bru

@@ -0,0 +1,72 @@
+meta {
+  name: Test_CDAPI-150_Organization_Identifier_With_Empty_String
+  type: http
+  seq: 38
+}
+
+post {
+  url: https://{{APIM_ENV}}.api.service.nhs.uk/pathology-laboratory-reporting-pr-{{PR_NUMBER}}/FHIR/R4/Bundle
+  body: json
+  auth: inherit
+}
+
+headers {
+  Content-Type: application/fhir+json
+}
+
+body:json {
+  {
+    "resourceType": "Bundle",
+    "type": "document",
+    "entry": [
+      {
+        "fullUrl": "composition",
+        "resource": {
+          "resourceType": "Composition",
+          "extension": [
+            {
+              "url": "http://hl7.eu/fhir/StructureDefinition/composition-basedOn-order-or-requisition",
+              "valueReference": {
+                "reference": "servicerequest"
+              }
+            }
+          ],
+          "subject": {
+            "identifier": {
+              "system": "https://fhir.nhs.uk/Id/nhs-number",
+              "value": "nhs-test-number"
+            }
+          }
+        }
+      },
+      {
+        "fullUrl": "servicerequest",
+        "resource": {
+          "resourceType": "ServiceRequest",
+          "requester": {
+            "reference": "practitionerrole"
+          }
+        }
+      },
+      {
+        "fullUrl": "practitionerrole",
+        "resource": {
+          "resourceType": "PractitionerRole",
+          "organization": {
+            "reference": ""
+          }
+        }
+      }
+    ]
+  }
+}
+
+assert {
+  res.status: eq 400
+  res.body.issue[0].diagnostics: eq Document must include an Organization resource
+}
+
+settings {
+  encodeUrl: true
+  timeout: 0
+}

bruno/APIM/Test_CDAPI-150_Organization_Identifier_With_Empty_String_IntEnvi.bru

@@ -0,0 +1,72 @@
+meta {
+  name: Test_CDAPI-150_Organization_Identifier_With_Empty_String_IntEnvi
+  type: http
+  seq: 48
+}
+
+post {
+  url: https://int.api.service.nhs.uk/pathology-laboratory-reporting/FHIR/R4/Bundle
+  body: json
+  auth: inherit
+}
+
+headers {
+  Content-Type: application/fhir+json
+}
+
+body:json {
+  {
+    "resourceType": "Bundle",
+    "type": "document",
+    "entry": [
+      {
+        "fullUrl": "composition",
+        "resource": {
+          "resourceType": "Composition",
+          "extension": [
+            {
+              "url": "http://hl7.eu/fhir/StructureDefinition/composition-basedOn-order-or-requisition",
+              "valueReference": {
+                "reference": "servicerequest"
+              }
+            }
+          ],
+          "subject": {
+            "identifier": {
+              "system": "https://fhir.nhs.uk/Id/nhs-number",
+              "value": "nhs-test-number"
+            }
+          }
+        }
+      },
+      {
+        "fullUrl": "servicerequest",
+        "resource": {
+          "resourceType": "ServiceRequest",
+          "requester": {
+            "reference": "practitionerrole"
+          }
+        }
+      },
+      {
+        "fullUrl": "practitionerrole",
+        "resource": {
+          "resourceType": "PractitionerRole",
+          "organization": {
+            "reference": ""
+          }
+        }
+      }
+    ]
+  }
+}
+
+assert {
+  res.status: eq 400
+  res.body.issue[0].diagnostics: eq Document must include an Organization resource
+}
+
+settings {
+  encodeUrl: true
+  timeout: 0
+}

bruno/APIM/Test_CDAPI-150_Subject_Identifier_With_Empty_String.bru

@@ -0,0 +1,72 @@
+meta {
+  name: Test_CDAPI-150_Subject_Identifier_With_Empty_String
+  type: http
+  seq: 37
+}
+
+post {
+  url: https://{{APIM_ENV}}.api.service.nhs.uk/pathology-laboratory-reporting-pr-{{PR_NUMBER}}/FHIR/R4/Bundle
+  body: json
+  auth: inherit
+}
+
+headers {
+  Content-Type: application/fhir+json
+}
+
+body:json {
+  {
+    "resourceType": "Bundle",
+    "type": "document",
+    "entry": [
+      {
+        "fullUrl": "composition",
+        "resource": {
+          "resourceType": "Composition",
+          "extension": [
+            {
+              "url": "http://hl7.eu/fhir/StructureDefinition/composition-basedOn-order-or-requisition",
+              "valueReference": {
+                "reference": "servicerequest"
+              }
+            }
+          ],
+          "subject": {
+            "identifier": {
+              "system": "https://fhir.nhs.uk/Id/nhs-number",
+              "value": ""
+            }
+          }
+        }
+      },
+      {
+        "fullUrl": "servicerequest",
+        "resource": {
+          "resourceType": "ServiceRequest",
+          "requester": {
+            "reference": "practitionerrole"
+          }
+        }
+      },
+      {
+        "fullUrl": "practitionerrole",
+        "resource": {
+          "resourceType": "PractitionerRole",
+          "organization": {
+            "reference": "organization"
+          }
+        }
+      }
+    ]
+  }
+}
+
+assert {
+  res.status: eq 400
+  res.body.issue[0].diagnostics: eq Document must include an Organization resource
+}
+
+settings {
+  encodeUrl: true
+  timeout: 0
+}

bruno/APIM/Test_CDAPI-150_Subject_Identifier_With_Empty_String_IntEnvi.bru

@@ -0,0 +1,72 @@
+meta {
+  name: Test_CDAPI-150_Subject_Identifier_With_Empty_String_IntEnvi
+  type: http
+  seq: 47
+}
+
+post {
+  url: https://int.api.service.nhs.uk/pathology-laboratory-reporting/FHIR/R4/Bundle
+  body: json
+  auth: inherit
+}
+
+headers {
+  Content-Type: application/fhir+json
+}
+
+body:json {
+  {
+    "resourceType": "Bundle",
+    "type": "document",
+    "entry": [
+      {
+        "fullUrl": "composition",
+        "resource": {
+          "resourceType": "Composition",
+          "extension": [
+            {
+              "url": "http://hl7.eu/fhir/StructureDefinition/composition-basedOn-order-or-requisition",
+              "valueReference": {
+                "reference": "servicerequest"
+              }
+            }
+          ],
+          "subject": {
+            "identifier": {
+              "system": "https://fhir.nhs.uk/Id/nhs-number",
+              "value": ""
+            }
+          }
+        }
+      },
+      {
+        "fullUrl": "servicerequest",
+        "resource": {
+          "resourceType": "ServiceRequest",
+          "requester": {
+            "reference": "practitionerrole"
+          }
+        }
+      },
+      {
+        "fullUrl": "practitionerrole",
+        "resource": {
+          "resourceType": "PractitionerRole",
+          "organization": {
+            "reference": "organization"
+          }
+        }
+      }
+    ]
+  }
+}
+
+assert {
+  res.status: eq 400
+  res.body.issue[0].diagnostics: eq Document must include an Organization resource
+}
+
+settings {
+  encodeUrl: true
+  timeout: 0
+}

pathology-api/src/pathology_api/handler.py

@@ -103,7 +103,7 @@ def _fetch_requesting_organisation(
     organisation_identifiers = [
         identifier
         for identifier in requesting_organisation.identifier
-        if isinstance(identifier, OrganizationIdentifier)
+        if isinstance(identifier, OrganizationIdentifier) and identifier.value
     ]
 
     if not organisation_identifiers:
@@ -141,7 +141,7 @@ def handle_request(bundle: Bundle) -> PdmResponse:
     _logger.debug("Requesting organization: %s", requesting_organisation)
 
     subject = composition.subject
-    if subject is None:
+    if subject is None or not subject.identifier.value:
         raise ValidationError("Composition does not define a valid subject identifier")
 
     pdm_response = post_document(bundle)

pathology-api/src/pathology_api/test_handler.py

@@ -263,10 +263,49 @@ def test_handle_request(
             bundle_id=result_bundle.id,
         )
 
+    def test_handle_request_with_empty_subject(
+        self, build_valid_test_result: Callable[[str, str], Bundle]
+    ) -> None:
+        bundle = build_valid_test_result("", "ods_code")
+
+        with pytest.raises(
+            ValidationError,
+            match="Composition does not define a valid subject identifier",
+        ):
+            handle_request(bundle)
+
+    def test_handle_request_with_empty_ods_code(
+        self, build_valid_test_result: Callable[[str, str], Bundle]
+    ) -> None:
+        bundle = build_valid_test_result("nhs_number_1", "")
+
+        if (
+            created_practitioner_role := bundle.get_resource(
+                url="practitioner_role", t=PractitionerRole
+            )
+        ) is None:
+            raise ValueError(
+                "Test setup error: PractitionerRole resource not found in bundle"
+            )
+
+        if (
+            expected_organisation_reference := created_practitioner_role.organization
+        ) is None:
+            raise ValueError(
+                "Test setup error: PractitionerRole resource does not define an "
+                "organization reference"
+            )
+
+        with pytest.raises(
+            ValidationError,
+            match=rf"Organization \({expected_organisation_reference.reference}\) does "
+            "not define a supported identifier. Supported system 'https://fhir.nhs.uk/Id/ods-organization-code'",
+        ):
+            handle_request(bundle)
+
     def test_handle_request_raises_error_when_create_event_fails(
         self, build_valid_test_result: Callable[[str, str], Bundle]
     ) -> None:
-        # Arrange
         bundle = build_valid_test_result("nhs_number_1", "ods_code")
 
         expected_error_message = "Failed to create bundle"