Merge pull request #17 from stmcdonald-vt/transactionErrors

errors seem to be formatted differently
mappies · Apr 12, 2024 · 632a2fe · 632a2fe
2 parents 8be7b4d + c4eeaa1
commit 632a2fe
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 23 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nodenamo",
-  "version": "2.0.1",
+  "version": "2.0.2",
   "description": "A powerful ORM for DynamoDb",
   "main": "dist/index.js",
   "typings": "dist/index",

diff --git a/src/managers/dynamodbTransaction.ts b/src/managers/dynamodbTransaction.ts
@@ -59,36 +59,41 @@ export class DynamoDbTransaction
                 {
                     await transactionRequest;
                 }
-                catch(e)
+                catch(error)
                 {
-                    try {
-                        let error = JSON.parse(e.httpResponse.body.toString());
-
-                        if(error.CancellationReasons)
-                        {
-                            let reasons = error.CancellationReasons;
-
-                            for(let j = 0; j < reasons.length ; j++)
+                    if (error.name === "TransactionCanceledException")
+                    {
+                        try {    
+                            if(error.CancellationReasons)
                             {
-                                if(reasons[j].Code === 'None') continue;
-
-                                let e = new Error(`${reasons[j].Code}: ${reasons[j].Message}: ${JSON.stringify(transactions[j])}`);
-
-                                errors.push(e);
+                                let reasons = error.CancellationReasons;
+
+                                for(let j = 0; j < reasons.length ; j++)
+                                {
+                                    if(reasons[j].Code === 'None') continue;
+
+                                    let e = new Error(`${reasons[j].Code}: ${reasons[j].Message}: ${JSON.stringify(transactions[j])}`);
+
+                                    errors.push(e);
+                                }
                             }
-                        }
-                        else
+                            else
+                            {
+                                errors.push(new Error(error.Message));
+                            }
+
+                        } 
+                        catch (err) 
                         {
-                            errors.push(new Error(error.message));
+                            errors.push(err);
                         }
-
-                    } 
-                    catch (err) 
+                    }
+                    else
                     {
-                        errors.push(err);
+                        errors.push(error)
                     }
 
-                    throw new AggregateError([e, ...errors]);
+                    throw new AggregateError([error, ...errors]);
                 }
             }
         }