NRL-1554 Lowercase matching for extensions, remove unused code, add root_location to retrieval mechanism error

Author: axelkrastek1-nhs

layer/nrlf/core/tests/test_validators.py

@@ -1727,3 +1727,56 @@ def test_validate_two_content_with_different_retrieval_mechanisms():
 
     assert result.is_valid is True
     assert len(result.issues) == 0
+
+
+def test_validate_content_retrieval_lowercase_urls():
+    """Test that the extension is recognised when 'RetrievalMechanism' is in lowercase and throws an error for mismatching the URL case."""
+    validator = DocumentReferenceValidator()
+    document_ref_data = load_document_reference_json("Y05868-736253002-Valid")
+
+    document_ref_data["content"][0]["extension"] = [
+        {
+            "url": "https://fhir.nhs.uk/england/structuredefinition/extension-england-retrievalmechanism",
+            "valueCodeableConcept": {
+                "coding": [
+                    {
+                        "system": "https://fhir.nhs.uk/England/CodeSystem/England-RetrievalMechanism",
+                        "code": "Direct",
+                        "display": "Direct",
+                    }
+                ]
+            },
+        },
+        {
+            "url": "https://fhir.nhs.uk/England/StructureDefinition/Extension-England-ContentStability",
+            "valueCodeableConcept": {
+                "coding": [
+                    {
+                        "system": "https://fhir.nhs.uk/England/CodeSystem/England-NRLContentStability",
+                        "code": "static",
+                        "display": "Static",
+                    }
+                ]
+            },
+        },
+    ]
+
+    with pytest.raises(ParseError) as exc_info:
+        validator.validate(document_ref_data)
+
+    assert len(exc_info.value.issues) == 1
+    assert exc_info.value.issues[0].model_dump(exclude_none=True) == {
+        "severity": "error",
+        "code": "invalid",
+        "details": {
+            "coding": [
+                {
+                    "system": "https://fhir.nhs.uk/CodeSystem/Spine-ErrorOrWarningCode",
+                    "code": "BAD_REQUEST",
+                    "display": "Bad request",
+                }
+            ]
+        },
+        "diagnostics": "Invalid content retrieval extension (content[0].extension[0].url: Input should be 'https://fhir.nhs.uk/England/StructureDefinition/Extension-England-RetrievalMechanism', see: https://fhir.nhs.uk/England/ValueSet/England-RetrievalMechanism)",
+        "expression": ["content[0].extension[0].url"],
+    }

layer/nrlf/core/validators.py

@@ -531,9 +531,9 @@ def _has_valid_extensions(self, extensions, i):
         content_retrieval_count = 0
 
         for extension in extensions:
-            if "ContentStability" in str(extension):
+            if "contentstability" in str(extension).lower():
                 content_stability_count += 1
-            elif "RetrievalMechanism" in str(extension):
+            elif "retrievalmechanism" in str(extension).lower():
                 content_retrieval_count += 1
 
         if content_stability_count != 1:
@@ -555,10 +555,10 @@ def _has_valid_extensions(self, extensions, i):
             return False
 
         for j, extension in enumerate(extensions):
-            if "ContentStability" in str(extension):
+            if "contentstability" in str(extension).lower():
                 if not self._validate_content_stability_extension(extension, i, j):
                     return False
-            elif "RetrievalMechanism" in str(extension):
+            elif "retrievalmechanism" in str(extension).lower():
                 if not self._validate_retrieval_mechanism_extension(extension, i, j):
                     return False
 
@@ -590,13 +590,12 @@ def _validate_retrieval_mechanism_extension(self, extension, i, j):
         try:
             RetrievalMechanismExtension.model_validate(extension.model_dump())
         except ValidationError as exc:
-            for error in exc.errors():
-                error["loc"] = ("content", i, "extension", j) + error["loc"]
             raise ParseError.from_validation_error(
                 exc,
                 details=SpineErrorConcept.from_code("BAD_REQUEST"),
                 msg="Invalid content retrieval extension",
                 value_set="https://fhir.nhs.uk/England/ValueSet/England-RetrievalMechanism",
+                root_location=("content", i, "extension", j),
             ) from None
         coding = extension.valueCodeableConcept.coding[0]
         expected_retrieval_display = CONTENT_RETRIEVAL_CODE_MAP.get(coding.code)