[NRL-1290] Add bars pointer type and category. Adapt pointer validators to allow bars pointers for prototype

Author: mattdean3-nhs

layer/nrlf/core/constants.py

@@ -66,6 +66,7 @@ class PointerTypes(Enum):
     PERSONALISED_CARE_AND_SUPPORT_PLAN = "http://snomed.info/sct|2181441000000107"
     MRA_UPPER_LIMB_ARTERY = "https://nicip.nhs.uk|MAULR"
     MRI_AXILLA_BOTH = "https://nicip.nhs.uk|MAXIB"
+    APPOINTMENT = "http://snomed.info/sct|749001000000101"
 
     @staticmethod
     def list():
@@ -84,6 +85,7 @@ class Categories(Enum):
     CLINICAL_NOTE = "http://snomed.info/sct|823651000000106"
     DIAGNOSTIC_STUDIES_REPORT = "http://snomed.info/sct|721981007"
     DIAGNOSTIC_PROCEDURE = "http://snomed.info/sct|103693007"
+    RECORD_ARTIFACT = "http://snomed.info/sct|419891008"
 
     @staticmethod
     def list():
@@ -112,6 +114,9 @@ def coding_value(self):
     Categories.DIAGNOSTIC_PROCEDURE.value: {
         "display": "Diagnostic procedure",
     },
+    Categories.RECORD_ARTIFACT.value: {
+        "display": "Record artifact (record artifact)",
+    },
 }
 
 TYPE_ATTRIBUTES = {
@@ -157,6 +162,9 @@ def coding_value(self):
     PointerTypes.MRI_AXILLA_BOTH.value: {
         "display": "MRI Axilla Both",
     },
+    PointerTypes.APPOINTMENT.value: {
+        "display": "Appointment (record artifact)",
+    },
 }
 
 TYPE_CATEGORIES = {
@@ -182,6 +190,9 @@ def coding_value(self):
     # Imaging
     PointerTypes.MRA_UPPER_LIMB_ARTERY.value: Categories.DIAGNOSTIC_STUDIES_REPORT.value,
     PointerTypes.MRI_AXILLA_BOTH.value: Categories.DIAGNOSTIC_PROCEDURE.value,
+    #
+    # Bars
+    PointerTypes.APPOINTMENT.value: Categories.RECORD_ARTIFACT.value,
 }
 
 PRACTICE_SETTING_VALUE_SET_URL = (
@@ -653,6 +664,7 @@ def coding_value(self):
     "24291000087104": "Geriatric chronic pain management service",
     "1323501000000109": "Special care dentistry service",
     "1423561000000102": "Acute oncology service",
+    "394802001": "General medicine (qualifier value)",
 }
 
 

layer/nrlf/core/tests/test_validators.py

@@ -7,6 +7,7 @@
     ODS_SYSTEM,
     TYPE_ATTRIBUTES,
     TYPE_CATEGORIES,
+    Categories,
     PointerTypes,
 )
 from nrlf.core.errors import ParseError
@@ -430,6 +431,7 @@ def test_validate_category_too_many_category():
     [
         (category_str.split("|")[1], display_dict["display"])
         for category_str, display_dict in CATEGORY_ATTRIBUTES.items()
+        if category_str != Categories.RECORD_ARTIFACT.value
     ],
 )
 def test_validate_category_coding_display_mismatch(
@@ -639,6 +641,7 @@ def test_validate_type_coding_invalid_system():
     [
         (type_str, display_dict["display"])
         for type_str, display_dict in TYPE_ATTRIBUTES.items()
+        if type_str != PointerTypes.APPOINTMENT.value
     ],
 )
 def test_validate_type_coding_display_mismatch(type_str: str, display: str):

layer/nrlf/core/validators.py

@@ -368,6 +368,10 @@ def _validate_type(self, model: DocumentReference):
             )
             return
 
+        # Bypass display validation for bars appointments
+        if type_id == PointerTypes.APPOINTMENT.value:
+            return
+
         type_attributes = TYPE_ATTRIBUTES.get(type_id, {})
         if coding.display != type_attributes.get("display"):
             self.result.add_error(
@@ -423,6 +427,10 @@ def _validate_category(self, model: DocumentReference):
             )
             return
 
+        # Bypass display validation for bars record artifacts
+        if category_id == Categories.RECORD_ARTIFACT.value:
+            return
+
         category_attributes = CATEGORY_ATTRIBUTES.get(category_id, {})
         if coding.display != category_attributes.get("display"):
             self.result.add_error(
@@ -623,7 +631,13 @@ def _validate_content(self, model: DocumentReference):
         }
 
         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/fhir+json",
+                "application/json",
+                "application/json+fhir",
+            ]:
                 self.result.add_error(
                     issue_code="value",
                     error_code="INVALID_RESOURCE",