Merge pull request #866 from NHSDigital/feature/eema1-NRL-708-fixValidationExceptionErrors

NRL-708 fix validation exception errors

Author: eesa456

api/producer/createDocumentReference/tests/test_create_document_reference.py

@@ -10,6 +10,7 @@
     _set_create_time_fields,
     handler,
 )
+from nrlf.core.constants import SNOMED_SYSTEM_URL
 from nrlf.core.dynamodb.repository import DocumentPointer, DocumentPointerRepository
 from nrlf.producer.fhir.r4.model import (
     DocumentReferenceRelatesTo,
@@ -154,6 +155,71 @@ def test_create_document_reference_happy_path_with_ssp(
     }
 
 
+@mock_aws
+@mock_repository
+@freeze_time("2024-03-21T12:34:56.789")
+@freeze_uuid("00000000-0000-0000-0000-000000000001")
+def test_create_document_reference_without_related_value_exception(
+    repository: DocumentPointerRepository,
+):
+    doc_ref = load_document_reference("Y05868-736253002-Valid-with-ssp-content")
+    doc_ref.context = {
+        "practiceSetting": {
+            "coding": [
+                {
+                    "system": SNOMED_SYSTEM_URL,
+                    "code": "788002001",
+                    "display": "Adult mental health service",
+                }
+            ]
+        },
+        "sourcePatientInfo": {
+            "identifier": {
+                "system": "https://fhir.nhs.uk/Id/nhs-number",
+                "value": "6700028191",
+            }
+        },
+        "related": [{"identifier": {"system": "https://fhir.nhs.uk/Id/nhsSpineASID"}}],
+    }
+
+    event = create_test_api_gateway_event(
+        headers=create_headers(),
+        body=doc_ref.model_dump_json(exclude_none=True),
+    )
+
+    result = handler(event, create_mock_context())
+    body = result.pop("body")
+
+    assert result == {
+        "statusCode": "400",
+        "headers": default_response_headers(),
+        "isBase64Encoded": False,
+    }
+
+    parsed_body = json.loads(body)
+
+    assert parsed_body == {
+        "resourceType": "OperationOutcome",
+        "issue": [
+            {
+                "severity": "error",
+                "code": "value",
+                "details": {
+                    "coding": [
+                        {
+                            "code": "INVALID_IDENTIFIER_VALUE",
+                            "display": "Invalid identifier value",
+                            "system": "https://fhir.nhs.uk/ValueSet/Spine-ErrorOrWarningCode-1",
+                        }
+                    ]
+                },
+                "diagnostics": "Invalid ASID value ''. A single ASID consisting of 12 digits can be provided in the context.related field.",
+                "expression": ["context.related[0].identifier.value"],
+            }
+        ],
+    }
+
+
 def test_create_document_reference_no_body():
     event = create_test_api_gateway_event(
         headers=create_headers(),

layer/nrlf/core/validators.py

@@ -272,7 +272,7 @@ def _validate_asid(self, asid_references: list):
             return
 
         idx, asid_reference = asid_references[0]
-        asid_value = getattr(asid_reference.identifier, "value", "")
+        asid_value = getattr(asid_reference.identifier, "value") or ""
         if not match(r"^\d{12}$", asid_value):
             self.result.add_error(
                 issue_code="value",