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

fix: machine unpair

Browse source 
feat: add removed_devices table
This commit is contained in:
Nikola Ubavic 2021-11-26 15:10:35 +01:00
parent 1cb715332a
commit f204a85b44
2 changed files with 39 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

25
lib/pairing.js
View file

@ -4,6 +4,7 @@ const readFile = pify(fs.readFile)
const db = require('./db') const db = require('./db')
const options = require('./options') const options = require('./options')
const logger = require('./logger') const logger = require('./logger')
const uuid = require('uuid')
// A machine on an older version (no multicassette code) could be paired with a server with multicassette code. // A machine on an older version (no multicassette code) could be paired with a server with multicassette code.
// This makes sure that the server stores a default value // This makes sure that the server stores a default value
@ -16,15 +17,23 @@ function pullToken (token) {
return db.one(sql, [token]) return db.one(sql, [token])
} }
// TODO new-admin: We should remove all configs related to that device. This can get tricky.
function unpair (deviceId) { function unpair (deviceId) {
// TODO new-admin: We should remove all configs related to that device. This can get tricky. const sql = `INSERT INTO
return db.tx(t => { unpaired_devices(id, device_id, name, model, paired, unpaired)
const q1 = t.none('DELETE FROM devices WHERE device_id=$1', [deviceId]) VALUES (
const q2 = t.none('DELETE FROM machine_pings WHERE device_id=$1', [deviceId]) $1,
const q3 = t.none('DELETE FROM machine_network_heartbeat WHERE device_id=$1', [deviceId]) $2,
const q4 = t.none('DELETE FROM machine_network_performance WHERE device_id=$1', [deviceId]) (SELECT name FROM devices WHERE device_id=$2),
return Promise.all([q1, q2, q3, q4]) (SELECT model FROM devices WHERE device_id=$2),
}) (SELECT created FROM devices WHERE device_id=$2),
now());
DELETE FROM devices WHERE device_id=$2;
DELETE FROM machine_pings WHERE device_id=$2;
DELETE FROM machine_network_heartbeat WHERE device_id=$2;
DELETE FROM machine_network_performance WHERE device_id=$2;`
return db.tx(t => t.none(sql, [uuid.v4(), deviceId]))
} }
function pair (token, deviceId, machineModel, numOfCassettes = DEFAULT_NUMBER_OF_CASSETTES) { function pair (token, deviceId, machineModel, numOfCassettes = DEFAULT_NUMBER_OF_CASSETTES) {

22
migrations/1637877732001-add_unpaired_devices_table.js Normal file
View file

@ -0,0 +1,22 @@
var db = require('./db')
exports.up = function (next) {
var sql = [
`ALTER TABLE cashbox_batches
DROP CONSTRAINT cashbox_batches_device_id_fkey;`,
`CREATE TABLE IF NOT EXISTS unpaired_devices (
id uuid PRIMARY KEY,
device_id text NOT NULL,
model text,
name text,
paired timestamp NOT NULL,
unpaired timestamp NOT NULL
)`,
]
db.multi(sql, next)
}
exports.down = function (next) {
next()
}