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

refactor: use promise all

Browse source
This commit is contained in:
José Oliveira 2021-07-09 15:35:23 +01:00 • committed by Josh Harvey
parent ad30468708
commit 686c7a2b36
2 changed files with 16 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

7
lib/constants.js
View file

@ -9,10 +9,15 @@ const AUTHENTICATOR_ISSUER_ENTITY = 'Lamassu'
const AUTH_TOKEN_EXPIRATION_TIME = '30 minutes'
const REGISTRATION_TOKEN_EXPIRATION_TIME = '30 minutes'
const AUTOMATIC = 'automatic'
const MANUAL = 'manual'
module.exports = {
anonymousCustomer,
cassetteMaxCapacity,
AUTHENTICATOR_ISSUER_ENTITY,
AUTH_TOKEN_EXPIRATION_TIME,
REGISTRATION_TOKEN_EXPIRATION_TIME
REGISTRATION_TOKEN_EXPIRATION_TIME,
AUTOMATIC,
MANUAL
}

22
lib/routes/cashboxRoutes.js
View file

@ -5,20 +5,18 @@ const cashbox = require('../cashbox-batches')
const { getMachine, setMachine } = require('../machine-loader')
const { loadLatestConfig } = require('../new-settings-loader')
const { getCashInSettings } = require('../new-config-manager')
const { AUTOMATIC } = require('../constants.js')
function notifyCashboxRemoval (req, res, next) {
return getMachine(req.deviceId)
.then(machine => {
loadLatestConfig()
.then(config => {
const cashInSettings = getCashInSettings(config)
if (cashInSettings.cashboxReset === 'Automatic') {
return cashbox.createCashboxBatch(req.deviceId, machine.cashbox)
.then(() => setMachine({ deviceId: req.deviceId, action: 'emptyCashInBills' }))
.then(() => res.status(200).send({ status: 'OK' }))
}
return res.status(200).send({ status: 'OK' })
})
return Promise.all([getMachine(req.deviceId), loadLatestConfig()])
.then(([machine, config]) => {
const cashInSettings = getCashInSettings(config)
if (cashInSettings.cashboxReset !== AUTOMATIC) {
return res.status(200).send({ status: 'OK' })
}
return cashbox.createCashboxBatch(req.deviceId, machine.cashbox)
.then(() => setMachine({ deviceId: req.deviceId, action: 'emptyCashInBills' }))
.then(() => res.status(200).send({ status: 'OK' }))
})
.catch(next)
}