chore(idempotency): expiration timestamp rounded to the nearest second (#2574)

Co-authored-by: Andrea Amorosi <[email protected]>

Author: arnabrahman

packages/idempotency/src/persistence/BasePersistenceLayer.ts

@@ -260,7 +260,7 @@ abstract class BasePersistenceLayer implements BasePersistenceLayerInterface {
   private getExpiryTimestamp(): number {
     const currentTime: number = Date.now() / 1000;
 
-    return currentTime + this.expiresAfterSeconds;
+    return Math.round(currentTime + this.expiresAfterSeconds);
   }
 
   private getFromCache(idempotencyKey: string): IdempotencyRecord | undefined {

packages/idempotency/tests/e2e/makeIdempotent.test.ts

@@ -137,9 +137,14 @@ describe(`Idempotency E2E tests, wrapper function usage`, () => {
       );
       // Since records 1 and 3 have the same payload, only 2 records should be created
       expect(idempotencyRecords?.Items?.length).toEqual(2);
-      const idempotencyRecordsItems = idempotencyRecords.Items?.sort((a, b) =>
-        a.expiration > b.expiration ? 1 : -1
-      );
+      const idempotencyRecordsItems = [
+        idempotencyRecords.Items?.find(
+          (record) => record.id === `${functionNameDefault}#${payloadHashes[0]}`
+        ),
+        idempotencyRecords.Items?.find(
+          (record) => record.id === `${functionNameDefault}#${payloadHashes[1]}`
+        ),
+      ];
 
       expect(idempotencyRecordsItems?.[0]).toStrictEqual({
         id: `${functionNameDefault}#${payloadHashes[0]}`,
@@ -197,14 +202,27 @@ describe(`Idempotency E2E tests, wrapper function usage`, () => {
       );
       /**
        * Each record should have a corresponding entry in the persistence store,
-       * if so then we sort the entries by expiry time and compare them to the
-       * expected values. Expiry times should be in the same order as the
-       * payload records.
+       * if so then we retrieve the records based on their custom IDs
+       * The records are retrieved in the same order as the payload records.
        */
       expect(idempotencyRecords.Items?.length).toEqual(3);
-      const idempotencyRecordsItems = idempotencyRecords.Items?.sort((a, b) =>
-        a.expiryAttr > b.expiryAttr ? 1 : -1
-      );
+      const idempotencyRecordsItems = [
+        idempotencyRecords.Items?.find(
+          (record) =>
+            record.customId ===
+            `${functionNameCustomConfig}#${payloadHashes[0]}`
+        ),
+        idempotencyRecords.Items?.find(
+          (record) =>
+            record.customId ===
+            `${functionNameCustomConfig}#${payloadHashes[1]}`
+        ),
+        idempotencyRecords.Items?.find(
+          (record) =>
+            record.customId ===
+            `${functionNameCustomConfig}#${payloadHashes[2]}`
+        ),
+      ];
 
       expect(idempotencyRecordsItems?.[0]).toStrictEqual({
         customId: `${functionNameCustomConfig}#${payloadHashes[0]}`,

packages/idempotency/tests/unit/persistence/BasePersistenceLayer.test.ts

@@ -373,7 +373,7 @@ describe('Class: BasePersistenceLayer', () => {
         expect.objectContaining({
           idempotencyKey: 'my-lambda-function#mocked-hash',
           status: IdempotencyRecordStatus.INPROGRESS,
-          expiryTimestamp: Date.now() / 1000 + 3600,
+          expiryTimestamp: Math.round(Date.now() / 1000 + 3600),
           payloadHash: '',
           inProgressExpiryTimestamp: Date.now() + remainingTimeInMs,
           responseData: undefined,
@@ -443,7 +443,7 @@ describe('Class: BasePersistenceLayer', () => {
         expect.objectContaining({
           idempotencyKey: 'my-lambda-function#mocked-hash',
           status: IdempotencyRecordStatus.COMPLETED,
-          expiryTimestamp: Date.now() / 1000 + 3600,
+          expiryTimestamp: Math.round(Date.now() / 1000 + 3600),
           payloadHash: '',
           inProgressExpiryTimestamp: undefined,
           responseData: result,