[NRL-1051] Update feature branch with latest develop

Author: mattdean3-nhs

api/consumer/searchDocumentReference/search_document_reference.py

@@ -9,7 +9,7 @@
 from nrlf.core.logger import LogReference, logger
 from nrlf.core.model import ConnectionMetadata, ConsumerRequestParams
 from nrlf.core.response import Response, SpineErrorResponse
-from nrlf.core.validators import validate_type_system
+from nrlf.core.validators import validate_category, validate_type_system
 
 
 @request_handler(params=ConsumerRequestParams)
@@ -58,6 +58,16 @@ def handler(
             expression="type",
         )
 
+    if not validate_category(params.category):
+        logger.log(
+            LogReference.CONSEARCH002b,
+            category=params.category,
+        )  # TODO - Should update error message once permissioning by category is implemented
+        return SpineErrorResponse.INVALID_CODE_SYSTEM(
+            diagnostics="Invalid query parameter (The provided category is not valid)",
+            expression="category",
+        )
+
     custodian_id = (
         params.custodian_identifier.root.split("|", maxsplit=1)[1]
         if params.custodian_identifier
@@ -70,6 +80,9 @@ def handler(
     if params.type:
         self_link += f"&type={params.type.root}"
 
+    if params.category:
+        self_link += f"&category={params.category.root}"
+
     bundle = {
         "resourceType": "Bundle",
         "type": "searchset",
@@ -89,6 +102,7 @@ def handler(
         nhs_number=params.nhs_number,
         custodian=custodian_id,
         pointer_types=pointer_types,
+        categories=[params.category.root] if params.category else [],
     ):
         try:
             document_reference = DocumentReference.model_validate_json(result.document)

api/consumer/searchDocumentReference/tests/test_search_document_reference_consumer.py

@@ -135,6 +135,47 @@ def test_search_document_reference_happy_path_with_type(
     }
 
 
+@mock_aws
+@mock_repository
+def test_search_document_reference_happy_path_with_category(
+    repository: DocumentPointerRepository,
+):
+    doc_ref = load_document_reference("Y05868-736253002-Valid")
+    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",
+            "category": "http://snomed.info/sct|734163000",
+        },
+    )
+
+    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&category=http://snomed.info/sct|734163000",
+            }
+        ],
+        "total": 1,
+        "entry": [{"resource": doc_ref.model_dump(exclude_none=True)}],
+    }
+
+
 @mock_aws
 @mock_repository
 def test_search_document_reference_happy_path_with_nicip_type(
@@ -342,6 +383,51 @@ def test_search_document_reference_invalid_type(repository: DocumentPointerRepos
     }
 
 
+@mock_aws
+@mock_repository
+def test_search_document_reference_invalid_category(
+    repository: DocumentPointerRepository,
+):
+    event = create_test_api_gateway_event(
+        headers=create_headers(),
+        query_string_parameters={
+            "subject:identifier": "https://fhir.nhs.uk/Id/nhs-number|6700028191",
+            "category": "https://fhir.nhs.uk/CodeSystem/Document-Type|invalid",
+        },
+    )
+
+    result = handler(event, create_mock_context())
+    body = result.pop("body")
+
+    assert result == {
+        "statusCode": "400",
+        "headers": default_response_headers(),
+        "isBase64Encoded": False,
+    }
+
+    parsed_body = json.loads(body)
+    assert parsed_body == {
+        "resourceType": "OperationOutcome",
+        "issue": [
+            {
+                "severity": "error",
+                "code": "code-invalid",
+                "details": {
+                    "coding": [
+                        {
+                            "code": "INVALID_CODE_SYSTEM",
+                            "display": "Invalid code system",
+                            "system": "https://fhir.nhs.uk/ValueSet/Spine-ErrorOrWarningCode-1",
+                        }
+                    ]
+                },
+                "diagnostics": "Invalid query parameter (The provided category is not valid)",
+                "expression": ["category"],
+            }
+        ],
+    }
+
+
 @mock_aws
 @mock_repository
 def test_search_document_reference_invalid_json(repository: DocumentPointerRepository):

api/consumer/searchPostDocumentReference/search_post_document_reference.py

@@ -9,7 +9,7 @@
 from nrlf.core.logger import LogReference, logger
 from nrlf.core.model import ConnectionMetadata, ConsumerRequestParams
 from nrlf.core.response import Response, SpineErrorResponse
-from nrlf.core.validators import validate_type_system
+from nrlf.core.validators import validate_category, validate_type_system
 
 
 @request_handler(body=ConsumerRequestParams)
@@ -61,6 +61,16 @@ def handler(
             expression="type",
         )
 
+    if not validate_category(body.category):
+        logger.log(
+            LogReference.CONPOSTSEARCH002b,
+            type=body.category,
+        )  # TODO - Should update error message once permissioning by category is implemented
+        return SpineErrorResponse.INVALID_CODE_SYSTEM(
+            diagnostics="The provided category is not valid",
+            expression="category",
+        )
+
     custodian_id = (
         body.custodian_identifier.root.split("|", maxsplit=1)[1]
         if body.custodian_identifier
@@ -73,6 +83,9 @@ def handler(
     if body.type:
         self_link += f"&type={body.type.root}"
 
+    if body.category:
+        self_link += f"&category={body.category.root}"
+
     bundle = {
         "resourceType": "Bundle",
         "type": "searchset",
@@ -89,7 +102,10 @@ def handler(
     )
 
     for result in repository.search(
-        nhs_number=body.nhs_number, custodian=custodian_id, pointer_types=pointer_types
+        nhs_number=body.nhs_number,
+        custodian=custodian_id,
+        pointer_types=pointer_types,
+        categories=[body.category.root] if body.category else [],
     ):
         try:
             document_reference = DocumentReference.model_validate_json(result.document)

api/consumer/searchPostDocumentReference/tests/test_search_post_document_reference_consumer.py

@@ -144,6 +144,49 @@ def test_search_post_document_reference_happy_path_with_type(
     }
 
 
+@mock_aws
+@mock_repository
+def test_search_post_document_reference_happy_path_with_category(
+    repository: DocumentPointerRepository,
+):
+    doc_ref = load_document_reference("Y05868-736253002-Valid")
+    doc_pointer = DocumentPointer.from_document_reference(doc_ref)
+    repository.create(doc_pointer)
+
+    event = create_test_api_gateway_event(
+        headers=create_headers(),
+        body=json.dumps(
+            {
+                "subject:identifier": "https://fhir.nhs.uk/Id/nhs-number|6700028191",
+                "category": "http://snomed.info/sct|734163000",
+            },
+        ),
+    )
+
+    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&category=http://snomed.info/sct|734163000",
+            }
+        ],
+        "total": 1,
+        "entry": [{"resource": doc_ref.model_dump(exclude_none=True)}],
+    }
+
+
 @mock_aws
 @mock_repository
 def test_search_document_reference_no_results(repository: DocumentPointerRepository):
@@ -310,6 +353,53 @@ def test_search_post_document_reference_invalid_type(
     }
 
 
+@mock_aws
+@mock_repository
+def test_search_document_reference_invalid_category(
+    repository: DocumentPointerRepository,
+):
+    event = create_test_api_gateway_event(
+        headers=create_headers(),
+        body=json.dumps(
+            {
+                "subject:identifier": "https://fhir.nhs.uk/Id/nhs-number|6700028191",
+                "category": "https://fhir.nhs.uk/CodeSystem/Document-Type|invalid",
+            }
+        ),
+    )
+
+    result = handler(event, create_mock_context())
+    body = result.pop("body")
+
+    assert result == {
+        "statusCode": "400",
+        "headers": default_response_headers(),
+        "isBase64Encoded": False,
+    }
+
+    parsed_body = json.loads(body)
+    assert parsed_body == {
+        "resourceType": "OperationOutcome",
+        "issue": [
+            {
+                "severity": "error",
+                "code": "code-invalid",
+                "details": {
+                    "coding": [
+                        {
+                            "code": "INVALID_CODE_SYSTEM",
+                            "display": "Invalid code system",
+                            "system": "https://fhir.nhs.uk/ValueSet/Spine-ErrorOrWarningCode-1",
+                        }
+                    ]
+                },
+                "diagnostics": "The provided category is not valid",
+                "expression": ["category"],
+            }
+        ],
+    }
+
+
 @mock_aws
 @mock_repository
 def test_search_post_document_reference_invalid_json(