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

refactor: backport new batching function

Browse source
This commit is contained in:
Sérgio Salgado 2021-12-07 15:00:44 +00:00
parent 864e5d2f88
commit 616d2d2915
5 changed files with 48 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

12
lib/machine-loader.js
View file

@ -3,6 +3,7 @@ const pgp = require('pg-promise')()
const axios = require('axios')
const uuid = require('uuid')
const batching = require('./cashbox-batches')
const db = require('./db')
const pairing = require('./pairing')
const { checkPings, checkStuckScreen } = require('./notifier')
@ -139,8 +140,15 @@ function emptyCashInBills (rec) {
}
function setCassetteBills (rec) {
const sql = 'update devices set cashbox=$1, cassette1=$2, cassette2=$3, cassette3=$4, cassette4=$5 where device_id=$6'
return db.none(sql, [rec.cashbox, rec.cassettes[0], rec.cassettes[1], rec.cassettes[2], rec.cassettes[3], rec.deviceId])
return db.oneOrNone(`SELECT cashbox FROM devices WHERE device_id=$1 LIMIT 1`, [rec.deviceId])
.then(oldCashboxValue => {
if (_.isNil(oldCashboxValue) || rec.cashbox === oldCashboxValue) {
const sql = 'UPDATE devices SET cashbox=$1, cassette1=$2, cassette2=$3, cassette3=$4, cassette4=$5 WHERE device_id=$6'
return db.none(sql, [rec.cashbox, rec.cassettes[0], rec.cassettes[1], rec.cassettes[2], rec.cassettes[3], rec.deviceId])
}
return batching.updateMachineWithBatch({ ...rec, oldCashboxValue })
})
}
function unpair (rec) {