fix: fix update query for Subscriptions (#142)

awslabs · Mar 7, 2022 · 3c41f05 · 3c41f05
1 parent 0313b08
commit 3c41f05
Show file tree

Hide file tree

Showing 2 changed files with 59 additions and 1 deletion.
diff --git a/src/dataServices/dynamoDbParamBuilder.test.ts b/src/dataServices/dynamoDbParamBuilder.test.ts
@@ -128,6 +128,64 @@ describe('buildUpdateDocumentStatusParam', () => {
         expect(actualParam).toEqual(getExpectedParamForUpdateWithoutOldStatus(DOCUMENT_STATUS.LOCKED, id, vid));
     });
 
+    test('Update Subscription', () => {
+        const id = '8cafa46d-08b4-4ee4-b51b-803e20ae8126';
+        const vid = 1;
+        const actualParam = DynamoDbParamBuilder.buildUpdateDocumentStatusParam(
+            null,
+            DOCUMENT_STATUS.AVAILABLE,
+            id,
+            vid,
+            'Subscription',
+        );
+
+        expect(actualParam).toMatchInlineSnapshot(
+            {
+                Update: {
+                    ExpressionAttributeValues: {
+                        ':futureEndTs': {
+                            N: expect.stringMatching(timeFromEpochInMsRegExp),
+                        },
+                    },
+                },
+            },
+            `
+            Object {
+              "Update": Object {
+                "ConditionExpression": "resourceType = :resourceType",
+                "ExpressionAttributeNames": Object {
+                  "#subscriptionStatus": "_subscriptionStatus",
+                },
+                "ExpressionAttributeValues": Object {
+                  ":futureEndTs": Object {
+                    "N": StringMatching /\\\\d\\{13\\}/,
+                  },
+                  ":newStatus": Object {
+                    "S": "AVAILABLE",
+                  },
+                  ":resourceType": Object {
+                    "S": "Subscription",
+                  },
+                  ":subscriptionStatus": Object {
+                    "S": "active",
+                  },
+                },
+                "Key": Object {
+                  "id": Object {
+                    "S": "8cafa46d-08b4-4ee4-b51b-803e20ae8126",
+                  },
+                  "vid": Object {
+                    "N": "1",
+                  },
+                },
+                "TableName": "",
+                "UpdateExpression": "set documentStatus = :newStatus, lockEndTs = :futureEndTs, #subscriptionStatus = :subscriptionStatus",
+              },
+            }
+        `,
+        );
+    });
+
     test('Update status correctly when there is NO requirement for what the old status needs to be', () => {
         const id = '8cafa46d-08b4-4ee4-b51b-803e20ae8126';
         const vid = 1;

diff --git a/src/dataServices/dynamoDbParamBuilder.ts b/src/dataServices/dynamoDbParamBuilder.ts
@@ -84,7 +84,7 @@ export default class DynamoDbParamBuilder {
         };
 
         if (expressionAttributeNames) {
-            params.ExpressionAttributeNames = expressionAttributeNames;
+            params.Update.ExpressionAttributeNames = expressionAttributeNames;
         }
 
         return params;