CCM-10387: fix unit tests

Author: alexnuttall

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

@@ -28,6 +28,7 @@ jest.mocked(logger).child.mockReturnThis();
 const versionId = 'template-version-id';
 const templateId = 'template-id';
 const userId = 'template-owner';
+const clientId = 'client-id';
 
 function setup() {
   const mocks = {
@@ -148,8 +149,6 @@ describe('guard duty handler', () => {
   test('validates a client-owned template', async () => {
     const { handler, mocks } = setup();
 
-    const clientId = 'clientid';
-
     const event = makeGuardDutyMalwareScanResultNotificationEvent({
       detail: {
         s3ObjectDetails: {
@@ -221,7 +220,7 @@ describe('guard duty handler', () => {
     expect(
       mocks.templateRepository.setLetterValidationResult
     ).toHaveBeenCalledWith(
-      { id: templateId, owner: `CLIENT#${clientId}`, clientOwned: true },
+      { id: templateId, owner: clientId, clientOwned: true },
       versionId,
       true,
       pdf.personalisationParameters,
@@ -1018,7 +1017,7 @@ describe('guard duty handler', () => {
       detail: {
         s3ObjectDetails: {
           bucketName: 'quarantine-bucket',
-          objectKey: `pdf-template/${userId}/${templateId}/${versionId}.pdf`,
+          objectKey: `pdf-template/${clientId}/${templateId}/${versionId}.pdf`,
         },
         scanResultDetails: {
           scanResultStatus: 'NO_THREATS_FOUND',
@@ -1066,7 +1065,7 @@ describe('guard duty handler', () => {
       detail: {
         s3ObjectDetails: {
           bucketName: 'quarantine-bucket',
-          objectKey: `pdf-template/${userId}/${templateId}/${versionId}.pdf`,
+          objectKey: `pdf-template/${clientId}/${templateId}/${versionId}.pdf`,
         },
         scanResultDetails: {
           scanResultStatus: 'NO_THREATS_FOUND',

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

@@ -45,6 +45,7 @@ export class ValidateLetterTemplateFilesLambda {
     return { batchItemFailures };
   };
 
+  // eslint-disable-next-line sonarjs/cognitive-complexity
   guardDutyHandler = async (event: unknown) => {
     const { detail } = guardDutyEventValidator('PASSED').parse(event);
 
@@ -127,13 +128,6 @@ 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(