[PRMP-1637] Updated filter for search history lambda

lambdas/services/get_fhir_document_reference_history_service.py

@@ -6,7 +6,11 @@
 from models.fhir.R4.fhir_document_reference import Attachment, DocumentReferenceInfo
 from services.base.dynamo_service import DynamoDBService
 from utils.audit_logging_setup import LoggingService
-from utils.common_query_filters import FinalStatusFilter, patient_nhs_number_filter
+from utils.common_query_filters import (
+    FinalOrDeprecatedDocStatusFilter,
+    FinalStatusFilter,
+    patient_nhs_number_filter,
+)
 from utils.dynamo_query_filter_builder import DynamoQueryFilterBuilder
 from utils.exceptions import (
     InvalidDocumentReferenceException,
@@ -40,7 +44,7 @@ def get_document_reference_history(
             search_key=search_key,
             search_condition=s3_file_key,
             index_name=index_name,
-            query_filter=query_filter_by_nhs_number,
+            query_filter=FinalOrDeprecatedDocStatusFilter & query_filter_by_nhs_number,
         )
         return self.create_fhir_history_bundle(items)
 

lambdas/tests/unit/services/test_get_fhir_document_reference_history_service.py

@@ -11,7 +11,11 @@
     TEST_UUID,
 )
 from tests.unit.helpers.data.bulk_upload.test_data import TEST_DOCUMENT_REFERENCE
-from utils.common_query_filters import FinalStatusFilter, patient_nhs_number_filter
+from utils.common_query_filters import (
+    FinalOrDeprecatedDocStatusFilter,
+    FinalStatusFilter,
+    patient_nhs_number_filter,
+)
 from utils.exceptions import (
     InvalidDocumentReferenceException,
 )
@@ -171,10 +175,30 @@ def test_get_fhir_document_reference_history_bundle(
     items = [modified_doc_ref.model_dump(by_alias=True, exclude_none=True)]
     mock_query_table.return_value = items
 
+    expected_search_key = "S3FileKey"
+    expected_index_name = "S3FileKeyIndex"
+    expected_search_condition = TEST_NHS_NUMBER + "/" + TEST_UUID
+    expected_query_filter = (
+        FinalOrDeprecatedDocStatusFilter
+        & patient_nhs_number_filter(
+            DynamoQueryFilterBuilder(),
+            TEST_NHS_NUMBER,
+        )
+    )
+
     bundle = mock_get_fhir_doc_reference_history_service.get_document_reference_history(
         TEST_UUID,
         TEST_NHS_NUMBER,
     )
+
+    mock_get_fhir_doc_reference_history_service.dynamo_service.query_table.assert_called_with(
+        table_name=mock_get_fhir_doc_reference_history_service.lg_table,
+        search_key=expected_search_key,
+        search_condition=expected_search_condition,
+        query_filter=expected_query_filter,
+        index_name=expected_index_name,
+    )
+
     bundle["timestamp"] = "2026-02-26T00:00:00Z"
 
     expected_bundle = {

lambdas/utils/common_query_filters.py

@@ -71,6 +71,17 @@ def get_doc_status_final_filter(filter_builder: DynamoQueryFilterBuilder):
     return doc_status_filter_expression & filter_not_deleted
 
 
+def get_doc_status_final_or_deprecated_filter(filter_builder: DynamoQueryFilterBuilder):
+    filter_builder.add_condition(
+        "DocStatus",
+        AttributeOperator.IN,
+        ["final", "deprecated"],
+    )
+    doc_status_filter_expression = filter_builder.build()
+    filter_not_deleted = get_not_deleted_filter(filter_builder)
+    return doc_status_filter_expression & filter_not_deleted
+
+
 def not_superseded(filter_builder: DynamoQueryFilterBuilder):
     filter_builder.add_condition("Status", AttributeOperator.NOT_EQUAL, "superseded")
     return filter_builder.build()
@@ -98,6 +109,10 @@ def patient_nhs_number_filter(
 
 FinalStatusFilter = get_doc_status_final_filter(DynamoQueryFilterBuilder())
 
+FinalOrDeprecatedDocStatusFilter = get_doc_status_final_or_deprecated_filter(
+    DynamoQueryFilterBuilder(),
+)
+
 NotSuperseded = not_superseded(DynamoQueryFilterBuilder())
 
 FinalStatusAndNotSuperseded = NotSuperseded & FinalStatusFilter