From f220c890a46574bbde00da52c79cba8560e7f7f8 Mon Sep 17 00:00:00 2001
From: siiky <github-siiky@net-c.cat>
Date: Mon, 19 Feb 2024 12:45:56 +0000
Subject: [PATCH] Revert "refactor: drop `getMachineName()` from `notifier`"

This reverts commit d2cdca701aa0e388860feba82fb0fe94010e1d61.
---
 lib/notifier/index.js   | 8 +++-----
 lib/notifier/queries.js | 7 +++++++
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/lib/notifier/index.js b/lib/notifier/index.js
index 3178f5ab..ab75d84e 100644
--- a/lib/notifier/index.js
+++ b/lib/notifier/index.js
@@ -13,8 +13,6 @@ const smsFuncs = require('./sms')
 const webhookFuncs = require('./webhook')
 const { STALE, STALE_STATE } = require('./codes')
 
-const { getMachineName } = require('../machine-loader')
-
 function buildMessage (alerts, notifications) {
   const smsEnabled = utils.isActive(notifications.sms)
   const emailEnabled = utils.isActive(notifications.email)
@@ -160,7 +158,7 @@ function transactionNotify (tx, rec) {
     if (!zeroConf && rec.isRedemption) return sendRedemptionMessage(tx.id, rec.error)
 
     return Promise.all([
-      getMachineName(tx.deviceId),
+      queries.getMachineName(tx.deviceId),
       customerPromise
     ]).then(([machineName, customer]) => {
       return utils.buildTransactionMessage(tx, rec, highValueTx, machineName, customer)
@@ -171,7 +169,7 @@ function transactionNotify (tx, rec) {
 function complianceNotify (customer, deviceId, action, period) {
   return Promise.all([
     settingsLoader.loadLatest(),
-    getMachineName(deviceId)
+    queries.getMachineName(deviceId)
   ])
     .then(([settings, machineName]) => {
       const notifications = configManager.getGlobalNotifications(settings.config)
@@ -269,7 +267,7 @@ function sendTransactionMessage (rec, isHighValueTx) {
 function cashboxNotify (deviceId) {
   return Promise.all([
     settingsLoader.loadLatest(),
-    getMachineName(deviceId)
+    queries.getMachineName(deviceId)
   ])
     .then(([settings, machineName]) => {
       const notifications = configManager.getGlobalNotifications(settings.config)
diff --git a/lib/notifier/queries.js b/lib/notifier/queries.js
index 2d24eeb2..b1e92ab0 100644
--- a/lib/notifier/queries.js
+++ b/lib/notifier/queries.js
@@ -15,6 +15,12 @@ compliance - notifications related to warnings triggered by compliance settings
 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).catch(logger.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]).catch(logger.error)
@@ -99,4 +105,5 @@ module.exports = {
   markAllAsRead,
   hasUnreadNotifications,
   getAlerts,
+  getMachineName
 }