CCM-9872: Copy file to download bucket

Author: chris-elliott-nhsd

infrastructure/terraform/components/sandbox/README.md

@@ -31,6 +31,7 @@ No requirements.
 | <a name="output_api_base_url"></a> [api\_base\_url](#output\_api\_base\_url) | n/a |
 | <a name="output_cognito_user_pool_client_id"></a> [cognito\_user\_pool\_client\_id](#output\_cognito\_user\_pool\_client\_id) | n/a |
 | <a name="output_cognito_user_pool_id"></a> [cognito\_user\_pool\_id](#output\_cognito\_user\_pool\_id) | n/a |
+| <a name="output_download_bucket_name"></a> [download\_bucket\_name](#output\_download\_bucket\_name) | n/a |
 | <a name="output_internal_bucket_name"></a> [internal\_bucket\_name](#output\_internal\_bucket\_name) | n/a |
 | <a name="output_quarantine_bucket_name"></a> [quarantine\_bucket\_name](#output\_quarantine\_bucket\_name) | n/a |
 | <a name="output_send_proof_queue_url"></a> [send\_proof\_queue\_url](#output\_send\_proof\_queue\_url) | n/a |

infrastructure/terraform/components/sandbox/outputs.tf

@@ -34,6 +34,10 @@ output "quarantine_bucket_name" {
   value = module.backend_api.quarantine_bucket_name
 }
 
+output "download_bucket_name" {
+  value = module.backend_api.download_bucket_name
+}
+
 output "sftp_poll_lambda_name" {
   value = module.backend_api.sftp_poll_lambda_name
 }

infrastructure/terraform/modules/backend-api/README.md

@@ -64,6 +64,7 @@ No requirements.
 | Name | Description |
 |------|-------------|
 | <a name="output_api_base_url"></a> [api\_base\_url](#output\_api\_base\_url) | n/a |
+| <a name="output_download_bucket_name"></a> [download\_bucket\_name](#output\_download\_bucket\_name) | n/a |
 | <a name="output_internal_bucket_name"></a> [internal\_bucket\_name](#output\_internal\_bucket\_name) | n/a |
 | <a name="output_quarantine_bucket_name"></a> [quarantine\_bucket\_name](#output\_quarantine\_bucket\_name) | n/a |
 | <a name="output_send_proof_queue_url"></a> [send\_proof\_queue\_url](#output\_send\_proof\_queue\_url) | n/a |

infrastructure/terraform/modules/backend-api/locals.tf

@@ -47,6 +47,7 @@ locals {
     TEMPLATES_EVENT_SOURCE           = local.event_source
     TEMPLATES_INTERNAL_BUCKET_NAME   = module.s3bucket_internal.id
     TEMPLATES_QUARANTINE_BUCKET_NAME = module.s3bucket_quarantine.id
+    TEMPLATES_DOWNLOAD_BUCKET_NAME   = module.s3bucket_download.id
     TEMPLATES_TABLE_NAME             = aws_dynamodb_table.templates.name
     ENABLE_PROOFING                  = var.enable_proofing
   }

infrastructure/terraform/modules/backend-api/outputs.tf

@@ -26,6 +26,10 @@ output "quarantine_bucket_name" {
   value = module.s3bucket_quarantine.id
 }
 
+output "download_bucket_name" {
+  value = module.s3bucket_download.id
+}
+
 output "sftp_poll_lambda_name" {
   value = module.lambda_sftp_poll.function_name
 }

lambdas/backend-api/src/__tests__/templates/api/process-proof.test.ts

@@ -8,22 +8,34 @@ test.each([
   [
     'NO_THREATS_FOUND',
     'PASSED',
-    (letterFileRepository: LetterFileRepository) =>
+    (letterFileRepository: LetterFileRepository) => {
       expect(
         letterFileRepository.copyFromQuarantineToInternal
       ).toHaveBeenCalledWith(
         'proofs/template-id/proof.pdf',
         'version-id',
         'proofs/template-owner/template-id/proof.pdf'
-      ),
+      );
+      expect(
+        letterFileRepository.copyFromQuarantineToDownload
+      ).toHaveBeenCalledWith(
+        'proofs/template-id/proof.pdf',
+        'version-id',
+        'template-owner/proofs/template-id/proof.pdf'
+      );
+    },
   ],
   [
     'THREATS_FOUND',
     'FAILED',
-    (letterFileRepository) =>
+    (letterFileRepository) => {
       expect(
         letterFileRepository.copyFromQuarantineToInternal
-      ).not.toHaveBeenCalled(),
+      ).not.toHaveBeenCalled();
+      expect(
+        letterFileRepository.copyFromQuarantineToDownload
+      ).not.toHaveBeenCalled();
+    },
   ],
 ])(
   'calls dependencies as expected for a %s virus scan',

lambdas/backend-api/src/__tests__/templates/infra/letter-file-repository.test.ts

@@ -12,7 +12,8 @@ const setup = () => {
 
   const letterFileRepository = new LetterFileRepository(
     'quarantine-bucket',
-    'internal-bucket'
+    'internal-bucket',
+    'download-bucket'
   );
 
   return { letterFileRepository, mocks: { s3Client } };
@@ -39,6 +40,27 @@ describe('LetterUploadRepository', () => {
     });
   });
 
+  describe('copyFromQuarantineToDownload', () => {
+    it('copies pdf template files from quarantine to download', async () => {
+      const { letterFileRepository, mocks } = setup();
+
+      await letterFileRepository.copyFromQuarantineToDownload(
+        's3/object/key',
+        's3-object-version',
+        's3/download/key'
+      );
+
+      expect(mocks.s3Client).toHaveReceivedCommandWith(CopyObjectCommand, {
+        Bucket: 'download-bucket',
+        CopySource:
+          '/quarantine-bucket/s3/object/key?versionId=s3-object-version',
+        Key: 's3/download/key',
+        MetadataDirective: 'COPY',
+        TaggingDirective: 'COPY',
+      });
+    });
+  });
+
   describe('deleteFromQuarantine', () => {
     it('deletes files from quarantine', async () => {
       const { letterFileRepository, mocks } = setup();

lambdas/backend-api/src/__tests__/templates/infra/letter-upload-repository.test.ts

@@ -18,7 +18,8 @@ const setup = () => {
 
   const letterUploadRepository = new LetterUploadRepository(
     quarantineBucketName,
-    internalBucketName
+    internalBucketName,
+    'download-bucket'
   );
 
   return { letterUploadRepository, mocks: { s3Client } };

lambdas/backend-api/src/templates/api/process-proof.ts

@@ -41,6 +41,18 @@ export const createHandler =
         versionId,
         internalKey
       );
+
+      const downloadKey = LetterProofRepository.getDownloadKey(
+        owner,
+        templateId,
+        fileName
+      );
+
+      await letterFileRepository.copyFromQuarantineToDownload(
+        objectKey,
+        versionId,
+        downloadKey
+      );
     } else {
       logger.error({
         description: 'File found that did not pass virus scan',

lambdas/backend-api/src/templates/container.ts

@@ -29,7 +29,8 @@ export function createContainer() {
 
   const letterUploadRepository = new LetterUploadRepository(
     config.quarantineBucket,
-    config.internalBucket
+    config.internalBucket,
+    config.downloadBucket
   );
 
   const proofingQueue = new ProofingQueue(
@@ -54,11 +55,12 @@ export function createContainer() {
 }
 
 export const createLetterFileRepositoryContainer = () => {
-  const { quarantineBucket, internalBucket } = loadConfig();
+  const { quarantineBucket, internalBucket, downloadBucket } = loadConfig();
 
   const letterFileRepository = new LetterFileRepository(
     quarantineBucket,
-    internalBucket
+    internalBucket,
+    downloadBucket
   );
 
   return {