Merge pull request #932 from NHSDigital/feature/eema1-NRL-497-moveCountToSearch

NRL-497 remove count endpoint and add _summary filter to search endpoint

Author: axelkrastek1-nhs

api/consumer/countDocumentReference/count_document_reference.py

@@ -87,6 +87,9 @@ def handler(
     if params.category:
         self_link += f"&category={params.category.root}"
 
+    if params.field_summary:
+        self_link += f"&_summary={params.field_summary.root}"
+
     bundle = {
         "resourceType": "Bundle",
         "type": "searchset",
@@ -102,6 +105,25 @@ def handler(
         pointer_types=pointer_types,
     )
 
+    if params.field_summary and params.field_summary.root == "count":
+        bundle = {
+            "resourceType": "Bundle",
+            "type": "searchset",
+            "link": [{"relation": "self", "url": self_link}],
+            "total": 0,
+        }
+        logger.log(LogReference.CONSEARCH006)
+
+        total = repository.count_by_nhs_number(
+            nhs_number=params.nhs_number,
+            pointer_types=pointer_types,
+        )
+        bundle["total"] = total
+        logger.log(LogReference.CONSEARCH007, total=total)
+        response = Response.from_resource(Bundle.model_validate(bundle))
+        logger.log(LogReference.CONSEARCH999)
+        return response
+
     for result in repository.search(
         nhs_number=params.nhs_number,
         custodian=custodian_id,

api/consumer/countDocumentReference/tests/test_count_document_reference.py

@@ -719,6 +719,46 @@ def test_search_document_reference_invalid_category(
     }
 
 
+@mock_aws
+@mock_repository
+def test_search_document_reference_filters_by_summary_count(
+    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",
+            "_summary": "count",
+        },
+    )
+
+    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",
+        "total": 1,
+        "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&_summary=count",
+            }
+        ],
+    }
+
+
 @mock_aws
 @mock_repository
 @patch("api.consumer.searchDocumentReference.search_document_reference.logger")

api/consumer/searchDocumentReference/search_document_reference.py

@@ -87,6 +87,9 @@ def handler(
     if body.category:
         self_link += f"&category={body.category.root}"
 
+    if body.field_summary:
+        self_link += f"&_summary={body.field_summary.root}"
+
     bundle = {
         "resourceType": "Bundle",
         "type": "searchset",
@@ -102,6 +105,25 @@ def handler(
         pointer_types=pointer_types,
     )
 
+    if body.field_summary and body.field_summary.root == "count":
+        bundle = {
+            "resourceType": "Bundle",
+            "type": "searchset",
+            "link": [{"relation": "self", "url": self_link}],
+            "total": 0,
+        }
+        logger.log(LogReference.CONPOSTSEARCH006)
+
+        total = repository.count_by_nhs_number(
+            nhs_number=body.nhs_number,
+            pointer_types=pointer_types,
+        )
+        bundle["total"] = total
+        logger.log(LogReference.CONPOSTSEARCH007, total=total)
+        response = Response.from_resource(Bundle.model_validate(bundle))
+        logger.log(LogReference.CONPOSTSEARCH999)
+        return response
+
     for result in repository.search(
         nhs_number=body.nhs_number,
         custodian=custodian_id,

api/consumer/searchDocumentReference/tests/test_search_document_reference_consumer.py

@@ -479,6 +479,48 @@ def test_search_document_reference_invalid_category(
     }
 
 
+@mock_aws
+@mock_repository
+def test_search_document_reference_filters_by_summary_count(
+    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",
+                "_summary": "count",
+            }
+        ),
+    )
+
+    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",
+        "total": 1,
+        "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&_summary=count",
+            }
+        ],
+    }
+
+
 @mock_aws
 @mock_repository
 @patch("api.consumer.searchPostDocumentReference.search_post_document_reference.logger")