NRL-1049 update allowed categories and types and create test to show it can search by new NICIP type

Author: eesa456

api/consumer/searchDocumentReference/tests/test_search_document_reference_consumer.py

@@ -135,6 +135,53 @@ def test_search_document_reference_happy_path_with_type(
     }
 
 
+@mock_aws
+@mock_repository
+def test_search_document_reference_happy_path_with_nicip_type(
+    repository: DocumentPointerRepository,
+):
+    doc_ref = load_document_reference("Y05868-736253002-Valid")
+    doc_ref.type.coding[0].code = "MAULR"
+    doc_ref.type.coding[0].system = "https://nicip.nhs.uk"
+    doc_ref.type.coding[0].display = "MRA Upper Limb Rt"
+    doc_ref.category[0].coding[0].code = "721981007"
+    doc_ref.category[0].coding[0].display = "Diagnostic Studies Report"
+    doc_pointer = DocumentPointer.from_document_reference(doc_ref)
+
+    repository.create(doc_pointer)
+
+    event = create_test_api_gateway_event(
+        headers=create_headers(),
+        query_string_parameters={
+            "subject:identifier": "https://fhir.nhs.uk/Id/nhs-number|6700028191",
+            "type": "https://nicip.nhs.uk|MAULR",
+        },
+    )
+
+    result = handler(event, create_mock_context())
+    body = result.pop("body")
+
+    assert result == {
+        "statusCode": "200",
+        "headers": default_response_headers(),
+        "isBase64Encoded": False,
+    }
+
+    parsed_body = json.loads(body)
+    assert parsed_body == {
+        "resourceType": "Bundle",
+        "type": "searchset",
+        "link": [
+            {
+                "relation": "self",
+                "url": "https://pytest.api.service.nhs.uk/record-locator/consumer/FHIR/R4/DocumentReference?subject:identifier=https://fhir.nhs.uk/Id/nhs-number|6700028191&type=https://nicip.nhs.uk|MAULR",
+            }
+        ],
+        "total": 1,
+        "entry": [{"resource": doc_ref.dict(exclude_none=True)}],
+    }
+
+
 @mock_aws
 @mock_repository
 def test_search_document_reference_no_results(repository: DocumentPointerRepository):

layer/nrlf/core/constants.py

@@ -55,6 +55,8 @@ class PointerTypes(Enum):
     TREATMENT_ESCALATION_PLAN = "http://snomed.info/sct|735324008"
     SUMMARY_RECORD = "http://snomed.info/sct|824321000000109"
     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"
 
     @staticmethod
     def list():
@@ -71,6 +73,8 @@ class Categories(Enum):
     CARE_PLAN = "http://snomed.info/sct|734163000"
     OBSERVATIONS = "http://snomed.info/sct|1102421000000108"
     CLINICAL_NOTE = "http://snomed.info/sct|823651000000106"
+    DIAGNOSTIC_STUDIES_REPORT = "http://snomed.info/sct|721981007"
+    DIAGNOSTIC_PROCEDURE = "http://snomed.info/sct|103693007"
 
     @staticmethod
     def list():
@@ -93,6 +97,12 @@ def coding_value(self):
     Categories.CLINICAL_NOTE.value: {
         "display": "Clinical note",
     },
+    Categories.DIAGNOSTIC_STUDIES_REPORT.value: {
+        "display": "Diagnostic Studies Report",
+    },
+    Categories.DIAGNOSTIC_PROCEDURE.value: {
+        "display": "Diagnostic Procedure",
+    },
 }
 
 TYPE_CATEGORIES = {
@@ -114,7 +124,11 @@ def coding_value(self):
     #
     # Clinical notes
     PointerTypes.SUMMARY_RECORD.value: Categories.CLINICAL_NOTE.value,
+    #
+    # Imaging
+    PointerTypes.MRA_UPPER_LIMB_ARTERY.value: Categories.DIAGNOSTIC_STUDIES_REPORT.value,
+    PointerTypes.MRI_AXILLA_BOTH.value: Categories.DIAGNOSTIC_PROCEDURE.value,
 }
 
 
-SYSTEM_SHORT_IDS = {"http://snomed.info/sct": "SCT"}
+SYSTEM_SHORT_IDS = {"http://snomed.info/sct": "SCT", "https://nicip.nhs.uk": "NICIP"}

layer/test_permissions/Y05868-TestApp-12345678/Y05868.json

@@ -2,5 +2,6 @@
   "http://snomed.info/sct|736253001",
   "http://snomed.info/sct|736253002",
   "http://snomed.info/sct|1363501000000100",
-  "http://snomed.info/sct|861421000000109"
+  "http://snomed.info/sct|861421000000109",
+  "https://nicip.nhs.uk|MAULR"
 ]