NRL-1051 validate imaging values

Author: eesa456

api/producer/processTransaction/process_transaction_bundle.py

@@ -245,7 +245,6 @@ def create_document_reference(
     metadata: ConnectionMetadata,
     repository: DocumentPointerRepository,
     body: DocumentReference,
-    is_imaging_profile: bool = False,
 ) -> Response:
 
     logger.log(LogReference.PROCREATE000)
@@ -255,7 +254,7 @@ def create_document_reference(
     body.id = f"{id_prefix}-{uuid4()}"
 
     validator = DocumentReferenceValidator()
-    result = validator.validate(body, is_imaging_profile)
+    result = validator.validate(body)
 
     if not result.is_valid:
         logger.log(LogReference.PROCREATE002)
@@ -336,7 +335,6 @@ def handler(
     requested_profile = (
         body.meta.profile[0].root if body.meta and body.meta.profile else None
     )
-    is_imaging_profile = False
     if requested_profile and not requested_profile.endswith(
         "profiles.ihe.net/ITI/MHD/StructureDefinition/IHE.MHD.UnContained.Comprehensive.ProvideBundle"
     ):
@@ -396,15 +394,14 @@ def handler(
     for entry in entries:
         try:
             if requested_profile:
-                is_imaging_profile = True
                 document_reference = _convert_document_reference(
                     entry.resource, requested_profile
                 )
             else:
                 document_reference = DocumentReference(**(entry.resource))
 
             create_response = create_document_reference(
-                metadata, repository, document_reference, is_imaging_profile
+                metadata, repository, document_reference
             )
             responses.append(create_response)
         except OperationOutcomeError as e:

api/producer/processTransaction/tests/test_process_transaction_bundle.py

@@ -224,7 +224,7 @@ def test_create_single_mhds_document_reference_imaging_format_with_transaction_h
 
     raw_doc_ref.pop("author")
     raw_doc_ref.pop("context")
-    raw_doc_ref["content"][0]["attachment"]["contentType"] = "application/dicom"
+    raw_doc_ref["content"][0]["attachment"]["contentType"] = "application/dicom+fhir"
     raw_doc_ref["content"][0]["format"][
         "system"
     ] = "https://profiles.ihe.net/fhir/ihe.formatcode.fhir/1.2.0/ValueSet-formatcode.html"

layer/nrlf/core/validators.py

@@ -118,9 +118,7 @@ def parse(cls, data: Dict[str, Any]):
                 msg="Failed to parse DocumentReference resource",
             ) from None
 
-    def validate(
-        self, data: Dict[str, Any] | DocumentReference, is_imaging: bool = False
-    ):
+    def validate(self, data: Dict[str, Any] | DocumentReference):
         """
         Validate the document reference
         """
@@ -139,7 +137,7 @@ def validate(
             self._validate_category(resource)
             self._validate_author(resource)
             self._validate_type_category_mapping(resource)
-            self._validate_content(resource, is_imaging)
+            self._validate_content(resource)
             self._validate_content_format(resource)
             self._validate_content_extension(resource)
             self._validate_practiceSetting(resource)
@@ -637,22 +635,27 @@ def _validate_practiceSetting(self, model: DocumentReference):
             )
             return
 
-    def _validate_content(self, model: DocumentReference, is_imaging: bool = False):
+    def _validate_content(self, model: DocumentReference):
         """
         Validate that the contentType is present and is either 'application/pdf' or 'text/html'.
         """
-        if is_imaging:
-            return
 
         logger.log(LogReference.VALIDATOR001, step="content")
 
         format_code_display_map = {
             "urn:nhs-ic:record-contact": "Contact details (HTTP Unsecured)",
             "urn:nhs-ic:unstructured": "Unstructured Document",
+            "direct": "Direct",
+            "apiplatform": "API Platform",
         }
 
         for i, content in enumerate(model.content):
-            if content.attachment.contentType not in ["application/pdf", "text/html"]:
+            if content.attachment.contentType not in [
+                "application/pdf",
+                "text/html",
+                "application/dicom+fhir",
+                "application/fhir+json",
+            ]:
                 self.result.add_error(
                     issue_code="value",
                     error_code="INVALID_RESOURCE",