CCM-10422: revert

Author: alexnuttall

lambdas/sftp-letters/src/__tests__/app/request-proof.test.ts

@@ -288,7 +288,7 @@ describe('App', () => {
 
     expect(mocks.templateRepository.finaliseLock).toHaveBeenCalledTimes(1);
     expect(mocks.templateRepository.finaliseLock).toHaveBeenCalledWith(
-      `CLIENT#${clientId}`,
+      clientId,
       templateId
     );
 

lambdas/sftp-letters/src/app/request-proof.ts

@@ -163,7 +163,6 @@ export class App {
         templateId: z.string(),
         templateName: z.string(),
         testDataVersionId: z.string().optional(),
-        clientOwned: z.boolean().default(false),
       })
       .parse(JSON.parse(event));
   }

lambdas/sftp-letters/src/infra/user-data-repository.ts

@@ -51,25 +51,12 @@ export class UserDataRepository {
     };
   }
 
-  private pdfPath(
-    userOrClientId: string,
-    templateId: string,
-    version: string
-  ): string {
-    return path.join(
-      'pdf-template',
-      userOrClientId,
-      templateId,
-      `${version}.pdf`
-    );
+  private pdfPath(owner: string, templateId: string, version: string): string {
+    return path.join('pdf-template', owner, templateId, `${version}.pdf`);
   }
 
-  private csvPath(
-    userOrClientId: string,
-    templateId: string,
-    version: string
-  ): string {
-    return path.join('test-data', userOrClientId, templateId, `${version}.csv`);
+  private csvPath(owner: string, templateId: string, version: string): string {
+    return path.join('test-data', owner, templateId, `${version}.csv`);
   }
 
   private getReadableBody(

tests/accessibility/test-user-client.ts

@@ -28,7 +28,7 @@ export class TestUserClient {
       new PutParameterCommand({
         Name: `${this.clientSsmPathPrefix}/${clientId}`,
         Value: JSON.stringify({
-          features: { proofing: true, clientOwnership: true },
+          features: { proofing: true },
           campaignId: 'accessibility-test-campaign',
         } satisfies ClientConfiguration),
         Overwrite: true,

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

@@ -123,14 +123,10 @@ export class TemplateStorageHelper {
       )
     );
 
-    const files = keys.flatMap((key) => {
-      const userOrClientId = this.stripClientOwnerPrefix(key.owner);
-
-      return [
-        `pdf-template/${userOrClientId}/${key.id}.pdf`,
-        `test-data/${userOrClientId}/${key.id}.csv`,
-      ];
-    });
+    const files = keys.flatMap((key) => [
+      `pdf-template/${key.owner}/${key.id}.pdf`,
+      `test-data/${key.owner}/${key.id}.csv`,
+    ]);
 
     const s3Chunks = TemplateStorageHelper.chunk(files, 1000);
 
@@ -325,7 +321,7 @@ export class TemplateStorageHelper {
     version: string,
     ext: string
   ) {
-    return `${prefix}/${this.stripClientOwnerPrefix(key.owner)}/${key.id}/${version}.${ext}`;
+    return `${prefix}/${key.owner}/${key.id}/${version}.${ext}`;
   }
 
   private addClientOwnerPrefix(owner: string) {

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

@@ -204,17 +204,13 @@ function requestProof(
 
       expect(pdfHrefs.length).toBeGreaterThan(0);
 
-      const ownerPathSegment = templateKey.owner.startsWith('CLIENT#')
-        ? templateKey.owner.slice(7)
-        : templateKey.owner;
-
       const downloadBucketMetadata = await Promise.all(
         pdfHrefs.map((href) => {
           const [, downloadBucketPath] =
             (href as string).match(
               // eslint-disable-next-line security/detect-non-literal-regexp
               new RegExp(
-                `/templates/files/(${ownerPathSegment}/proofs/${templateKey.id}/[^/]+)/?$`
+                `/templates/files/(${templateKey.owner}/proofs/${templateKey.id}/[^/]+)/?$`
               )
             ) ?? [];