rm update to status

alexnuttall · alexnuttall · commit e38f0055231f · 2025-04-14T12:21:19.000+01:00
diff --git a/infrastructure/terraform/modules/backend-api/module_sqs_quarantine_scan_enrichment.tf b/infrastructure/terraform/modules/backend-api/module_sqs_quarantine_scan_enrichment.tf
@@ -1,5 +1,5 @@
 module "sqs_quarantine_scan_enrichment" {
-  source = "git::https://github.com/NHSDigital/nhs-notify-shared-modules.git//infrastructure/modules/sqs?ref=v1.0.14"
+  source = "git::https://github.com/NHSDigital/nhs-notify-shared-modules.git//infrastructure/modules/sqs?ref=v2.0.1"
 
   aws_account_id = var.aws_account_id
   component      = var.component
diff --git a/infrastructure/terraform/modules/backend-api/module_sqs_sftp_upload_queue.tf b/infrastructure/terraform/modules/backend-api/module_sqs_sftp_upload_queue.tf
@@ -1,5 +1,5 @@
 module "sftp_upload_queue" {
-  source = "git::https://github.com/NHSDigital/nhs-notify-shared-modules.git//infrastructure/modules/sqs?ref=v1.0.14"
+  source = "git::https://github.com/NHSDigital/nhs-notify-shared-modules.git//infrastructure/modules/sqs?ref=v2.0.1"
 
   aws_account_id = var.aws_account_id
   component      = var.component
@@ -10,7 +10,7 @@ module "sftp_upload_queue" {
 
   sqs_kms_key_arn = var.kms_key_arn
 
-  visibility_timeout = 60
+  visibility_timeout_seconds = 60
 
   create_dlq = true
 }
diff --git a/infrastructure/terraform/modules/backend-api/module_sqs_virus_scan_failed_delete_object_dlq.tf b/infrastructure/terraform/modules/backend-api/module_sqs_virus_scan_failed_delete_object_dlq.tf
@@ -1,5 +1,5 @@
 module "sqs_virus_scan_failed_delete_object_dlq" {
-  source = "git::https://github.com/NHSDigital/nhs-notify-shared-modules.git//infrastructure/modules/sqs?ref=v1.0.14"
+  source = "git::https://github.com/NHSDigital/nhs-notify-shared-modules.git//infrastructure/modules/sqs?ref=v2.0.1"
 
   aws_account_id = var.aws_account_id
   component      = var.component
diff --git a/infrastructure/terraform/modules/backend-api/module_sqs_virus_scan_passed_copy_object_dlq.tf b/infrastructure/terraform/modules/backend-api/module_sqs_virus_scan_passed_copy_object_dlq.tf
@@ -1,5 +1,5 @@
 module "sqs_virus_scan_passed_copy_object_dlq" {
-  source = "git::https://github.com/NHSDigital/nhs-notify-shared-modules.git//infrastructure/modules/sqs?ref=v1.0.14"
+  source = "git::https://github.com/NHSDigital/nhs-notify-shared-modules.git//infrastructure/modules/sqs?ref=v2.0.1"
 
   aws_account_id = var.aws_account_id
   component      = var.component
diff --git a/infrastructure/terraform/modules/backend-api/module_sqs_virus_scan_set_file_status_dlq.tf b/infrastructure/terraform/modules/backend-api/module_sqs_virus_scan_set_file_status_dlq.tf
@@ -1,5 +1,5 @@
 module "sqs_virus_scan_set_file_status_dlq" {
-  source = "git::https://github.com/NHSDigital/nhs-notify-shared-modules.git//infrastructure/modules/sqs?ref=v1.0.14"
+  source = "git::https://github.com/NHSDigital/nhs-notify-shared-modules.git//infrastructure/modules/sqs?ref=v2.0.1"
 
   aws_account_id = var.aws_account_id
   component      = var.component
diff --git a/lambdas/sftp-letters/src/__tests__/fixtures/test-data.csv b/lambdas/sftp-letters/src/__tests__/fixtures/test-data.csv
@@ -1,5 +1,5 @@
-﻿Personalisation field,Short length data example,Medium length data example,Long length data example
-appointment_date,Monday 1 May 2025,Saturday 10 April 2025,Wednesday 10 September 2025
-appointment_time,1:56pm,11:56am,12:56pm
-appointment_location,"The Epping Breast Screening Unit, St Margaret's Hospital, The Plain, Epping, Essex, CM16 6TN","The Royal Shrewsbury Hospital, Breast Screening Office, Treatment Centre, Mytton Oak Road, Shrewsbury, SY3 8XQ","City, Sandwell & Walsall BSS, The Rosewood Centre, Sandwell & West Birmingham Hospitals NHS Trust, The Birmingham Treatment Centre, City Hospital, Dudley Road, Birmingham, B18 7QH"
-contact_telephone_number,020 3299 9010,020 3299 9010,020 3299 9010
+﻿Personalisation field,Short length data example,Medium length data example,Long length data example
+appointment_date,Monday 1 May 2025,Saturday 10 April 2025,Wednesday 10 September 2025
+appointment_time,1:56pm,11:56am,12:56pm
+appointment_location,"The Epping Breast Screening Unit, St Margaret's Hospital, The Plain, Epping, Essex, CM16 6TN","The Royal Shrewsbury Hospital, Breast Screening Office, Treatment Centre, Mytton Oak Road, Shrewsbury, SY3 8XQ","City, Sandwell & Walsall BSS, The Rosewood Centre, Sandwell & West Birmingham Hospitals NHS Trust, The Birmingham Treatment Centre, City Hospital, Dudley Road, Birmingham, B18 7QH"
+contact_telephone_number,020 3299 9010,020 3299 9010,020 3299 9010
diff --git a/lambdas/sftp-letters/src/__tests__/infra/template-repository.test.ts b/lambdas/sftp-letters/src/__tests__/infra/template-repository.test.ts
@@ -38,21 +38,22 @@ describe('TemplateRepository', () => {
       expect(mocks.client).toHaveReceivedCommandWith(UpdateCommand, {
         ExpressionAttributeNames: {
           '#updatedAt': 'updatedAt',
-          '#lockTime': 'lockTime',
+          '#sftpSendLockTime': 'sftpSendLockTime',
         },
         ExpressionAttributeValues: {
           ':updatedAt': expect.stringMatching(isoDateRegExp),
-          ':condition_2_lockTime': mockDate.getTime() + sendLockTtlMs,
-          ':lockTime': mockDate.getTime(),
+          ':condition_2_sftpSendLockTime': mockDate.getTime() + sendLockTtlMs,
+          ':sftpSendLockTime': mockDate.getTime(),
         },
         ConditionExpression:
-          'attribute_not_exists (#lockTime) OR #lockTime > :condition_2_lockTime',
+          'attribute_not_exists (#sftpSendLockTime) OR #sftpSendLockTime > :condition_2_sftpSendLockTime',
         Key: {
           id: templateId,
           owner,
         },
         TableName: templatesTableName,
-        UpdateExpression: 'SET #lockTime = :lockTime, #updatedAt = :updatedAt',
+        UpdateExpression:
+          'SET #sftpSendLockTime = :sftpSendLockTime, #updatedAt = :updatedAt',
       });
     });
 
@@ -91,7 +92,7 @@ describe('TemplateRepository', () => {
       await templateRepository.clearLock(owner, templateId);
       expect(mocks.client).toHaveReceivedCommandWith(UpdateCommand, {
         ExpressionAttributeNames: {
-          '#lockTime': 'lockTime',
+          '#sftpSendLockTime': 'sftpSendLockTime',
           '#updatedAt': 'updatedAt',
         },
         ExpressionAttributeValues: {
@@ -102,7 +103,8 @@ describe('TemplateRepository', () => {
           owner,
         },
         TableName: templatesTableName,
-        UpdateExpression: 'SET #updatedAt = :updatedAt REMOVE #lockTime',
+        UpdateExpression:
+          'SET #updatedAt = :updatedAt REMOVE #sftpSendLockTime',
       });
     });
   });
diff --git a/lambdas/sftp-letters/src/infra/template-repository.ts b/lambdas/sftp-letters/src/infra/template-repository.ts
@@ -14,7 +14,7 @@ export class TemplateRepository {
     const time = this.getDate().getTime();
 
     const update = new TemplateUpdateBuilder(this.templatesTableName, owner, id)
-      .setLockTime(time, time + this.lockTtl)
+      .setLockTime('sftpSendLockTime', time, time + this.lockTtl)
       .build();
 
     try {
@@ -31,7 +31,7 @@ export class TemplateRepository {
 
   async clearLock(owner: string, id: string) {
     const update = new TemplateUpdateBuilder(this.templatesTableName, owner, id)
-      .removeLockTime()
+      .removeLockTime('sftpSendLockTime')
       .build();
 
     return await this.client.send(new UpdateCommand(update));
diff --git a/tests/test-team/fixtures/pdf-upload/with-personalisation/test-data.csv b/tests/test-team/fixtures/pdf-upload/with-personalisation/test-data.csv
@@ -1,5 +1,5 @@
-﻿Personalisation field,Short length data example,Medium length data example,Long length data example
-appointment_date,Monday 1 May 2025,Saturday 10 April 2025,Wednesday 10 September 2025
-appointment_time,1:56pm,11:56am,12:56pm
-appointment_location,"The Epping Breast Screening Unit, St Margaret's Hospital, The Plain, Epping, Essex, CM16 6TN","The Royal Shrewsbury Hospital, Breast Screening Office, Treatment Centre, Mytton Oak Road, Shrewsbury, SY3 8XQ","City, Sandwell & Walsall BSS, The Rosewood Centre, Sandwell & West Birmingham Hospitals NHS Trust, The Birmingham Treatment Centre, City Hospital, Dudley Road, Birmingham, B18 7QH"
-contact_telephone_number,020 3299 9010,020 3299 9010,020 3299 9010
+﻿Personalisation field,Short length data example,Medium length data example,Long length data example
+appointment_date,Monday 1 May 2025,Saturday 10 April 2025,Wednesday 10 September 2025
+appointment_time,1:56pm,11:56am,12:56pm
+appointment_location,"The Epping Breast Screening Unit, St Margaret's Hospital, The Plain, Epping, Essex, CM16 6TN","The Royal Shrewsbury Hospital, Breast Screening Office, Treatment Centre, Mytton Oak Road, Shrewsbury, SY3 8XQ","City, Sandwell & Walsall BSS, The Rosewood Centre, Sandwell & West Birmingham Hospitals NHS Trust, The Birmingham Treatment Centre, City Hospital, Dudley Road, Birmingham, B18 7QH"
+contact_telephone_number,020 3299 9010,020 3299 9010,020 3299 9010
diff --git a/tests/test-team/template-mgmt-e2e-tests/template-mgmt-sftp-send-proof.e2e.spec.ts b/tests/test-team/template-mgmt-e2e-tests/template-mgmt-sftp-send-proof.e2e.spec.ts
@@ -77,7 +77,7 @@ test.describe('SFTP proof send', () => {
       // The status PENDING_PROOF_REQUEST doesn't exist yet
       // the template's 'personalisationFields' has no effect on the test
       // the sender lambda does not read the template
-      templateStatus: 'PENDING_PROOF_REQUEST',
+      templateStatus: 'PENDING_PROOF',
       personalisationFields,
     };
 
@@ -117,8 +117,8 @@ test.describe('SFTP proof send', () => {
       const updatedTemplate = await templateStorageHelper.getTemplate(key);
       const debugUpdated = JSON.stringify(updatedTemplate);
 
-      expect(updatedTemplate.templateStatus, debugUpdated).toBe(
-        'NOT_YET_SUBMITTED'
+      expect(updatedTemplate.updatedAt, debugUpdated).not.toBe(
+        template.updatedAt
       );
     }).toPass({ timeout: 5000 });
 
diff --git a/utils/entity-update-command-builder/src/__tests__/template-update-builder.test.ts b/utils/entity-update-command-builder/src/__tests__/template-update-builder.test.ts
@@ -175,24 +175,25 @@ describe('TemplateBuilder', () => {
         mockId
       );
 
-      const res = builder.setLockTime(500).build();
+      const res = builder.setLockTime('sftpSendLockTime', 500).build();
 
       expect(res).toEqual({
-        ConditionExpression: 'attribute_not_exists (#lockTime)',
+        ConditionExpression: 'attribute_not_exists (#sftpSendLockTime)',
         ExpressionAttributeNames: {
-          '#lockTime': 'lockTime',
+          '#sftpSendLockTime': 'sftpSendLockTime',
           '#updatedAt': 'updatedAt',
         },
         ExpressionAttributeValues: {
-          ':lockTime': 500,
+          ':sftpSendLockTime': 500,
           ':updatedAt': '2025-01-01T09:00:00.000Z',
         },
         Key: {
           id: 'Hello2',
           owner: 'Hello1',
         },
         TableName: 'TABLE_NAME',
-        UpdateExpression: 'SET #lockTime = :lockTime, #updatedAt = :updatedAt',
+        UpdateExpression:
+          'SET #sftpSendLockTime = :sftpSendLockTime, #updatedAt = :updatedAt',
       });
     });
 
@@ -203,26 +204,27 @@ describe('TemplateBuilder', () => {
         mockId
       );
 
-      const res = builder.setLockTime(1000, 1500).build();
+      const res = builder.setLockTime('sftpSendLockTime', 1000, 1500).build();
 
       expect(res).toEqual({
         ConditionExpression:
-          'attribute_not_exists (#lockTime) OR #lockTime > :condition_2_lockTime',
+          'attribute_not_exists (#sftpSendLockTime) OR #sftpSendLockTime > :condition_2_sftpSendLockTime',
         ExpressionAttributeNames: {
-          '#lockTime': 'lockTime',
+          '#sftpSendLockTime': 'sftpSendLockTime',
           '#updatedAt': 'updatedAt',
         },
         ExpressionAttributeValues: {
-          ':condition_2_lockTime': 1500,
-          ':lockTime': 1000,
+          ':condition_2_sftpSendLockTime': 1500,
+          ':sftpSendLockTime': 1000,
           ':updatedAt': '2025-01-01T09:00:00.000Z',
         },
         Key: {
           id: 'Hello2',
           owner: 'Hello1',
         },
         TableName: 'TABLE_NAME',
-        UpdateExpression: 'SET #lockTime = :lockTime, #updatedAt = :updatedAt',
+        UpdateExpression:
+          'SET #sftpSendLockTime = :sftpSendLockTime, #updatedAt = :updatedAt',
       });
     });
   });
@@ -235,11 +237,11 @@ describe('TemplateBuilder', () => {
         mockId
       );
 
-      const res = builder.removeLockTime().build();
+      const res = builder.removeLockTime('sftpSendLockTime').build();
 
       expect(res).toEqual({
         ExpressionAttributeNames: {
-          '#lockTime': 'lockTime',
+          '#sftpSendLockTime': 'sftpSendLockTime',
           '#updatedAt': 'updatedAt',
         },
         ExpressionAttributeValues: {
@@ -250,7 +252,8 @@ describe('TemplateBuilder', () => {
           owner: 'Hello1',
         },
         TableName: 'TABLE_NAME',
-        UpdateExpression: 'SET #updatedAt = :updatedAt REMOVE #lockTime',
+        UpdateExpression:
+          'SET #updatedAt = :updatedAt REMOVE #sftpSendLockTime',
       });
     });
   });
diff --git a/utils/entity-update-command-builder/src/template-update-builder.ts b/utils/entity-update-command-builder/src/template-update-builder.ts
@@ -34,20 +34,24 @@ export class TemplateUpdateBuilder extends EntityUpdateBuilder<MergedTemplate> {
     return this;
   }
 
-  setLockTime(timeMs: number, lockExpiryTimeMs?: number) {
+  setLockTime(
+    lockField: 'sftpSendLockTime',
+    timeMs: number,
+    lockExpiryTimeMs?: number
+  ) {
     this.updateBuilder
-      .setValue('lockTime', timeMs)
-      .fnCondition('lockTime', null, 'attribute_not_exists');
+      .setValue(lockField, timeMs)
+      .fnCondition(lockField, null, 'attribute_not_exists');
 
     if (lockExpiryTimeMs) {
-      this.updateBuilder.orCondition('lockTime', lockExpiryTimeMs, '>');
+      this.updateBuilder.orCondition(lockField, lockExpiryTimeMs, '>');
     }
 
     return this;
   }
 
-  removeLockTime() {
-    this.updateBuilder.removeAttribute('lockTime');
+  removeLockTime(lockField: 'sftpSendLockTime') {
+    this.updateBuilder.removeAttribute(lockField);
 
     return this;
   }
diff --git a/utils/entity-update-command-builder/src/types/template.ts b/utils/entity-update-command-builder/src/types/template.ts
@@ -18,7 +18,7 @@ export type MergedTemplate = {
   id: string;
   language?: Language;
   letterType?: LetterType;
-  lockTime?: number;
+  sftpSendLockTime?: number;
   message?: string;
   name: string;
   subject?: string;
