From df4dd5ccb8b52a4f06e0d3c76025425e41ede41d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9rgio=20Salgado?= <sergiodiassalgado@gmail.com>
Date: Thu, 20 Jan 2022 15:26:26 +0000
Subject: [PATCH] fix: remove event type

---
 lib/machine-loader.js               |  3 ---
 lib/middlewares/populateSettings.js | 14 ++------------
 lib/new-settings-loader.js          |  2 +-
 lib/poller.js                       |  7 +------
 4 files changed, 4 insertions(+), 22 deletions(-)

diff --git a/lib/machine-loader.js b/lib/machine-loader.js
index 51cf7430..ce62e05c 100644
--- a/lib/machine-loader.js
+++ b/lib/machine-loader.js
@@ -153,7 +153,6 @@ function unpair (rec) {
 function reboot (rec) {
   return db.none('NOTIFY $1:name, $2', ['machineAction', JSON.stringify(
     { 
-      type: 'machineAction',
       action: 'reboot',
       value: _.pick(['deviceId', 'operatorId', 'action'], rec)
     }
@@ -163,7 +162,6 @@ function reboot (rec) {
 function shutdown (rec) {
   return db.none('NOTIFY $1:name, $2', ['machineAction', JSON.stringify(
     { 
-      type: 'machineAction',
       action: 'shutdown',
       value: _.pick(['deviceId', 'operatorId', 'action'], rec)
     }
@@ -173,7 +171,6 @@ function shutdown (rec) {
 function restartServices (rec) {
   return db.none('NOTIFY $1:name, $2', ['machineAction', JSON.stringify(
     { 
-      type: 'machineAction',
       action: 'restartServices',
       value: _.pick(['deviceId', 'operatorId', 'action'], rec)
     }
diff --git a/lib/middlewares/populateSettings.js b/lib/middlewares/populateSettings.js
index 5e696e80..80ccc9a6 100644
--- a/lib/middlewares/populateSettings.js
+++ b/lib/middlewares/populateSettings.js
@@ -9,12 +9,7 @@ const logger = require('../logger')
 db.connect({ direct: true }).then(sco => {
   sco.client.on('notification', data => {
     const parsedData = JSON.parse(data.payload)
-    switch (parsedData.type) {
-      case 'reload':
-        return reload(parsedData.operatorId)
-      default:
-        break
-    }
+    return reload(parsedData.operatorId)
   })
   return sco.none('LISTEN $1:name', 'reload')
 }).catch(console.error)
@@ -22,12 +17,7 @@ db.connect({ direct: true }).then(sco => {
 db.connect({ direct: true }).then(sco => {
   sco.client.on('notification', data => {
     const parsedData = JSON.parse(data.payload)
-    switch (parsedData.type) {
-      case 'machineAction':
-        return machineAction(parsedData.action, parsedData.value)
-      default:
-        break
-    }
+    return machineAction(parsedData.action, parsedData.value)
   })
   return sco.none('LISTEN $1:name', 'machineAction')
 }).catch(console.error)
diff --git a/lib/new-settings-loader.js b/lib/new-settings-loader.js
index 744f0408..d9e838ef 100644
--- a/lib/new-settings-loader.js
+++ b/lib/new-settings-loader.js
@@ -77,7 +77,7 @@ function saveConfig (config) {
       const newConfig = _.assign(currentConfig, config)
       return db.tx(t => {
         return t.none(configSql, ['config', { config: newConfig }, true, NEW_SETTINGS_LOADER_SCHEMA_VERSION])
-          .then(() => t.none('NOTIFY $1:name, $2', ['reload', JSON.stringify({ type: 'reload', schema: asyncLocalStorage.getStore().get('schema'), operatorId })]))
+          .then(() => t.none('NOTIFY $1:name, $2', ['reload', JSON.stringify({ schema: asyncLocalStorage.getStore().get('schema'), operatorId })]))
       }).catch(console.error)
     })
 }
diff --git a/lib/poller.js b/lib/poller.js
index a36c4fb9..99ea5543 100644
--- a/lib/poller.js
+++ b/lib/poller.js
@@ -81,12 +81,7 @@ cachedVariables.on('expired', (key, val) => {
 db.connect({ direct: true }).then(sco => {
   sco.client.on('notification', data => {
     const parsedData = JSON.parse(data.payload)
-    switch (parsedData.type) {
-      case 'reload':
-        return reload(parsedData.schema)
-      default:
-        break
-    }
+    return reload(parsedData.schema)
   })
   return sco.none('LISTEN $1:name', 'reload')
 }).catch(console.error)