Chore: move catch into queries file

lib/notifier/index.js

@@ -43,7 +43,7 @@ function checkNotification (plugins) {
 
   return getAlerts(plugins)
     .then(alerts => {
-      notifyIfActive('errors', 'errorAlertsNotify', alerts).catch(console.error)
+      notifyIfActive('errors', 'errorAlertsNotify', alerts)
       const currentAlertFingerprint = utils.buildAlertFingerprint(
         alerts,
         notifications
@@ -74,7 +74,7 @@ function getAlerts (plugins) {
     queries.machineEvents(),
     plugins.getMachineNames()
   ]).then(([balances, events, devices]) => {
-    notifyIfActive('balance', 'balancesNotify', balances).catch(console.error)
+    notifyIfActive('balance', 'balancesNotify', balances)
     return buildAlerts(checkPings(devices), balances, events, devices)
   })
 }
@@ -141,9 +141,9 @@ function transactionNotify (tx, rec) {
     // awaiting for redesign. notification should not be sent if toggle in the settings table is disabled,
     // but currently we're sending notifications of high value tx even with the toggle disabled
     if (readyToNotify && !highValueTx) {
-      notifyIfActive('transactions', 'notifCenterTransactionNotify', highValueTx, directionDisplay, tx.fiat, tx.fiatCode, tx.deviceId, tx.toAddress).catch(console.error)
+      notifyIfActive('transactions', 'notifCenterTransactionNotify', highValueTx, directionDisplay, tx.fiat, tx.fiatCode, tx.deviceId, tx.toAddress)
     } else if (readyToNotify && highValueTx) {
-      notificationCenter.notifCenterTransactionNotify(highValueTx, directionDisplay, tx.fiat, tx.fiatCode, tx.deviceId, tx.toAddress).catch(console.error)
+      notificationCenter.notifCenterTransactionNotify(highValueTx, directionDisplay, tx.fiat, tx.fiatCode, tx.deviceId, tx.toAddress)
     }
 
     // alert through sms or email any transaction or high value transaction, if SMS || email alerts are enabled

lib/notifier/notificationCenter.js

@@ -47,7 +47,6 @@ const customerComplianceNotify = (customer, deviceId, code, days = null) => {
       if (res.length > 0) return Promise.resolve()
       return queries.addNotification(COMPLIANCE, message, detailB)
     })
-    .catch(console.error)
 }
 
 const clearOldFiatNotifications = (balances) => {
@@ -115,7 +114,7 @@ const balancesNotify = (balances) => {
   const fiatFilter = o => o.code === 'LOW_CASH_OUT'
   const cryptoWarnings = _.filter(cryptoFilter, balances)
   const fiatWarnings = _.filter(fiatFilter, balances)
-  return Promise.all([cryptoBalancesNotify(cryptoWarnings), fiatBalancesNotify(fiatWarnings)]).catch(console.error)
+  return Promise.all([cryptoBalancesNotify(cryptoWarnings), fiatBalancesNotify(fiatWarnings)])
 }
 
 const clearOldErrorNotifications = alerts => {
@@ -131,7 +130,6 @@ const clearOldErrorNotifications = alerts => {
       if (!indexesToInvalidate.length) return Promise.resolve()
       return queries.batchInvalidate(indexesToInvalidate)
     })
-    .catch(console.error)
 }
 
 const errorAlertsNotify = (alertRec) => {
@@ -160,7 +158,7 @@ const errorAlertsNotify = (alertRec) => {
         }
       }
     }, alerts)
-  }).catch(console.error)
+  })
 }
 
 function notifCenterTransactionNotify (isHighValue, direction, fiat, fiatCode, deviceId, cryptoAddress) {

lib/notifier/queries.js

@@ -17,65 +17,65 @@ error - notifications related to errors
 function getMachineName (machineId) {
   const sql = 'SELECT * FROM devices WHERE device_id=$1'
   return db.oneOrNone(sql, [machineId])
-    .then(it => it.name)
+    .then(it => it.name).catch(console.error)
 }
 
 const addNotification = (type, message, detail) => {
   const sql = `INSERT INTO notifications (id, type, message, detail) VALUES ($1, $2, $3, $4)`
-  return db.oneOrNone(sql, [uuidv4(), type, message, detail])
+  return db.oneOrNone(sql, [uuidv4(), type, message, detail]).catch(console.error)
 }
 
 const getAllValidNotifications = (type) => {
   const sql = `SELECT * FROM notifications WHERE type = $1 AND valid = 't'`
-  return db.any(sql, [type])
+  return db.any(sql, [type]).catch(console.error)
 }
 
 const invalidateNotification = (detail, type) => {
   detail = _.omitBy(_.isEmpty, detail)
   const sql = `UPDATE notifications SET valid = 'f', read = 't' WHERE valid = 't' AND type = $1 AND detail::jsonb @> $2::jsonb`
-  return db.none(sql, [type, detail])
+  return db.none(sql, [type, detail]).catch(console.error).catch(console.error)
 }
 
 const batchInvalidate = (ids) => {
   const formattedIds = _.map(pgp.as.text, ids).join(',')
   const sql = `UPDATE notifications SET valid = 'f', read = 't' WHERE id IN ($1^)`
-  return db.none(sql, [formattedIds])
+  return db.none(sql, [formattedIds]).catch(console.error)
 }
 
 const clearBlacklistNotification = (cryptoCode, cryptoAddress) => {
   const sql = `UPDATE notifications SET valid = 'f', read = 't' WHERE type = 'compliance' AND detail->>'cryptoCode' = $1 AND detail->>'cryptoAddress' = $2 AND (detail->>'code' = 'BLOCKED' OR detail->>'code' = 'REUSED')`
-  return db.none(sql, [cryptoCode, cryptoAddress])
+  return db.none(sql, [cryptoCode, cryptoAddress]).catch(console.error)
 }
 
 const getValidNotifications = (type, detail) => {
   const sql = `SELECT * FROM notifications WHERE type = $1 AND valid = 't' AND detail @> $2`
-  return db.any(sql, [type, detail])
+  return db.any(sql, [type, detail]).catch(console.error)
 }
 
 const getNotifications = () => {
   const sql = `SELECT * FROM notifications ORDER BY created DESC`
-  return db.any(sql)
+  return db.any(sql).catch(console.error)
 }
 
 const markAsRead = (id) => {
   const sql = `UPDATE notifications SET read = 't' WHERE id = $1`
-  return db.none(sql, [id])
+  return db.none(sql, [id]).catch(console.error)
 }
 
 const markAllAsRead = () => {
   const sql = `UPDATE notifications SET read = 't'`
-  return db.none(sql)
+  return db.none(sql).catch(console.error)
 }
 
 const hasUnreadNotifications = () => {
   const sql = `SELECT EXISTS (SELECT 1 FROM notifications WHERE read = 'f' LIMIT 1)`
-  return db.oneOrNone(sql).then(res => res.exists)
+  return db.oneOrNone(sql).then(res => res.exists).catch(console.error)
 }
 
 const getAlerts = () => {
   const types = ['fiatBalance', 'cryptoBalance', 'error']
   const sql = `SELECT * FROM notifications WHERE valid = 't' AND type IN ($1:list) ORDER BY created DESC`
-  return db.any(sql, [types])
+  return db.any(sql, [types]).catch(console.error)
 }
 
 module.exports = {