CCM-8574: Fix for failing e2es

Author: alexnuttall

tests/test-team/config/e2e/e2e.config.ts

@@ -4,7 +4,7 @@ import baseConfig from '../playwright.config';
 
 const buildCommand = [
   'INCLUDE_AUTH_PAGES=true',
-  'NEXT_PUBLIC_TIME_TILL_LOGOUT_SECONDS=25',
+  'NEXT_PUBLIC_TIME_TILL_LOGOUT_SECONDS=900',
   'NEXT_PUBLIC_PROMPT_SECONDS_BEFORE_LOGOUT=5',
   'NEXT_PUBLIC_ENABLE_LETTERS=true',
   'npm run build && npm run start',

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

@@ -105,39 +105,20 @@ export class TemplateStorageHelper {
       )
     );
 
-    const owners = keys
-      .map((key) => key.owner)
-      .filter((owner, i, list) => list.indexOf(owner) === i);
+    const files = keys.flatMap((key) => [
+      `pdf-template/${key.owner}/${key.id}.pdf`,
+      `test-data/${key.owner}/${key.id}.csv`,
+    ]);
 
-    const files = await Promise.all(
-      owners.map(async (owner) => {
-        const pdfs = await this.s3.send(
-          new ListObjectsV2Command({
-            Bucket: process.env.TEMPLATES_INTERNAL_BUCKET_NAME,
-            Prefix: `pdf-template/${owner}`,
-          })
-        );
-
-        const csvs = await this.s3.send(
-          new ListObjectsV2Command({
-            Bucket: process.env.TEMPLATES_INTERNAL_BUCKET_NAME,
-            Prefix: `test-data/${owner}`,
-          })
-        );
-
-        return [...(pdfs.Contents || []), ...(csvs.Contents || [])];
-      })
-    );
-
-    const s3Chunks = TemplateStorageHelper.chunk(files.flat(), 1000);
+    const s3Chunks = TemplateStorageHelper.chunk(files, 1000);
 
     await Promise.all(
       s3Chunks.map((chunk) =>
         this.s3.send(
           new DeleteObjectsCommand({
             Bucket: process.env.TEMPLATES_INTERNAL_BUCKET_NAME,
             Delete: {
-              Objects: chunk.map(({ Key }) => ({ Key })),
+              Objects: chunk.map((key) => ({ Key: key })),
             },
           })
         )