This commit is contained in:
Josh Harvey 2016-02-08 19:22:08 +02:00
parent 7c15ce0ae8
commit 8734849511
4 changed files with 37 additions and 19 deletions

View file

@ -100,17 +100,6 @@ exports.recordBill = function recordBill(session, rec, cb) {
});
};
exports.recordDeviceEvent = function recordDeviceEvent(session, event) {
connect(function(cerr, client, done) {
if (cerr) return;
var sql = 'INSERT INTO device_events (device_fingerprint, event_type, ' +
'note, device_time) VALUES ($1, $2, $3, $4)';
var values = [session.fingerprint, event.eventType, event.note,
event.deviceTime];
client.query(sql, values, done);
});
};
function query(client, queryStr, values, cb) {
if (!cb) {
cb = values;
@ -514,11 +503,20 @@ exports.cartridgeCounts = function cartridgeCounts(session, cb) {
};
exports.machineEvent = function machineEvent(rec, cb) {
var TTL = 2 * 60 * 60 * 1000
connect(function(cerr, client, done) {
if (cerr) return cb(cerr);
var sql = 'insert into machine_events (id, device_fingerprint, event_type, note, device_time) ' +
'VALUES (?, ?, ?, ?, ?)';
var values = [rec.id, rec.fingerprint, rec.eventType, rec.note, rec.deviceTime]
var fields = ['id', 'device_fingerprint', 'event_type', 'note', 'device_time', 'created']
var sql = getInsertQuery('machine_events', fields, false)
var values = [rec.id, rec.fingerprint, rec.eventType, rec.note, rec.deviceTime, new Date().toISOString()]
var deleteSql = 'DELETE FROM machine_events WHERE created < $1';
var deleteValues = [new Date(Date.now() - TTL).toISOString()];
query(client, deleteSql, deleteValues, function(err) {
if (err) console.error(err)
})
query(client, sql, values, function(err, results) {
done();
return cb(err, results);