feat: change how time is measured to seconds

Author: vgphoenixcampos

Diff for: packages/idempotency/src/persistence/DynamoDbPersistenceLayer.ts

@@ -47,7 +47,7 @@ class DynamoDBPersistenceLayer extends PersistenceLayer {
     const notInProgress = 'NOT #status = :inprogress';
     const conditionalExpression = `${idempotencyKeyDoesNotExist} OR ${idempotencyKeyExpired} OR ${notInProgress}`;
     try {
-      await table.put({ TableName: this.tableName, Item: item, ExpressionAttributeNames: { '#id': this.key_attr, '#expiry': this.expiry_attr, '#status': this.status_attr }, ExpressionAttributeValues: { ':now': Date.now(), ':inprogress': IdempotencyRecordStatus.INPROGRESS }, ConditionExpression: conditionalExpression });
+      await table.put({ TableName: this.tableName, Item: item, ExpressionAttributeNames: { '#id': this.key_attr, '#expiry': this.expiry_attr, '#status': this.status_attr }, ExpressionAttributeValues: { ':now': Date.now() / 1000, ':inprogress': IdempotencyRecordStatus.INPROGRESS }, ConditionExpression: conditionalExpression });
     } catch (e){
       if ((e as DynamoDBServiceException).name === 'ConditionalCheckFailedException'){
         throw new IdempotencyItemAlreadyExistsError();

Diff for: packages/idempotency/src/persistence/IdempotencyRecord.ts

@@ -25,7 +25,7 @@ class IdempotencyRecord {
   }
 
   private isExpired(): boolean {
-    return this.expiryTimestamp !== undefined && (Date.now() > this.expiryTimestamp);
+    return this.expiryTimestamp !== undefined && ((Date.now() / 1000) > this.expiryTimestamp);
   }
 }
 

Diff for: packages/idempotency/tests/unit/persistence/DynamoDbPersistenceLayer.test.ts

@@ -36,6 +36,13 @@ describe('Class: DynamoDbPersistenceLayer', () => {
   });
 
   describe('Method: _putRecord', () => {
+    const currentDateInMilliseconds = 1000;
+    const currentDateInSeconds = 1;
+
+    beforeEach(() => {
+      jest.spyOn(Date, 'now').mockReturnValue(currentDateInMilliseconds);
+    });
+
     test('when called with a record that succeeds condition, it puts record in dynamo table', async () => {
       // Prepare
       const tableName = 'tableName';
@@ -46,10 +53,6 @@ describe('Class: DynamoDbPersistenceLayer', () => {
       const expiryTimestamp = 0;
       const inProgressExpiryTimestamp = 0;
       const record = new IdempotencyRecord(key, status, expiryTimestamp, inProgressExpiryTimestamp, undefined, undefined);
-
-      const currentDate = 1;
-      jest.spyOn(Date, 'now').mockReturnValue(currentDate);
-
       const dynamoClient = mockClient(DynamoDBDocument).on(PutCommand).resolves({});
 
       // Act
@@ -60,7 +63,7 @@ describe('Class: DynamoDbPersistenceLayer', () => {
         TableName: tableName,
         Item: { 'id': key, 'expiration': expiryTimestamp, status: status },
         ExpressionAttributeNames: { '#id': 'id', '#expiry': 'expiration', '#status': 'status' },
-        ExpressionAttributeValues: { ':now': currentDate, ':inprogress': IdempotencyRecordStatus.INPROGRESS },
+        ExpressionAttributeValues: { ':now': currentDateInSeconds, ':inprogress': IdempotencyRecordStatus.INPROGRESS },
         ConditionExpression: 'attribute_not_exists(#id) OR #expiry < :now OR NOT #status = :inprogress'
       });
     });
@@ -76,9 +79,6 @@ describe('Class: DynamoDbPersistenceLayer', () => {
       const inProgressExpiryTimestamp = 0;
       const record = new IdempotencyRecord(key, status, expiryTimestamp, inProgressExpiryTimestamp, undefined, undefined);
 
-      const currentDate = 1;
-      jest.spyOn(Date, 'now').mockReturnValue(currentDate);
-
       const dynamoClient = mockClient(DynamoDBDocument).on(PutCommand).rejects({ name: 'ConditionalCheckFailedException' });
 
       // Act
@@ -94,7 +94,7 @@ describe('Class: DynamoDbPersistenceLayer', () => {
         TableName: tableName,
         Item: { 'id': key, 'expiration': expiryTimestamp, status: status },
         ExpressionAttributeNames: { '#id': 'id', '#expiry': 'expiration', '#status': 'status' },
-        ExpressionAttributeValues: { ':now': currentDate, ':inprogress': IdempotencyRecordStatus.INPROGRESS },
+        ExpressionAttributeValues: { ':now': currentDateInSeconds, ':inprogress': IdempotencyRecordStatus.INPROGRESS },
         ConditionExpression: 'attribute_not_exists(#id) OR #expiry < :now OR NOT #status = :inprogress'
       });
       expect(error).toBeInstanceOf(IdempotencyItemAlreadyExistsError);
@@ -111,9 +111,6 @@ describe('Class: DynamoDbPersistenceLayer', () => {
       const inProgressExpiryTimestamp = 0;
       const record = new IdempotencyRecord(key, status, expiryTimestamp, inProgressExpiryTimestamp, undefined, undefined);
 
-      const currentDate = 1;
-      jest.spyOn(Date, 'now').mockReturnValue(currentDate);
-
       const dynamoClient = mockClient(DynamoDBDocument).on(PutCommand).rejects(new Error());
 
       // Act
@@ -129,7 +126,7 @@ describe('Class: DynamoDbPersistenceLayer', () => {
         TableName: tableName,
         Item: { 'id': key, 'expiration': expiryTimestamp, status: status },
         ExpressionAttributeNames: { '#id': 'id', '#expiry': 'expiration', '#status': 'status' },
-        ExpressionAttributeValues: { ':now': currentDate, ':inprogress': IdempotencyRecordStatus.INPROGRESS },
+        ExpressionAttributeValues: { ':now': currentDateInSeconds, ':inprogress': IdempotencyRecordStatus.INPROGRESS },
         ConditionExpression: 'attribute_not_exists(#id) OR #expiry < :now OR NOT #status = :inprogress'
       });
       expect(error).toBe(error);

Diff for: packages/idempotency/tests/unit/persistence/IdempotencyRecord.test.ts

@@ -14,9 +14,9 @@ const mockPayloadHash = '123';
 describe('Given an idempotency record that is expired', () => {
   let idempotencyRecord: IdempotencyRecord;
   beforeEach(() => {
-    const mockNowAfterExiryTime = 1487076708000;
-    const expiryTimeBeforeNow = 1487076707000;
-    Date.now = jest.fn(() => mockNowAfterExiryTime);
+    const mockNowAfterExpiryTime = 1487076708000;
+    const expiryTimeBeforeNow = 1487076707;
+    Date.now = jest.fn(() => mockNowAfterExpiryTime);
     idempotencyRecord = new IdempotencyRecord(mockIdempotencyKey, IdempotencyRecordStatus.INPROGRESS, expiryTimeBeforeNow, mockInProgressExpiry, mockData, mockPayloadHash);
   });
   describe('When checking the status of the idempotency record', () => {
@@ -35,7 +35,7 @@ describe('Given an idempotency record that is not expired', () => {
   let idempotencyRecord: IdempotencyRecord; 
   beforeEach(() => {
     const mockNowBeforeExiryTime = 1487076707000;
-    const expiryTimeAfterNow = 1487076708000;
+    const expiryTimeAfterNow = 1487076708;
     Date.now = jest.fn(() => mockNowBeforeExiryTime);
     idempotencyRecord = new IdempotencyRecord(mockIdempotencyKey, IdempotencyRecordStatus.INPROGRESS, expiryTimeAfterNow, mockInProgressExpiry, mockData, mockPayloadHash);
   });
@@ -54,7 +54,7 @@ describe('Given an idempotency record that has a status not in the IdempotencyRe
   let idempotencyRecord: IdempotencyRecord; 
   beforeEach(() => {
     const mockNowBeforeExiryTime = 1487076707000;
-    const expiryTimeAfterNow = 1487076708000;
+    const expiryTimeAfterNow = 1487076708;
     Date.now = jest.fn(() => mockNowBeforeExiryTime);
     idempotencyRecord = new IdempotencyRecord(mockIdempotencyKey, 'NOT_A_STATUS' as IdempotencyRecordStatus, expiryTimeAfterNow, mockInProgressExpiry, mockData, mockPayloadHash);
   });