[PRMP-1550] Improve GetReportByODS lambda performance

Author: NogaNHS

lambdas/services/ods_report_service.py

@@ -14,6 +14,7 @@
 from services.base.dynamo_service import DynamoDBService
 from services.base.s3_service import S3Service
 from utils.audit_logging_setup import LoggingService
+from utils.common_query_filters import NotDeleted
 from utils.dynamo_query_filter_builder import DynamoQueryFilterBuilder
 from utils.lambda_exceptions import OdsReportException
 from utils.request_context import request_context
@@ -37,7 +38,7 @@ def get_nhs_numbers_by_ods(
         is_upload_to_s3_needed: bool = False,
         file_type_output: FileType = FileType.CSV,
     ):
-        results = self.scan_table_with_filter(ods_code)
+        results = self.query_table_by_index(ods_code)
         nhs_numbers = {
             item.get(DocumentReferenceMetadataFields.NHS_NUMBER.value)
             for item in results
@@ -98,27 +99,41 @@ def build_filter_expression(ods_codes: list[str]):
         )
 
     def query_table_by_index(self, ods_code: str):
+        ods_codes = [ods_code]
+        authorization_user = getattr(request_context, "authorization", {})
+        if (
+            authorization_user
+            and authorization_user.get("repository_role") == RepositoryRole.PCSE.value
+        ):
+            ods_codes = [
+                PatientOdsInactiveStatus.SUSPENDED,
+                PatientOdsInactiveStatus.DECEASED,
+            ]
         results = []
-
-        response = self.dynamo_service.query_table_by_index(
-            table_name=self.table_name,
-            index_name="OdsCodeIndex",
-            search_key=DocumentReferenceMetadataFields.CURRENT_GP_ODS.value,
-            search_condition=ods_code,
-        )
-        results += response["Items"]
-
-        if not response["Items"]:
-            logger.info("No records found for ODS code {}".format(ods_code))
-        while "LastEvaluatedKey" in response:
+        for ods_code in ods_codes:
             response = self.dynamo_service.query_table_by_index(
                 table_name=self.table_name,
                 index_name="OdsCodeIndex",
-                exclusive_start_key=response["LastEvaluatedKey"],
                 search_key=DocumentReferenceMetadataFields.CURRENT_GP_ODS.value,
                 search_condition=ods_code,
+                query_filter=NotDeleted,
             )
             results += response["Items"]
+
+            while "LastEvaluatedKey" in response:
+                response = self.dynamo_service.query_table_by_index(
+                    table_name=self.table_name,
+                    index_name="OdsCodeIndex",
+                    exclusive_start_key=response["LastEvaluatedKey"],
+                    search_key=DocumentReferenceMetadataFields.CURRENT_GP_ODS.value,
+                    search_condition=ods_code,
+                    query_filter=NotDeleted,
+                )
+                results += response["Items"]
+
+        if not results:
+            logger.info("No records found for ODS code {}".format(ods_code))
+            raise OdsReportException(404, LambdaError.NoDataFound)
         return results
 
     def create_and_save_ods_report(

lambdas/tests/unit/services/test_ods_report_service.py

@@ -41,6 +41,11 @@ def mock_scan_table_with_filter(mocker, ods_report_service):
     return mocker.patch.object(ods_report_service, "scan_table_with_filter")
 
 
+@pytest.fixture
+def mock_query_table_by_index(mocker, ods_report_service):
+    return mocker.patch.object(ods_report_service, "query_table_by_index")
+
+
 @pytest.fixture
 def mock_dynamo_service_scan_table(mocker, ods_report_service):
     return mocker.patch.object(ods_report_service.dynamo_service, "scan_whole_table")
@@ -67,32 +72,32 @@ def mock_get_pre_signed_url(mocker, ods_report_service):
 
 
 def test_get_nhs_numbers_by_ods(
-    ods_report_service, mock_scan_table_with_filter, mock_create_and_save_ods_report
+    ods_report_service, mock_query_table_by_index, mock_create_and_save_ods_report
 ):
-    mock_scan_table_with_filter.return_value = [
+    mock_query_table_by_index.return_value = [
         {DocumentReferenceMetadataFields.NHS_NUMBER.value: "NHS123"},
         {DocumentReferenceMetadataFields.NHS_NUMBER.value: "NHS456"},
     ]
 
     ods_report_service.get_nhs_numbers_by_ods("ODS123")
 
-    mock_scan_table_with_filter.assert_called_once_with("ODS123")
+    mock_query_table_by_index.assert_called_once_with("ODS123")
     mock_create_and_save_ods_report.assert_called_once_with(
         "ODS123", {"NHS123", "NHS456"}, False, False, "csv"
     )
 
 
 def test_get_nhs_numbers_by_ods_with_temp_folder(
-    ods_report_service, mock_scan_table_with_filter, mock_create_and_save_ods_report
+    ods_report_service, mock_query_table_by_index, mock_create_and_save_ods_report
 ):
-    mock_scan_table_with_filter.return_value = [
+    mock_query_table_by_index.return_value = [
         {DocumentReferenceMetadataFields.NHS_NUMBER.value: "NHS123"},
         {DocumentReferenceMetadataFields.NHS_NUMBER.value: "NHS456"},
     ]
 
     ods_report_service.get_nhs_numbers_by_ods("ODS123", is_upload_to_s3_needed=True)
 
-    mock_scan_table_with_filter.assert_called_once_with("ODS123")
+    mock_query_table_by_index.assert_called_once_with("ODS123")
     mock_create_and_save_ods_report.assert_called_once_with(
         "ODS123", {"NHS123", "NHS456"}, False, True, "csv"
     )