converted error type to IdempotencyRecord

Author: tolutheo

packages/idempotency/src/IdempotencyHandler.ts

@@ -313,10 +313,11 @@ export class IdempotencyHandler<Func extends AnyFunction> {
         );
       } catch (e) {
         if (e instanceof IdempotencyItemAlreadyExistsError) {
-          const idempotencyRecord: IdempotencyRecord =
-            await this.#persistenceStore.getRecord(
-              this.#functionPayloadToBeHashed
-            );
+          const idempotencyRecord: IdempotencyRecord = e.existingRecord;
+          // const idempotencyRecord: IdempotencyRecord =
+          //   await this.#persistenceStore.getRecord(
+          //     this.#functionPayloadToBeHashed
+          //   );
 
           return IdempotencyHandler.determineResultFromIdempotencyRecord(
             idempotencyRecord

packages/idempotency/src/errors.ts

@@ -1,15 +1,11 @@
-import { AttributeValue } from '@aws-sdk/client-dynamodb';
-//import { IdempotencyRecord } from './persistence';
+import { IdempotencyRecord } from './persistence';
 /**
  * Item attempting to be inserted into persistence store already exists and is not expired
  */
 class IdempotencyItemAlreadyExistsError extends Error {
-  public existingRecord: Record<string, AttributeValue> | undefined;
+  public existingRecord: IdempotencyRecord;
 
-  public constructor(
-    message: string,
-    existingRecord: Record<string, AttributeValue> | undefined
-  ) {
+  public constructor(message: string, existingRecord: IdempotencyRecord) {
     super(message);
     this.existingRecord = existingRecord;
   }

packages/idempotency/src/persistence/DynamoDBPersistenceLayer.ts

@@ -202,13 +202,22 @@ class DynamoDBPersistenceLayer extends BasePersistenceLayer {
       );
     } catch (error) {
       if (error instanceof DynamoDBServiceException) {
-        if (error.name === 'ConditionalCheckFailedException') {
-          if (error instanceof ConditionalCheckFailedException) {
-            throw new IdempotencyItemAlreadyExistsError(
-              `Failed to put record for already existing idempotency key: ${record.idempotencyKey}`,
-              error.Item
-            );
+        if (error instanceof ConditionalCheckFailedException) {
+          if (!error.Item) {
+            throw new Error('Item is undefined');
           }
+          const Item = unmarshall(error.Item);
+          throw new IdempotencyItemAlreadyExistsError(
+            `Failed to put record for already existing idempotency key: ${record.idempotencyKey}`,
+            new IdempotencyRecord({
+              idempotencyKey: Item[this.keyAttr],
+              status: Item[this.statusAttr],
+              expiryTimestamp: Item[this.expiryAttr],
+              inProgressExpiryTimestamp: Item[this.inProgressExpiryAttr],
+              responseData: Item[this.dataAttr],
+              payloadHash: Item[this.validationKeyAttr],
+            })
+          );
         }
       }