[NRL-1990] Allow unstructured data for text/html contents in pointers

layer/nrlf/core/tests/test_validators.py

@@ -1198,6 +1198,9 @@ def test_validate_content_format_invalid_code_for_structured_document():
     }
 
 
+@pytest.mark.skip(
+    reason="Disabling temporarily as the validation rule is now allowed (but only for NRL-1966)"
+)
 def test_validate_content_format_invalid_code_for_contact_details():
     validator = DocumentReferenceValidator()
     document_ref_data = load_document_reference_json("Y05868-736253002-Valid")

layer/nrlf/core/validators.py

@@ -287,20 +287,20 @@
                 diagnostics=f"Invalid ASID value '{asid_value}'. A single ASID consisting of 12 digits can be provided in the context.related field.",
                 field=f"context.related[{idx}].identifier.value",
             )
             return
 
     def _validate_ssp_asid(self, model: DocumentReference):
         """
         Validate that the document contains a valid ASID in the context.related field when the content contains an SSP URL
         """
 
         ssp_content = any(
             [
                 content
                 for content in model.content
                 if content.attachment.url.startswith("ssp://")
             ]
         )
 
         logger.log(LogReference.VALIDATOR001, step="ssp_content_and_asid_exists")
 
@@ -338,7 +338,7 @@
                 diagnostics="Missing ASID identifier. context.related must contain a single valid ASID identifier when content contains an SSP URL",
                 field="context.related",
             )
             return
 
     def _validate_type(self, model: DocumentReference):
         """
@@ -395,7 +395,7 @@
                 issue_code="business-rule",
                 error_code="UNPROCESSABLE_ENTITY",
                 diagnostics=f"Invalid category length: {len(model.category)} Category must only contain a single value",
                 field=f"category",
             )
             return
 
@@ -406,7 +406,7 @@
                 issue_code="business-rule",
                 error_code="UNPROCESSABLE_ENTITY",
                 diagnostics=f"Invalid category coding length: {len(model.category[0].coding)} Category Coding must only contain a single value",
                 field=f"category[0].coding",
             )
             return
 
@@ -473,7 +473,11 @@
             if (
                 content.attachment.contentType == "text/html"
                 and content.format.code
-                not in ["urn:nhs-ic:record-contact", "urn:nhs-ic:structured"]
+                not in [
+                    "urn:nhs-ic:record-contact",
+                    "urn:nhs-ic:structured",
+                    "urn:nhs-ic:unstructured",
+                ]
             ):
                 self.result.add_error(
                     issue_code="business-rule",
@@ -652,9 +656,9 @@
                 diagnostics=f"Invalid author value: '{identifier.value}' Author value must be less than 13 characters",
                 field="author[0].identifier.value",
             )
             return
 
     def _validate_practiceSetting(self, model: DocumentReference):
         """
         Validate the practice setting field contains an appropriate coding system and code.
         """
@@ -716,7 +720,7 @@
                 diagnostics=f"Invalid practice setting coding: display {practice_setting_display} does not match the expected display for {practice_setting_value} Practice Setting coding is bound to value set {PRACTICE_SETTING_VALUE_SET_URL}",
                 field="context.practiceSetting.coding[0]",
             )
             return
 
     def _validate_content(self, model: DocumentReference):
         """