lamassu/lamassu-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: migrations failing because of machine query

Browse source
This commit is contained in:
Rafael Taranto 2023-08-30 21:24:55 +01:00
parent f1e6e24f05
commit 2d8ff49769
2 changed files with 15 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lib/machine-loader.js
View file

@ -62,6 +62,11 @@ function toMachineObject (r) {
} }
} }
function getMachineIds () {
const sql = 'select device_id from devices'
return db.any(sql)
}
function getMachines () { function getMachines () {
const sql = `${MACHINE_WITH_CALCULATED_FIELD_SQL} where display=TRUE ORDER BY created` const sql = `${MACHINE_WITH_CALCULATED_FIELD_SQL} where display=TRUE ORDER BY created`
return db.any(sql) return db.any(sql)
@ -439,6 +444,7 @@ module.exports = {
getNetworkPerformance, getNetworkPerformance,
getNetworkHeartbeat, getNetworkHeartbeat,
getConfig, getConfig,
getMachineIds,
emptyMachineUnits, emptyMachineUnits,
refillMachineUnits refillMachineUnits
} }

18
migrations/1630432869178-add-more-cassette-support.js
View file

@ -1,7 +1,7 @@
var db = require('./db') var db = require('./db')
const _ = require('lodash/fp') const _ = require('lodash/fp')
const { migrationSaveConfig, loadLatest } = require('../lib/new-settings-loader') const { migrationSaveConfig, loadLatest } = require('../lib/new-settings-loader')
const { getMachines } = require('../lib/machine-loader') const { getMachineIds } = require('../lib/machine-loader')
exports.up = function (next) { exports.up = function (next) {
var sql = [ var sql = [
@ -25,20 +25,20 @@ exports.up = function (next) {
ADD COLUMN denomination_4 INTEGER` ADD COLUMN denomination_4 INTEGER`
] ]
return Promise.all([loadLatest(), getMachines()]) return Promise.all([loadLatest(), getMachineIds()])
.then(([config, machines]) => { .then(([config, machineIds]) => {
const formattedMachines = _.map(it => _.pick(['deviceId'], it), machines)
const newConfig = _.reduce((acc, value) => { const newConfig = _.reduce((acc, value) => {
if (_.includes(`cashOut_${value.deviceId}_top`, _.keys(config.config))) { const deviceId = value.device_id
acc[`cashOut_${value.deviceId}_cassette1`] = config.config[`cashOut_${value.deviceId}_top`] if (_.includes(`cashOut_${deviceId}_top`, _.keys(config.config))) {
acc[`cashOut_${deviceId}_cassette1`] = config.config[`cashOut_${deviceId}_top`]
} }
if (_.includes(`cashOut_${value.deviceId}_bottom`, _.keys(config.config))) { if (_.includes(`cashOut_${deviceId}_bottom`, _.keys(config.config))) {
acc[`cashOut_${value.deviceId}_cassette2`] = config.config[`cashOut_${value.deviceId}_bottom`] acc[`cashOut_${deviceId}_cassette2`] = config.config[`cashOut_${deviceId}_bottom`]
} }
return acc return acc
}, {}, formattedMachines) }, {}, machineIds)
return migrationSaveConfig(newConfig) return migrationSaveConfig(newConfig)
.then(() => db.multi(sql, next)) .then(() => db.multi(sql, next))