From 7e803b24db1a98d773d0fdf5d64d3523cec5d7a3 Mon Sep 17 00:00:00 2001
From: Vojtech Cerveny <cervik49@gmail.com>
Date: Tue, 19 Nov 2024 15:56:19 +0100
Subject: [PATCH 1/3] refactor: adding custom information into rollbar ticket -
 adding extra information into custom.* property

---
 app/actions/utils.js | 24 ++++++++++++------------
 app/package.json     |  2 +-
 package.json         |  2 +-
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/app/actions/utils.js b/app/actions/utils.js
index 206ad86e2..237841a41 100644
--- a/app/actions/utils.js
+++ b/app/actions/utils.js
@@ -205,24 +205,24 @@ export function mergeProfileUpdates(profile, updates){
 
 export function sendToRollbar(err, props) {
   return new Promise((resolve) => {
-    if (rollbar) {
-      const extra = {};
-      if (_.get(props, 'data.blobId', false)) {
-        _.assign(extra, { blobId: props.data.blobId });
-      }
+    if (!rollbar) {
+      return resolve(props);
+    }
 
-      rollbar.error(err, extra, (err, data) => {
-        if (err) {
-          console.log('Error while reporting error to Rollbar:', err);
+    const extra = {};
+    if (_.get(props, 'data.blobId', false)) {
+      _.assign(extra, { blobId: props.data.blobId });
+    }
+    
+    rollbar.error(err, {...extra, ... props}, (reportingErr, data) => {
+      if (reportingErr) {
+        console.log('Error while reporting error to Rollbar:', reportingErr);
         } else {
           console.log(`Rollbar UUID: ${data.result.uuid}`);
           props.uuid = data.result.uuid;
         }
         resolve(props);
-      });
-    } else {
-      resolve(props);
-    }
+    });
   });
 }
 
diff --git a/app/package.json b/app/package.json
index 27a93079e..f07ce7c09 100644
--- a/app/package.json
+++ b/app/package.json
@@ -1,7 +1,7 @@
 {
   "name": "tidepool-uploader",
   "productName": "tidepool-uploader",
-  "version": "2.60.0",
+  "version": "2.60.0-rollbar-enhance-errors",
   "description": "Tidepool Project Universal Uploader",
   "main": "./main.prod.js",
   "author": {
diff --git a/package.json b/package.json
index 356ceac61..3fcf075da 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "tidepool-uploader",
-  "version": "2.60.0",
+  "version": "2.60.0-rollbar-enhance-errors",
   "description": "Tidepool Project Universal Uploader",
   "private": true,
   "main": "main.prod.js",

From 27d7bb09121eb4a597293d9b3fa51f3ca4bb49b9 Mon Sep 17 00:00:00 2001
From: Vojtech Cerveny <cervik49@gmail.com>
Date: Fri, 22 Nov 2024 10:05:20 +0100
Subject: [PATCH 2/3] fix: code formatting + combining extra + props

---
 app/actions/utils.js | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/actions/utils.js b/app/actions/utils.js
index 237841a41..b5ada5d22 100644
--- a/app/actions/utils.js
+++ b/app/actions/utils.js
@@ -209,19 +209,19 @@ export function sendToRollbar(err, props) {
       return resolve(props);
     }
 
-    const extra = {};
+    const extra = { ...props };
     if (_.get(props, 'data.blobId', false)) {
-      _.assign(extra, { blobId: props.data.blobId });
+      extra.blobId = props.data.blobId;
     }
     
-    rollbar.error(err, {...extra, ... props}, (reportingErr, data) => {
+    rollbar.error(err, extra, (reportingErr, data) => {
       if (reportingErr) {
         console.log('Error while reporting error to Rollbar:', reportingErr);
-        } else {
-          console.log(`Rollbar UUID: ${data.result.uuid}`);
-          props.uuid = data.result.uuid;
-        }
-        resolve(props);
+      } else {
+        console.log(`Rollbar UUID: ${data.result.uuid}`);
+        props.uuid = data.result.uuid;
+      }
+      resolve(props);
     });
   });
 }

From 4d6978983b3b37d69771072245f515522f2de9b4 Mon Sep 17 00:00:00 2001
From: Vojtech Cerveny <cervik49@gmail.com>
Date: Fri, 22 Nov 2024 14:28:25 +0100
Subject: [PATCH 3/3] refactor: exclude property 'extra.data' from object

---
 app/actions/utils.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/actions/utils.js b/app/actions/utils.js
index b5ada5d22..c706c81a4 100644
--- a/app/actions/utils.js
+++ b/app/actions/utils.js
@@ -210,6 +210,8 @@ export function sendToRollbar(err, props) {
     }
 
     const extra = { ...props };
+    delete extra.data;
+
     if (_.get(props, 'data.blobId', false)) {
       extra.blobId = props.data.blobId;
     }