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

WIP

Browse source
This commit is contained in:
Josh Harvey 2016-11-08 00:28:57 +00:00
parent 855546f886
commit 785749133d
5 changed files with 50 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

19
lib/postgresql_interface.js
View file

@ -149,7 +149,14 @@ function insertDispense (deviceId, tx, cartridges) {
false, tx.error
]
const sql2 = `update devices set cassette1=cassette1-$1, cassette2=cassette2-$2
where device_id=$3`
const pulled1 = dispense1 + reject1
const pulled2 = dispense2 + reject2
return db.none(sql, values)
.then(() => db.none(sql2, [pulled1, pulled2, deviceId]))
}
exports.addIncomingPhone = function addIncomingPhone (tx, notified) {
@ -236,15 +243,13 @@ exports.addDispense = function addDispense (deviceId, tx, cartridges) {
}
exports.cartridgeCounts = function cartridgeCounts (deviceId) {
const sql = 'SELECT id, count1, count2 FROM dispenses ' +
'WHERE device_id=$1 AND refill=$2 ' +
'ORDER BY id DESC LIMIT 1'
const sql = 'SELECT cassette1, cassette2 FROM devices ' +
'WHERE device_id=$1'
return db.oneOrNone(sql, [deviceId, true])
return db.one(sql, [deviceId])
.then(row => {
const counts = row ? [row.count1, row.count2] : [0, 0]
const id = row ? row.id : 0
return {id, counts}
const counts = [row.cassette1, row.cassette2]
return {counts}
})
}