[PRMP-975] Document Search Results Backend - Pagination

app/cypress/e2e/0-ndr-core-tests/gp_user_workflows/download_lloyd_george_workflow.cy.js

@@ -122,7 +122,10 @@ describe('GP Workflow: View Lloyd George record', () => {
 
         cy.intercept('GET', '/SearchDocumentReferences*', {
             statusCode: 200,
-            body: testFiles,
+            body: {
+                references: testFiles,
+                nextPageToken: 'abc',
+            },
         }).as('searchDocumentReferences');
 
         cy.get('#verify-submit').click();
@@ -142,7 +145,10 @@ describe('GP Workflow: View Lloyd George record', () => {
 
                 cy.intercept('GET', '/SearchDocumentReferences*', {
                     statusCode: 200,
-                    body: testFiles,
+                    body: {
+                        references: testFiles,
+                        nextPageToken: 'abc',
+                    },
                 }).as('searchDocumentReferences');
 
                 setUpDownloadManifestIntercepts();
@@ -259,7 +265,10 @@ describe('GP Workflow: View Lloyd George record', () => {
 
                 cy.intercept('GET', '/SearchDocumentReferences*', {
                     statusCode: 200,
-                    body: singleTestFile,
+                    body: {
+                        references: singleTestFile,
+                        nextPageToken: 'abc'
+                    },
                 }).as('searchDocumentReferences');
 
                 setUpDownloadManifestIntercepts();

app/cypress/e2e/0-ndr-core-tests/pcse_user_workflows/download_patient_files_workflow.cy.js

@@ -40,7 +40,10 @@ describe('PCSE Workflow: Access and download found files', () => {
 
             cy.intercept('GET', '/SearchDocumentReferences*', {
                 statusCode: 200,
-                body: searchDocumentReferencesResponse,
+                body: {
+                    references: searchDocumentReferencesResponse,
+                    nextPageToken: 'abc',
+                },
             }).as('documentSearch');
 
             cy.get('#verify-submit').click();

app/src/components/blocks/_delete/removeRecordStage/RemoveRecordStage.test.tsx

@@ -38,10 +38,12 @@ const mockUseConfig = useConfig as Mock;
 
 const testFileName1 = 'John_1';
 const testFileName2 = 'John_2';
-const searchResults = [
-    buildSearchResult({ fileName: testFileName1 }),
-    buildSearchResult({ fileName: testFileName2 }),
-];
+const searchResults = {
+    references: [
+        buildSearchResult({ fileName: testFileName1 }),
+        buildSearchResult({ fileName: testFileName2 }),
+    ],
+};
 
 let history = createMemoryHistory({
     initialEntries: ['/'],
@@ -124,8 +126,8 @@ describe('RemoveRecordStage', () => {
                 ).toBeInTheDocument();
             });
 
-            expect(screen.getByText(searchResults[0].fileName)).toBeInTheDocument();
-            expect(screen.getByText(searchResults[1].fileName)).toBeInTheDocument();
+            expect(screen.getByText(searchResults.references[0].fileName)).toBeInTheDocument();
+            expect(screen.getByText(searchResults.references[1].fileName)).toBeInTheDocument();
         });
     });
 

app/src/helpers/requests/getDocumentSearchResults.test.ts

@@ -21,7 +21,7 @@ describe('[GET] getDocumentSearchResults', () => {
 
     test('Document search results handles a 2XX response', async () => {
         const searchResult = buildSearchResult();
-        const mockResults = [searchResult];
+        const mockResults = { references: [searchResult] };
         mockedAxios.get.mockImplementation(() =>
             Promise.resolve({ status: 200, data: mockResults }),
         );

app/src/helpers/requests/getDocumentSearchResults.ts

@@ -14,7 +14,7 @@ export type DocumentSearchResultsArgs = {
 };
 
 export type GetDocumentSearchResultsResponse = {
-    data: Array<SearchResult>;
+    references: Array<SearchResult>;
 };
 
 const getDocumentSearchResults = async ({
@@ -26,16 +26,17 @@ const getDocumentSearchResults = async ({
     const gatewayUrl = baseUrl + endpoints.DOCUMENT_SEARCH;
 
     try {
-        const response: GetDocumentSearchResultsResponse = await axios.get(gatewayUrl, {
+        const { data } = await axios.get<GetDocumentSearchResultsResponse>(gatewayUrl, {
             headers: {
                 ...baseHeaders,
             },
             params: {
                 patientId: nhsNumber?.replaceAll(/\s/g, ''), // replace whitespace
                 docType: docType == DOCUMENT_TYPE.ALL ? undefined : docType,
+                limit: 9999,
             },
         });
-        return response?.data;
+        return data.references;
     } catch (e) {
         if (isLocal) {
             return [

lambdas/enums/dynamo_filter.py

@@ -15,3 +15,5 @@ class AttributeOperator(Enum):
 class ConditionOperator(Enum):
     OR = "|"
     AND = "&"
+    EQUAL = "="
+    NOT_EQUAL = "<>"

lambdas/handlers/document_reference_search_handler.py

@@ -11,31 +11,33 @@
 from utils.decorators.override_error_check import override_error_check
 from utils.decorators.set_audit_arg import set_request_context_for_logging
 from utils.decorators.validate_patient_id import (
-    extract_nhs_number_from_event,
     validate_patient_id,
 )
 from utils.document_type_utils import extract_document_type_to_enum
 from utils.lambda_exceptions import DocumentRefSearchException
 from utils.lambda_response import ApiGatewayResponse
 from utils.request_context import request_context
+from utils.utilities import camelize_dict
 
 logger = LoggingService(__name__)
 
 
 @set_request_context_for_logging
 @validate_patient_id
-@ensure_environment_variables(names=["DYNAMODB_TABLE_LIST"])
+@ensure_environment_variables(names=["LLOYD_GEORGE_DYNAMODB_NAME"])
 @override_error_check
 @handle_lambda_exceptions
 def lambda_handler(event, context):
     request_context.app_interaction = LoggingAppInteraction.VIEW_PATIENT.value
     logger.info("Starting document reference search process")
 
-    nhs_number = extract_nhs_number_from_event(event)
-    
+    nhs_number, next_page_token, limit = extract_querystring_params(event)
+
     doc_type = event.get("queryStringParameters", {}).get("docType", None)
     try:
-        document_snomed_code = extract_document_type_to_enum(doc_type) if doc_type else None
+        document_snomed_code = (
+            extract_document_type_to_enum(doc_type) if doc_type else None
+        )
     except ValueError:
         raise DocumentRefSearchException(400, LambdaError.DocTypeInvalid)
 
@@ -48,25 +50,33 @@ def lambda_handler(event, context):
     doc_upload_iteration2_enabled = upload_lambda_enabled_flag_object[
         FeatureFlags.UPLOAD_DOCUMENT_ITERATION_2_ENABLED
     ]
-
     additional_filters = {}
     if doc_upload_iteration2_enabled:
         additional_filters["doc_status"] = "final"
     if document_snomed_code:
         additional_filters["document_snomed_code"] = document_snomed_code[0].value
 
-    response = document_reference_search_service.get_document_references(
-        nhs_number, 
-        check_upload_completed=True, 
-        additional_filters=additional_filters
+    logger.info("Searching for patient references with pagination.")
+
+    response_dict = (
+        document_reference_search_service.get_paginated_references_by_nhs_number(
+            nhs_number=nhs_number,
+            limit=limit,
+            next_page_token=next_page_token,
+            filter=additional_filters,
+        )
     )
+    response = camelize_dict(response_dict)
     logger.info("User is able to view docs", {"Result": "Successful viewing docs"})
 
-    if response:
-        return ApiGatewayResponse(
-            200, json.dumps(response), "GET"
-        ).create_api_gateway_response()
-    else:
-        return ApiGatewayResponse(
-            204, json.dumps([]), "GET"
-        ).create_api_gateway_response()
+    return ApiGatewayResponse(
+        200, json.dumps(response), "GET"
+    ).create_api_gateway_response()
+
+
+def extract_querystring_params(event):
+    nhs_number = event["queryStringParameters"]["patientId"]
+    next_page_token = event["queryStringParameters"].get("nextPageToken")
+    limit = event["queryStringParameters"].get("limit")
+
+    return nhs_number, next_page_token, limit