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

bug fixes for redeem

Browse source
This commit is contained in:
Josh Harvey 2016-05-10 15:37:07 +03:00
parent 996ebd395b
commit 694f3e5e96
3 changed files with 30 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

21
lib/postgresql_interface.js
View file

@ -530,17 +530,10 @@ exports.fetchPhoneTxs = function fetchPhoneTxs (phone, dispenseTimeout) {
'AND (EXTRACT(EPOCH FROM (COALESCE(confirmation_time, now()) - created))) * 1000 < $3 ' +
'AND stage=$4 AND authority=$5 AND incoming=$6'
return new Promise((resolve, reject) => {
connect(function (cerr, client, done) {
if (cerr) return reject(cerr)
var values = [phone, false, dispenseTimeout, 'initial_request', 'pending', true]
query(client, sql, values, function (err, results) {
done()
if (err) return reject(err)
resolve(normalizeTxs(results.rows))
})
})
})
var values = [phone, false, dispenseTimeout, 'initial_request', 'pending', true]
return pquery(sql, values)
.then(r => normalizeTxs(r.rows))
}
exports.fetchTx = function fetchTx (session) {
@ -585,8 +578,10 @@ function updateDispense (client, session, dispensed, cb) {
'WHERE stage=$2 AND authority=$3 AND device_fingerprint=$4 AND ' +
'session_id=$5 AND incoming=$6'
var values = [dispensed, 'initial_request', 'pending', session.fingerprint, session.id, true]
query(client, sql, values, function (err) {
cb(err)
query(client, sql, values, function (err, results) {
if (err) return cb(err)
if (results.rowCount === 0) return cb(new Error('No pending tx'))
cb()
})
}