From fbf89336802f5d252e42ed46638fa6aa39bd4c13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20Salgado?= Date: Wed, 28 Sep 2022 17:18:12 +0100 Subject: [PATCH 1/2] fix: remove unnecessary query --- lib/middlewares/populateSettings.js | 3 ++- lib/route-helpers.js | 5 ----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/lib/middlewares/populateSettings.js b/lib/middlewares/populateSettings.js index 05245a03..bd84d10b 100644 --- a/lib/middlewares/populateSettings.js +++ b/lib/middlewares/populateSettings.js @@ -6,6 +6,8 @@ const newSettingsLoader = require('../new-settings-loader') const helpers = require('../route-helpers') const logger = require('../logger') +let LATEST_MACHINE_CONFIG_VERSION + db.connect({ direct: true }).then(sco => { sco.client.on('notification', data => { const parsedData = JSON.parse(data.payload) @@ -80,7 +82,6 @@ const populateSettings = function (req, res, next) { newSettingsLoader.load(versionId) .then(settings => { req.settings = settings }) - .then(() => helpers.updateDeviceConfigVersion(versionId)) .then(() => next()) .catch(next) } diff --git a/lib/route-helpers.js b/lib/route-helpers.js index 4fec0384..b382b056 100644 --- a/lib/route-helpers.js +++ b/lib/route-helpers.js @@ -85,14 +85,9 @@ function fetchStatusTx (txId, status) { }) } -function updateDeviceConfigVersion (versionId) { - return db.none('update devices set user_config_id=$1', [versionId]) -} - module.exports = { stateChange, fetchPhoneTx, fetchStatusTx, - updateDeviceConfigVersion, httpError } From b6f567097edbbc54c5d596f21f06add745057f02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20Salgado?= Date: Mon, 3 Oct 2022 16:47:53 +0100 Subject: [PATCH 2/2] fix: remove unused variables --- lib/middlewares/populateSettings.js | 5 ----- 1 file changed, 5 deletions(-) diff --git a/lib/middlewares/populateSettings.js b/lib/middlewares/populateSettings.js index bd84d10b..ae4893bd 100644 --- a/lib/middlewares/populateSettings.js +++ b/lib/middlewares/populateSettings.js @@ -1,13 +1,8 @@ -const _ = require('lodash/fp') - const db = require('../db') const state = require('./state') const newSettingsLoader = require('../new-settings-loader') -const helpers = require('../route-helpers') const logger = require('../logger') -let LATEST_MACHINE_CONFIG_VERSION - db.connect({ direct: true }).then(sco => { sco.client.on('notification', data => { const parsedData = JSON.parse(data.payload)