CCM-12327: increment lock number in proof handler

Author: harrim91

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

@@ -1188,11 +1188,12 @@ describe('templateRepository', () => {
         TableName: 'templates',
         Key: { id: 'template-id', owner: ownerWithClientPrefix },
         UpdateExpression:
-          'SET files.proofs.#fileName = :virusScanResult, updatedAt = :updatedAt',
+          'SET files.proofs.#fileName = :virusScanResult, updatedAt = :updatedAt ADD #lockNumber :lockNumberIncrement',
         ConditionExpression:
           'attribute_not_exists(files.proofs.#fileName) and not templateStatus in (:templateStatusDeleted, :templateStatusSubmitted)',
         ExpressionAttributeNames: {
           '#fileName': 'pdf-template.pdf',
+          '#lockNumber': 'lockNumber',
         },
         ExpressionAttributeValues: {
           ':templateStatusDeleted': 'DELETED',
@@ -1203,18 +1204,23 @@ describe('templateRepository', () => {
             virusScanStatus: 'PASSED',
             supplier: 'MBA',
           },
+          ':lockNumberIncrement': 1,
         },
       });
 
       expect(mocks.ddbDocClient).toHaveReceivedCommandWith(UpdateCommand, {
         TableName: 'templates',
         Key: { id: 'template-id', owner: ownerWithClientPrefix },
         UpdateExpression:
-          'SET templateStatus = :templateStatusProofAvailable, updatedAt = :updatedAt',
+          'SET templateStatus = :templateStatusProofAvailable, updatedAt = :updatedAt ADD #lockNumber :lockNumberIncrement',
+        ExpressionAttributeNames: {
+          '#lockNumber': 'lockNumber',
+        },
         ExpressionAttributeValues: {
           ':templateStatusWaitingForProof': 'WAITING_FOR_PROOF',
           ':templateStatusProofAvailable': 'PROOF_AVAILABLE',
           ':updatedAt': new Date().toISOString(),
+          ':lockNumberIncrement': 1,
         },
         ConditionExpression: 'templateStatus = :templateStatusWaitingForProof',
       });
@@ -1239,11 +1245,12 @@ describe('templateRepository', () => {
         TableName: 'templates',
         Key: { id: 'template-id', owner: ownerWithClientPrefix },
         UpdateExpression:
-          'SET files.proofs.#fileName = :virusScanResult, updatedAt = :updatedAt',
+          'SET files.proofs.#fileName = :virusScanResult, updatedAt = :updatedAt ADD #lockNumber :lockNumberIncrement',
         ConditionExpression:
           'attribute_not_exists(files.proofs.#fileName) and not templateStatus in (:templateStatusDeleted, :templateStatusSubmitted)',
         ExpressionAttributeNames: {
           '#fileName': 'pdf-template.pdf',
+          '#lockNumber': 'lockNumber',
         },
         ExpressionAttributeValues: {
           ':templateStatusDeleted': 'DELETED',
@@ -1254,6 +1261,7 @@ describe('templateRepository', () => {
             virusScanStatus: 'FAILED',
             supplier: 'MBA',
           },
+          ':lockNumberIncrement': 1,
         },
       });
 

lambdas/backend-api/src/templates/app/template-client.ts

@@ -322,7 +322,7 @@ export class TemplateClient {
     const submitResult = await this.templateRepository.submit(
       templateId,
       user,
-      lockNumber
+      lockNumberValidation.data
     );
 
     if (submitResult.error) {

lambdas/backend-api/src/templates/infra/template-repository.ts

@@ -237,6 +237,12 @@ export class TemplateRepository {
       return result;
     } catch (error) {
       if (error instanceof ConditionalCheckFailedException && error.Item) {
+        const oldItem = unmarshall(error.Item);
+
+        if (oldItem.lockNumber !== lockNumber) {
+          return failure(ErrorCase.CONFLICT, 'Invalid lock number', error);
+        }
+
         return failure(
           ErrorCase.CANNOT_SUBMIT,
           'Template cannot be submitted',
@@ -396,9 +402,10 @@ export class TemplateRepository {
         TableName: this.templatesTableName,
         Key: this.toDatabaseKey(templateKey),
         UpdateExpression:
-          'SET files.proofs.#fileName = :virusScanResult, updatedAt = :updatedAt',
+          'SET files.proofs.#fileName = :virusScanResult, updatedAt = :updatedAt ADD #lockNumber :lockNumberIncrement',
         ExpressionAttributeNames: {
           '#fileName': fileName,
+          '#lockNumber': 'lockNumber',
         },
         ExpressionAttributeValues: {
           ':templateStatusDeleted': 'DELETED' satisfies TemplateStatus,
@@ -409,6 +416,7 @@ export class TemplateRepository {
             virusScanStatus,
             supplier,
           } satisfies ProofFileDetails,
+          ':lockNumberIncrement': 1,
         },
         ConditionExpression:
           'attribute_not_exists(files.proofs.#fileName) and not templateStatus in (:templateStatusDeleted, :templateStatusSubmitted)',
@@ -425,13 +433,17 @@ export class TemplateRepository {
         TableName: this.templatesTableName,
         Key: this.toDatabaseKey(templateKey),
         UpdateExpression:
-          'SET templateStatus = :templateStatusProofAvailable, updatedAt = :updatedAt',
+          'SET templateStatus = :templateStatusProofAvailable, updatedAt = :updatedAt ADD #lockNumber :lockNumberIncrement',
+        ExpressionAttributeNames: {
+          '#lockNumber': 'lockNumber',
+        },
         ExpressionAttributeValues: {
           ':templateStatusWaitingForProof':
             'WAITING_FOR_PROOF' satisfies TemplateStatus,
           ':templateStatusProofAvailable':
             'PROOF_AVAILABLE' satisfies TemplateStatus,
           ':updatedAt': new Date().toISOString(),
+          ':lockNumberIncrement': 1,
         },
         ConditionExpression: 'templateStatus = :templateStatusWaitingForProof',
       })