NRL-518 Validate display as per the definition

Author: axelkrastek1-nhs

layer/nrlf/core/tests/test_validators.py

@@ -1029,7 +1029,7 @@ def test_validate_content_extension_invalid_display():
                 }
             ]
         },
-        "diagnostics": "Invalid content extension display: invalid Extension display must be the same as code either 'static' or 'dynamic'",
+        "diagnostics": "Invalid content extension display: invalid Extension display must be 'Static' or 'Dynamic'",
         "expression": [
             "content[0].extension[0].valueCodeableConcept.coding[0].display"
         ],
@@ -1522,3 +1522,43 @@ def test_validate_ssp_content_with_multiple_asids():
         "diagnostics": "Multiple ASID identifiers provided. Only a single valid ASID identifier can be provided in the context.related.",
         "expression": ["context.related"],
     }
+
+    def test_validate_content_extension_invalid_code_and_display_mismatch():
+        validator = DocumentReferenceValidator()
+        document_ref_data = load_document_reference_json("Y05868-736253002-Valid")
+
+        document_ref_data["content"][0]["extension"][0] = {
+            "url": "https://fhir.nhs.uk/England/StructureDefinition/Extension-England-ContentStability",
+            "valueCodeableConcept": {
+                "coding": [
+                    {
+                        "system": "https://fhir.nhs.uk/England/CodeSystem/England-NRLContentStability",
+                        "code": "static",
+                        "display": "Dynamic",
+                    }
+                ]
+            },
+        }
+
+        result = validator.validate(document_ref_data)
+
+        assert result.is_valid is False
+        assert result.resource.id == "Y05868-99999-99999-999999"
+        assert len(result.issues) == 1
+        assert result.issues[0].model_dump(exclude_none=True) == {
+            "severity": "error",
+            "code": "value",
+            "details": {
+                "coding": [
+                    {
+                        "system": "https://fhir.nhs.uk/ValueSet/Spine-ErrorOrWarningCode-1",
+                        "code": "INVALID_RESOURCE",
+                        "display": "Invalid validation of resource",
+                    }
+                ]
+            },
+            "diagnostics": "Invalid content extension display: Dynamic Extension display must be the same as code either 'Static' or 'Dynamic'",
+            "expression": [
+                "content[0].extension[0].valueCodeableConcept.coding[0].display"
+            ],
+        }

layer/nrlf/core/validators.py

@@ -508,50 +508,54 @@ def _validate_content_extension(self, model: DocumentReference):
                 return
 
             if (
-                content.extension[0].valueCodeableConcept.coding[0].system
+                content.extension[0].url
+                != "https://fhir.nhs.uk/England/StructureDefinition/Extension-England-ContentStability"
+            ):
+                self.result.add_error(
+                    issue_code="value",
+                    error_code="INVALID_RESOURCE",
+                    diagnostics=f"Invalid content extension url: {content.extension[0].url} Extension url must be 'https://fhir.nhs.uk/England/StructureDefinition/Extension-England-ContentStability'",
+                    field=f"content[{i}].extension[0].url",
+                )
+                return
+
+            coding = content.extension[0].valueCodeableConcept.coding[0]
+            if (
+                coding.system
                 != "https://fhir.nhs.uk/England/CodeSystem/England-NRLContentStability"
             ):
                 self.result.add_error(
                     issue_code="value",
                     error_code="INVALID_RESOURCE",
-                    diagnostics=f"Invalid content extension system: {content.extension[0].valueCodeableConcept.coding[0].system} Extension system must be 'https://fhir.nhs.uk/England/CodeSystem/England-NRLContentStability'",
+                    diagnostics=f"Invalid content extension system: {coding.system} Extension system must be 'https://fhir.nhs.uk/England/CodeSystem/England-NRLContentStability'",
                     field=f"content[{i}].extension[0].valueCodeableConcept.coding[0].system",
                 )
                 return
 
-            if content.extension[0].valueCodeableConcept.coding[0].code not in [
-                "static",
-                "dynamic",
-            ]:
+            if coding.code not in ["static", "dynamic"]:
                 self.result.add_error(
                     issue_code="value",
                     error_code="INVALID_RESOURCE",
-                    diagnostics=f"Invalid content extension code: {content.extension[0].valueCodeableConcept.coding[0].code} Extension code must be 'static' or 'dynamic'",
+                    diagnostics=f"Invalid content extension code: {coding.code} Extension code must be 'static' or 'dynamic'",
                     field=f"content[{i}].extension[0].valueCodeableConcept.coding[0].code",
                 )
                 return
 
-            if (
-                content.extension[0].valueCodeableConcept.coding[0].code
-                != content.extension[0].valueCodeableConcept.coding[0].display.lower()
-            ):
+            if coding.display not in ["Static", "Dynamic"]:
                 self.result.add_error(
                     issue_code="value",
                     error_code="INVALID_RESOURCE",
-                    diagnostics=f"Invalid content extension display: {content.extension[0].valueCodeableConcept.coding[0].display} Extension display must be the same as code either 'static' or 'dynamic'",
+                    diagnostics=f"Invalid content extension display: {coding.display} Extension display must be 'Static' or 'Dynamic'",
                     field=f"content[{i}].extension[0].valueCodeableConcept.coding[0].display",
                 )
                 return
 
-            if (
-                content.extension[0].url
-                != "https://fhir.nhs.uk/England/StructureDefinition/Extension-England-ContentStability"
-            ):
+            if coding.code != coding.display.lower():
                 self.result.add_error(
                     issue_code="value",
                     error_code="INVALID_RESOURCE",
-                    diagnostics=f"Invalid content extension url: {content.extension[0].url} Extension url must be 'https://fhir.nhs.uk/England/StructureDefinition/Extension-England-ContentStability'",
-                    field=f"content[{i}].extension[0].url",
+                    diagnostics=f"Invalid content extension display: {coding.display} Extension display must be the same as code either 'Static' or 'Dynamic'",
+                    field=f"content[{i}].extension[0].valueCodeableConcept.coding[0].display",
                 )
                 return
 

tests/data/DocumentReference/RQI-736253002-Valid.json

@@ -79,7 +79,7 @@
               {
                 "system": "https://fhir.nhs.uk/England/CodeSystem/England-NRLContentStability",
                 "code": "static",
-                "display": "static"
+                "display": "Static"
               }
             ]
           }

tests/data/DocumentReference/Y05868-736253002-Valid.json

@@ -79,7 +79,7 @@
               {
                 "system": "https://fhir.nhs.uk/England/CodeSystem/England-NRLContentStability",
                 "code": "static",
-                "display": "static"
+                "display": "Static"
               }
             ]
           }