set lock for one month to "finalise"

Author: alexnuttall

infrastructure/terraform/components/acct/variables.tf

@@ -110,6 +110,6 @@ variable "letter_suppliers" {
     enable_polling   = bool
     default_supplier = optional(bool)
   }))
-  description = "Letter suppliers enabled in the environment"
+  description = "Letter suppliers enabled in the account (across all environments)"
   default     = {}
 }

infrastructure/terraform/components/sandbox/variables.tf

@@ -47,12 +47,6 @@ variable "default_tags" {
   default     = {}
 }
 
-variable "parent_acct_environment" {
-  type        = string
-  description = "Name of the environment responsible for the acct resources used"
-  default     = "main"
-}
-
 ##
 # Variables specific to the "sandbox"component
 ##

lambdas/sftp-letters/src/__tests__/infra/template-lock-repository.test.ts

@@ -41,13 +41,12 @@ describe('TemplateLockRepository', () => {
           '#sftpSendLockTime': 'sftpSendLockTime',
         },
         ExpressionAttributeValues: {
-          ':condition_1_sftpSendLockTime': 0,
           ':condition_2_sftpSendLockTime': mockDate.getTime() + sendLockTtlMs,
           ':updatedAt': expect.stringMatching(isoDateRegExp),
           ':sftpSendLockTime': mockDate.getTime(),
         },
         ConditionExpression:
-          '#sftpSendLockTime <> :condition_1_sftpSendLockTime AND #sftpSendLockTime > :condition_2_sftpSendLockTime OR attribute_not_exists (#sftpSendLockTime)',
+          'attribute_not_exists (#sftpSendLockTime) OR #sftpSendLockTime > :condition_2_sftpSendLockTime',
         Key: {
           id: templateId,
           owner,
@@ -98,8 +97,8 @@ describe('TemplateLockRepository', () => {
           '#sftpSendLockTime': 'sftpSendLockTime',
         },
         ExpressionAttributeValues: {
-          ':updatedAt': expect.stringMatching(isoDateRegExp),
-          ':sftpSendLockTime': 0,
+          ':updatedAt': expect.any(String),
+          ':sftpSendLockTime': mockDate.getTime() + 2_592_000_000,
         },
         Key: {
           id: templateId,

lambdas/sftp-letters/src/infra/template-lock-repository.ts

@@ -2,6 +2,8 @@ import { ConditionalCheckFailedException } from '@aws-sdk/client-dynamodb';
 import { DynamoDBDocumentClient, UpdateCommand } from '@aws-sdk/lib-dynamodb';
 import { TemplateUpdateBuilder } from 'nhs-notify-entity-update-command-builder';
 
+const THIRTY_DAYS_MS = 2_592_000_000;
+
 export class TemplateLockRepository {
   constructor(
     private readonly client: DynamoDBDocumentClient,
@@ -14,7 +16,7 @@ export class TemplateLockRepository {
     const time = this.getDate().getTime();
 
     const update = new TemplateUpdateBuilder(this.templatesTableName, owner, id)
-      .setLockTimeConditionally('sftpSendLockTime', time, time + this.lockTtl)
+      .setLockTime('sftpSendLockTime', time, time + this.lockTtl)
       .build();
 
     try {
@@ -30,8 +32,10 @@ export class TemplateLockRepository {
   }
 
   async finaliseLock(owner: string, id: string) {
+    const time = this.getDate().getTime();
+
     const update = new TemplateUpdateBuilder(this.templatesTableName, owner, id)
-      .setLockTimeUnconditionally('sftpSendLockTime', 0)
+      .setLockTimeUnconditional('sftpSendLockTime', time + THIRTY_DAYS_MS)
       .build();
 
     return await this.client.send(new UpdateCommand(update));

utils/entity-update-command-builder/src/__tests__/template-update-builder.test.ts

@@ -11,7 +11,7 @@ beforeAll(() => {
   jest.setSystemTime(mockDate);
 });
 
-describe('TemplateBuilder', () => {
+describe('TemplateUpdateBuilder', () => {
   describe('build', () => {
     test('after initialisation returns default update (updatedAt)', () => {
       const builder = new TemplateUpdateBuilder(
@@ -167,29 +167,25 @@ describe('TemplateBuilder', () => {
     });
   });
 
-  describe('setLockTimeConditionally', () => {
-    test('sets lock time if no lock exists, or lock is not finalised (set to zero)', () => {
+  describe('setLockTime', () => {
+    test('sets lock time if no lock exists', () => {
       const builder = new TemplateUpdateBuilder(
         mockTableName,
         mockOwner,
         mockId
       );
 
-      const res = builder
-        .setLockTimeConditionally('sftpSendLockTime', 500)
-        .build();
+      const res = builder.setLockTime('sftpSendLockTime', 500).build();
 
       expect(res).toEqual({
-        ConditionExpression:
-          '#sftpSendLockTime <> :condition_1_sftpSendLockTime OR attribute_not_exists (#sftpSendLockTime)',
+        ConditionExpression: 'attribute_not_exists (#sftpSendLockTime)',
         ExpressionAttributeNames: {
           '#sftpSendLockTime': 'sftpSendLockTime',
           '#updatedAt': 'updatedAt',
         },
         ExpressionAttributeValues: {
           ':sftpSendLockTime': 500,
           ':updatedAt': '2025-01-01T09:00:00.000Z',
-          ':condition_1_sftpSendLockTime': 0,
         },
         Key: {
           id: 'Hello2',
@@ -208,19 +204,16 @@ describe('TemplateBuilder', () => {
         mockId
       );
 
-      const res = builder
-        .setLockTimeConditionally('sftpSendLockTime', 1000, 1500)
-        .build();
+      const res = builder.setLockTime('sftpSendLockTime', 1000, 1500).build();
 
       expect(res).toEqual({
         ConditionExpression:
-          '#sftpSendLockTime <> :condition_1_sftpSendLockTime AND #sftpSendLockTime > :condition_2_sftpSendLockTime OR attribute_not_exists (#sftpSendLockTime)',
+          'attribute_not_exists (#sftpSendLockTime) OR #sftpSendLockTime > :condition_2_sftpSendLockTime',
         ExpressionAttributeNames: {
           '#sftpSendLockTime': 'sftpSendLockTime',
           '#updatedAt': 'updatedAt',
         },
         ExpressionAttributeValues: {
-          ':condition_1_sftpSendLockTime': 0,
           ':condition_2_sftpSendLockTime': 1500,
           ':sftpSendLockTime': 1000,
           ':updatedAt': '2025-01-01T09:00:00.000Z',
@@ -236,7 +229,7 @@ describe('TemplateBuilder', () => {
     });
   });
 
-  describe('setLockTimeUnconditionally', () => {
+  describe('setLockTimeUnconditional', () => {
     test('sets lock time without conditions', () => {
       const builder = new TemplateUpdateBuilder(
         mockTableName,
@@ -245,7 +238,7 @@ describe('TemplateBuilder', () => {
       );
 
       const res = builder
-        .setLockTimeUnconditionally('sftpSendLockTime', 500)
+        .setLockTimeUnconditional('sftpSendLockTime', 1)
         .build();
 
       expect(res).toEqual({
@@ -254,7 +247,7 @@ describe('TemplateBuilder', () => {
           '#updatedAt': 'updatedAt',
         },
         ExpressionAttributeValues: {
-          ':sftpSendLockTime': 500,
+          ':sftpSendLockTime': 1,
           ':updatedAt': '2025-01-01T09:00:00.000Z',
         },
         Key: {

utils/entity-update-command-builder/src/template-update-builder.ts

@@ -34,31 +34,23 @@ export class TemplateUpdateBuilder extends EntityUpdateBuilder<MergedTemplate> {
     return this;
   }
 
-  setLockTimeConditionally(
+  setLockTime(
     lockField: 'sftpSendLockTime',
     timeMs: number,
     lockExpiryTimeMs?: number
   ) {
     this.updateBuilder
       .setValue(lockField, timeMs)
-      .andCondition(lockField, 0, '<>');
+      .fnCondition(lockField, null, 'attribute_not_exists');
 
     if (lockExpiryTimeMs) {
-      this.updateBuilder.andCondition(lockField, lockExpiryTimeMs, '>');
+      this.updateBuilder.orCondition(lockField, lockExpiryTimeMs, '>');
     }
 
-    this.updateBuilder.fnCondition(
-      lockField,
-      null,
-      'attribute_not_exists',
-      false,
-      'OR'
-    );
-
     return this;
   }
 
-  setLockTimeUnconditionally(lockField: 'sftpSendLockTime', timeMs: number) {
+  setLockTimeUnconditional(lockField: 'sftpSendLockTime', timeMs: number) {
     this.updateBuilder.setValue(lockField, timeMs);
 
     return this;