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

chore: comments and better error message

Browse source
This commit is contained in:
Taranto 2023-07-09 21:15:33 +01:00
parent 8b1cf46f77
commit 3f46614ff5
2 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lib/cash-out/cash-out-atomic.js
View file

@ -27,11 +27,9 @@ function atomic (tx, pi, fromClient) {
const isStale = fromClient && oldTx && (oldTx.txVersion >= tx.txVersion) const isStale = fromClient && oldTx && (oldTx.txVersion >= tx.txVersion)
if (isStale) throw new E.StaleTxError({ txId: tx.id }) if (isStale) throw new E.StaleTxError({ txId: tx.id })
// Server doesn't bump version, so we just prevent from version being older.
const isStaleFromServer = !fromClient && oldTx && (oldTx.txVersion > tx.txVersion) const isStaleFromServer = !fromClient && oldTx && (oldTx.txVersion > tx.txVersion)
if (isStaleFromServer) { if (isStaleFromServer) throw new Error('Stale Error: server triggered', tx.id)
logger.info('trying to update older version of tx', JSON.stringify(tx))
return Promise.resolve()
}
return preProcess(t, oldTx, tx, pi) return preProcess(t, oldTx, tx, pi)
.then(preProcessedTx => cashOutLow.upsert(t, oldTx, preProcessedTx)) .then(preProcessedTx => cashOutLow.upsert(t, oldTx, preProcessedTx))

1
lib/cash-out/cash-out-low.js
View file

@ -59,6 +59,7 @@ function diff (oldTx, newTx) {
return updatedTx['customerId'] = newTx['customerId'] return updatedTx['customerId'] = newTx['customerId']
} }
return return
// prevent dispense changing from 'true' to 'false'
case 'dispense': case 'dispense':
if (!oldTx.dispense) { if (!oldTx.dispense) {
return updatedTx[fieldKey] = newTx[fieldKey] return updatedTx[fieldKey] = newTx[fieldKey]