rm update to status

Author: alexnuttall

lambdas/sftp-letters/src/__tests__/app/send.test.ts

@@ -235,12 +235,11 @@ describe('App', () => {
       `${baseUploadDir}/${sftpEnvironment}/batches/${templateId}/${batchId}_MANIFEST.csv`
     );
 
-    expect(
-      mocks.templateRepository.updateToNotYetSubmitted
-    ).toHaveBeenCalledTimes(1);
-    expect(
-      mocks.templateRepository.updateToNotYetSubmitted
-    ).toHaveBeenCalledWith(owner, templateId);
+    expect(mocks.templateRepository.clearLock).toHaveBeenCalledTimes(1);
+    expect(mocks.templateRepository.clearLock).toHaveBeenCalledWith(
+      owner,
+      templateId
+    );
   });
 
   test('throws if proof request event is invalid JSON', async () => {
@@ -348,12 +347,10 @@ describe('App', () => {
     expect(mocks.sftpClient.exists).not.toHaveBeenCalled();
     expect(mocks.sftpClient.mkdir).not.toHaveBeenCalled();
     expect(mocks.sftpClient.put).not.toHaveBeenCalled();
-    expect(
-      mocks.templateRepository.updateToNotYetSubmitted
-    ).not.toHaveBeenCalled();
+    expect(mocks.templateRepository.clearLock).not.toHaveBeenCalled();
   });
 
-  test('exits early and does not send if the manifest is already in the SFTP server', async () => {
+  test('exits early and does not send if the manifest is already in the SFTP server, clears existing lock', async () => {
     const { app, mocks, logMessages } = setup();
 
     const personalisationFields = ['pdsField'];
@@ -433,11 +430,14 @@ describe('App', () => {
       `${baseUploadDir}/${sftpEnvironment}/batches/${templateId}/${batchId}_MANIFEST.csv`
     );
 
+    expect(mocks.templateRepository.clearLock).toHaveBeenCalledTimes(1);
+    expect(mocks.templateRepository.clearLock).toHaveBeenCalledWith(
+      owner,
+      templateId
+    );
+
     expect(mocks.sftpClient.mkdir).not.toHaveBeenCalled();
     expect(mocks.sftpClient.put).not.toHaveBeenCalled();
-    expect(
-      mocks.templateRepository.updateToNotYetSubmitted
-    ).not.toHaveBeenCalled();
   });
 
   test('logs handled errors', async () => {

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

@@ -25,35 +25,6 @@ function setup() {
 }
 
 describe('TemplateRepository', () => {
-  describe('updateToNotYetSubmitted', () => {
-    test('send command to update to NOT_YET_SUBMITTED, removes lock', async () => {
-      const { mocks, templateRepository } = setup();
-
-      mocks.client.on(UpdateCommand).resolvesOnce({});
-
-      await templateRepository.updateToNotYetSubmitted(owner, templateId);
-
-      expect(mocks.client).toHaveReceivedCommandWith(UpdateCommand, {
-        ExpressionAttributeNames: {
-          '#templateStatus': 'templateStatus',
-          '#updatedAt': 'updatedAt',
-          '#lockTime': 'lockTime',
-        },
-        ExpressionAttributeValues: {
-          ':templateStatus': 'NOT_YET_SUBMITTED',
-          ':updatedAt': expect.stringMatching(isoDateRegExp),
-        },
-        Key: {
-          id: templateId,
-          owner,
-        },
-        TableName: templatesTableName,
-        UpdateExpression:
-          'SET #templateStatus = :templateStatus, #updatedAt = :updatedAt REMOVE #lockTime',
-      });
-    });
-  });
-
   describe('acquireLock', () => {
     test('returns true when database update succeeds', async () => {
       const { mocks, templateRepository } = setup();
@@ -111,13 +82,13 @@ describe('TemplateRepository', () => {
     });
   });
 
-  describe('cancelLock', () => {
+  describe('clearLock', () => {
     test('removes lock attribute', async () => {
       const { mocks, templateRepository } = setup();
 
       mocks.client.on(UpdateCommand).resolvesOnce({});
 
-      await templateRepository.cancelLock(owner, templateId);
+      await templateRepository.clearLock(owner, templateId);
       expect(mocks.client).toHaveReceivedCommandWith(UpdateCommand, {
         ExpressionAttributeNames: {
           '#lockTime': 'lockTime',

lambdas/sftp-letters/src/app/send.ts

@@ -75,7 +75,7 @@ export class App {
         templateLogger.warn(
           'Manifest already exists, assuming duplicate event'
         );
-        await this.templateRepository.cancelLock(owner, templateId);
+        await this.templateRepository.clearLock(owner, templateId);
         return 'already-sent';
       }
 
@@ -95,9 +95,9 @@ export class App {
 
       await sftp.put(files.manifest, dest.manifest);
 
-      templateLogger.info('Updating template');
+      templateLogger.info('Removing lock');
 
-      await this.templateRepository.updateToNotYetSubmitted(owner, templateId);
+      await this.templateRepository.clearLock(owner, templateId);
 
       templateLogger.info('Sent proofing request');
 

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

@@ -29,20 +29,11 @@ export class TemplateRepository {
     return true;
   }
 
-  async cancelLock(owner: string, id: string) {
+  async clearLock(owner: string, id: string) {
     const update = new TemplateUpdateBuilder(this.templatesTableName, owner, id)
       .removeLockTime()
       .build();
 
     return await this.client.send(new UpdateCommand(update));
   }
-
-  async updateToNotYetSubmitted(owner: string, id: string) {
-    const update = new TemplateUpdateBuilder(this.templatesTableName, owner, id)
-      .setStatus('NOT_YET_SUBMITTED')
-      .removeLockTime()
-      .build();
-
-    return await this.client.send(new UpdateCommand(update));
-  }
 }

tests/test-team/template-mgmt-e2e-tests/template-mgmt-sftp-send-proof.e2e.spec.ts

@@ -74,7 +74,7 @@ test.describe('SFTP proof send', () => {
         'send-proof-letter',
         'PASSED'
       ),
-      // fields TBD
+      // 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',