CCM-10283: Fix e2e tests

Author: chris-elliott-nhsd

tests/test-team/helpers/db/template-storage-helper.ts

@@ -267,13 +267,14 @@ export class TemplateStorageHelper {
   async getLetterProofMetadata(
     bucket: string,
     prefix: string,
+    supplier: string,
     templateId: string,
     version: string,
     ext: string
   ) {
     return await this.getS3Metadata(
       bucket,
-      `${prefix}/${templateId}/${version}.${ext}`
+      `${prefix}/${supplier}/${templateId}/${version}.${ext}`
     );
   }
 

tests/test-team/template-mgmt-e2e-tests/template-mgmt-letter-full.e2e.spec.ts

@@ -154,7 +154,7 @@ test.describe('letter complete e2e journey', () => {
         proofFilenames.map((filename) =>
           templateStorageHelper.getS3Metadata(
             process.env.TEMPLATES_QUARANTINE_BUCKET_NAME,
-            `proofs/${template.id}/${filename}`
+            `proofs/WTMMOCK/${template.id}/${filename}`
           )
         )
       );

tests/test-team/template-mgmt-e2e-tests/template-mgmt-proofing.e2e.spec.ts

@@ -57,18 +57,18 @@ test.describe('Letter Proofing', () => {
       `WTMMOCK/Outgoing/${process.env.SFTP_ENVIRONMENT}/proofs/${templateId}/proof-3.pdf`
     );
 
-    // invoke SFTP poll lambda
-    await lambdaClient.send(
-      new InvokeCommand({
-        FunctionName: process.env.SFTP_POLL_LAMBDA_NAME,
-        Payload: JSON.stringify({
-          supplier: 'WTMMOCK',
-        }),
-      })
-    );
-
     // check for expected results
     await expect(async () => {
+      // invoke SFTP poll lambda
+      await lambdaClient.send(
+        new InvokeCommand({
+          FunctionName: process.env.SFTP_POLL_LAMBDA_NAME,
+          Payload: JSON.stringify({
+            supplier: 'WTMMOCK',
+          }),
+        })
+      );
+
       const template = await templateStorageHelper.getTemplate({
         owner: user.userId,
         id: templateId,
@@ -99,6 +99,7 @@ test.describe('Letter Proofing', () => {
           await templateStorageHelper.getLetterProofMetadata(
             process.env.TEMPLATES_QUARANTINE_BUCKET_NAME,
             'proofs',
+            'WTMMOCK',
             templateId,
             fileName,
             'pdf'
@@ -177,6 +178,7 @@ test.describe('Letter Proofing', () => {
       expect(template.files?.proofs).toEqual({
         'proof.pdf': {
           fileName: `proof.pdf`,
+          supplier: 'WTMMOCK',
           virusScanStatus: 'FAILED',
         },
       });
@@ -186,6 +188,7 @@ test.describe('Letter Proofing', () => {
       const pdf = await templateStorageHelper.getLetterProofMetadata(
         process.env.TEMPLATES_QUARANTINE_BUCKET_NAME,
         'proofs',
+        'WTMMOCK',
         templateId,
         'proof',
         'pdf'