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

Merge pull request #891 from SiIky/fix/z3MakfSR/invalidate_notifications

Browse source 
Fix cash cassette alerts
This commit is contained in:
Rafael Taranto 2021-11-11 18:30:05 +00:00 • committed by GitHub
commit 7cf5f88c21
2 changed files with 3 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

8
lib/machine-loader.js
View file

@ -74,14 +74,6 @@ function getMachineNames (config) {
const mergeByDeviceId = (x, y) => _.values(_.merge(_.keyBy('deviceId', x), _.keyBy('deviceId', y))) const mergeByDeviceId = (x, y) => _.values(_.merge(_.keyBy('deviceId', x), _.keyBy('deviceId', y)))
const machines = mergeByDeviceId(mergeByDeviceId(rawMachines, heartbeat), performance) const machines = mergeByDeviceId(mergeByDeviceId(rawMachines, heartbeat), performance)
const getStatus = (ping, stuck) => {
if (ping && ping.age) return unresponsiveStatus
if (stuck && stuck.age) return stuckStatus
return fullyFunctionalStatus
}
const addName = r => { const addName = r => {
const cashOutConfig = configManager.getCashOut(r.deviceId, config) const cashOutConfig = configManager.getCashOut(r.deviceId, config)

5
lib/plugins.js
View file

@ -616,6 +616,7 @@ function plugins (settings, deviceId) {
const denomination1 = cashOutConfig.top const denomination1 = cashOutConfig.top
const denomination2 = cashOutConfig.bottom const denomination2 = cashOutConfig.bottom
const cashOutEnabled = cashOutConfig.active const cashOutEnabled = cashOutConfig.active
const isCassetteLow = (have, max, limit) => cashOutEnabled && ((have / max) * 100) < limit
const notifications = configManager.getNotifications(null, device.deviceId, settings.config) const notifications = configManager.getNotifications(null, device.deviceId, settings.config)
@ -630,7 +631,7 @@ function plugins (settings, deviceId) {
} }
: null : null
const cassette1Alert = cashOutEnabled && (device.cassette1 / cassetteMaxCapacity) < notifications.fillingPercentageCassette1 const cassette1Alert = isCassetteLow(device.cassette1, cassetteMaxCapacity, notifications.fillingPercentageCassette1)
? { ? {
code: 'LOW_CASH_OUT', code: 'LOW_CASH_OUT',
cassette: 1, cassette: 1,
@ -642,7 +643,7 @@ function plugins (settings, deviceId) {
} }
: null : null
const cassette2Alert = cashOutEnabled && (device.cassette2 / cassetteMaxCapacity) < notifications.fillingPercentageCassette2 const cassette2Alert = isCassetteLow(device.cassette2, cassetteMaxCapacity, notifications.fillingPercentageCassette2)
? { ? {
code: 'LOW_CASH_OUT', code: 'LOW_CASH_OUT',
cassette: 2, cassette: 2,