CCM-10387: fix pw

Author: alexnuttall

lambdas/backend-api/src/templates/api/validate-letter-template-files.ts

@@ -127,6 +127,13 @@ export class ValidateLetterTemplateFilesLambda {
     }
 
     const clientOwned = template.owner.startsWith('CLIENT#');
+    const ownerFromDb = clientOwned ? template.owner.slice(7) : template.owner;
+
+    if (owner !== ownerFromDb) {
+      throw new Error(
+        'Unexpected mismatch between s3 path and database owner field'
+      );
+    }
 
     const downloads = [
       this.letterUploadRepository.download(
@@ -177,7 +184,7 @@ export class ValidateLetterTemplateFilesLambda {
       log.error('File parsing error:', error);
 
       await this.templateRepository.setLetterValidationResult(
-        { id: templateId, owner: template.owner, clientOwned },
+        { id: templateId, owner, clientOwned },
         versionId,
         false,
         [],
@@ -192,7 +199,7 @@ export class ValidateLetterTemplateFilesLambda {
     const valid = rtl || validateLetterTemplateFiles(pdf, csv);
 
     await this.templateRepository.setLetterValidationResult(
-      { id: templateId, owner: template.owner, clientOwned },
+      { id: templateId, owner, clientOwned },
       versionId,
       valid,
       pdf.personalisationParameters,

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

@@ -286,7 +286,6 @@ test.describe('letter complete e2e journey', () => {
 
   let userWithProofing: TestUser;
   let userWithoutProofing: TestUser;
-  let userDirectOwner: TestUser;
 
   test.beforeAll(async () => {
     userWithProofing = await createAuthHelper().getTestUser(
@@ -295,9 +294,6 @@ test.describe('letter complete e2e journey', () => {
     userWithoutProofing = await createAuthHelper().getTestUser(
       testUsers.User3.userId
     );
-    userDirectOwner = await createAuthHelper().getTestUser(
-      testUsers.User7.userId
-    );
   });
 
   test.afterAll(async () => {
@@ -357,41 +353,4 @@ test.describe('letter complete e2e journey', () => {
 
     await submit(page, templateStorageHelper, templateKey);
   });
-
-  test('Full journey - user-owner', async ({ page }) => {
-    const testStart = new Date();
-
-    await loginAsUser(userDirectOwner, page);
-
-    const templateKey = await create(
-      page,
-      templateStorageHelper,
-      userDirectOwner,
-      'PENDING_PROOF_REQUEST'
-    );
-
-    await continueAfterCreation(page);
-
-    const expandedTemplateId = await requestProof(
-      page,
-      templateStorageHelper,
-      templateKey
-    );
-
-    await checkEmail(
-      expandedTemplateId,
-      testStart,
-      'Proof Requested',
-      'proof-requested-sender'
-    );
-
-    await submit(page, templateStorageHelper, templateKey);
-
-    await checkEmail(
-      expandedTemplateId,
-      testStart,
-      'Template Submitted',
-      'template-submitted-sender'
-    );
-  });
 });