[PRMP-780] Fix add document journey (#875)

Author: adamwhitingnhs

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

@@ -96,6 +96,8 @@ describe('uploadDocuments', () => {
             documentReferenceId,
         });
 
+        const requestBody = JSON.parse(mockedAxios.put.mock.calls[0][1] as string);
+
         expect(mockedAxios.put).toHaveBeenCalledTimes(1);
         expect(mockedAxios.put).toHaveBeenCalledWith(
             baseUrl + endpoints.DOCUMENT_UPLOAD + `/${documentReferenceId}`,
@@ -107,6 +109,36 @@ describe('uploadDocuments', () => {
                 },
             },
         );
+
+        expect(requestBody).toMatchObject({
+            resourceType: 'DocumentReference',
+            subject: {
+                identifier: {
+                    system: 'https://fhir.nhs.uk/Id/nhs-number',
+                    value: nhsNumber,
+                },
+            },
+            type: {
+                coding: [
+                    {
+                        system: 'http://snomed.info/sct',
+                        code: '22151000087106',
+                    },
+                ],
+            },
+            content: [
+                {
+                    attachment: expect.objectContaining({
+                        fileName: documents[0].file.name,
+                        contentType: documents[0].file.type,
+                        docType: documents[0].docType,
+                        clientId: documents[0].id,
+                        versionId: documents[0].versionId,
+                    }),
+                },
+            ],
+        });
+
         expect(result).toEqual(mockUploadSession);
     });
 
@@ -458,6 +490,7 @@ describe('uploadDocuments', () => {
             contentType: documents[0].file.type,
             docType: documents[0].docType,
             clientId: documents[0].id,
+            versionId: documents[0].versionId,
         });
     });
 });

app/src/helpers/requests/uploadDocuments.ts

@@ -82,6 +82,13 @@ const uploadDocuments = async ({
     baseHeaders,
     documentReferenceId,
 }: UploadDocumentsArgs): Promise<UploadSession> => {
+    const attachments = documents.map((doc) => ({
+        fileName: doc.file.name,
+        contentType: doc.file.type,
+        docType: doc.docType,
+        clientId: doc.id,
+        versionId: doc.versionId,
+    }));
     const requestBody = {
         resourceType: 'DocumentReference',
         subject: {
@@ -100,13 +107,7 @@ const uploadDocuments = async ({
         },
         content: [
             {
-                attachment: documents.map((doc) => ({
-                    fileName: doc.file.name,
-                    contentType: doc.file.type,
-                    docType: doc.docType,
-                    clientId: doc.id,
-                    versionId: doc.versionId,
-                })),
+                attachment: documentReferenceId ? attachments[0] : attachments,
             },
         ],
         created: new Date(Date.now()).toISOString(),

app/src/helpers/test/testBuilders.ts

@@ -80,6 +80,7 @@ const buildDocument = (
         id: uuidv4(),
         docType: docType ?? DOCUMENT_TYPE.ARF,
         attempts: 0,
+        versionId: '1',
     };
     return mockDocument;
 };

lambdas/services/update_document_reference_service.py

@@ -10,7 +10,7 @@
 from services.document_service import DocumentService
 from services.put_fhir_document_reference_service import PutFhirDocumentReferenceService
 from utils.audit_logging_setup import LoggingService
-from utils.common_query_filters import CurrentStatusFile
+from utils.common_query_filters import CurrentStatusFile, NotDeleted
 from utils.constants.ssm import UPLOAD_PILOT_ODS_ALLOWED_LIST
 from utils.dynamo_utils import DocTypeTableRouter
 from utils.exceptions import (
@@ -155,7 +155,15 @@ def parse_document(self, document: dict) -> UploadRequestDocument:
 
         return validated_doc
 
-    def stop_if_upload_is_in_progress(self, previous_records: list[DocumentReference]):
+    def stop_if_upload_is_in_progress(self, nhs_number: str):
+        previous_records = (
+            self.document_service.fetch_available_document_references_by_type(
+                nhs_number=nhs_number,
+                doc_type=SupportedDocumentTypes.LG,
+                query_filter=NotDeleted,
+            )
+        )
+        
         if any(
             self.document_service.is_upload_in_process(document)
             for document in previous_records

lambdas/services/upload_document_reference_service.py

@@ -4,11 +4,11 @@
 from botocore.exceptions import ClientError
 from enums.metadata_field_names import DocumentReferenceMetadataFields
 from enums.virus_scan_result import VirusScanResult
-from lambdas.enums.lambda_error import LambdaError
-from lambdas.enums.snomed_codes import SnomedCodes
-from lambdas.utils.dynamo_utils import DocTypeTableRouter
-from lambdas.utils.lambda_exceptions import InvalidDocTypeException
-from lambdas.utils.s3_utils import DocTypeS3BucketRouter
+from enums.lambda_error import LambdaError
+from enums.snomed_codes import SnomedCodes
+from utils.dynamo_utils import DocTypeTableRouter
+from utils.lambda_exceptions import InvalidDocTypeException
+from utils.s3_utils import DocTypeS3BucketRouter
 from models.document_reference import DocumentReference
 from services.base.dynamo_service import DynamoDBService
 from services.base.s3_service import S3Service

lambdas/tests/e2e/conftest.py

@@ -17,7 +17,9 @@
 LLOYD_GEORGE_S3_BUCKET = os.environ.get("NDR_S3_BUCKET") or ""
 APIM_ENDPOINT = "internal-dev.api.service.nhs.uk"
 PDM_SNOMED = 717391000000106
-
+MTLS_ENDPOINT = os.environ.get("MTLS_ENDPOINT")
+CLIENT_CERT_PATH = os.environ.get("CLIENT_CERT_PATH")
+CLIENT_KEY_PATH = os.environ.get("CLIENT_KEY_PATH")
 
 @pytest.fixture
 def test_data():