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

chore: undo $ prepend on queries

Browse source
This commit is contained in:
Taranto 2021-07-22 11:06:39 +01:00 • committed by Josh Harvey
parent f3f2bb01b0
commit ba4117173e
50 changed files with 215 additions and 227 deletions
Download patch file Download diff file Expand all files Collapse all files

12
lib/postgresql_interface.js
View file

@ -22,14 +22,14 @@ exports.recordDeviceEvent = function recordDeviceEvent (deviceId, event) {
const values = [deviceId, event.eventType, event.note,
event.deviceTime]
return db.$none(sql, values)
return db.none(sql, values)
}
exports.cassetteCounts = function cassetteCounts (deviceId) {
const sql = 'SELECT cassette1, cassette2 FROM devices ' +
'WHERE device_id=$1'
return db.$one(sql, [deviceId])
return db.one(sql, [deviceId])
.then(row => {
const counts = [row.cassette1, row.cassette2]
return {counts}
@ -46,14 +46,14 @@ exports.machineEvent = function machineEvent (rec) {
const deleteSql = `delete from machine_events
where created < now() - interval '1 days'`
return db.$none(sql, values)
.then(() => db.$none(deleteSql))
return db.none(sql, values)
.then(() => db.none(deleteSql))
}
exports.machineEventsByIdBatch = function machineEventsByIdBatch (machineIds) {
const formattedIds = _.map(pgp.as.text, machineIds).join(',')
const sql = `SELECT *, (EXTRACT(EPOCH FROM (now() - created))) * 1000 AS age FROM machine_events WHERE device_id IN ($1^) ORDER BY age ASC LIMIT 1`
return db.$any(sql, [formattedIds]).then(res => {
return db.any(sql, [formattedIds]).then(res => {
const events = _.map(_.mapKeys(_.camelCase))(res)
const eventMap = _.groupBy('deviceId', events)
return machineIds.map(id => _.prop([0], eventMap[id]))
@ -63,5 +63,5 @@ exports.machineEventsByIdBatch = function machineEventsByIdBatch (machineIds) {
exports.machineEvents = function machineEvents () {
const sql = 'SELECT *, (EXTRACT(EPOCH FROM (now() - created))) * 1000 AS age FROM machine_events'
return db.$any(sql, [])
return db.any(sql, [])
}