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

Merge pull request #957 from ubavic/fix/machine_unpair_release

Browse source 
fix: machine unpair (release)
This commit is contained in:
Rafael Taranto 2021-12-02 15:00:23 +00:00 • committed by GitHub
commit 8ff163ed27
2 changed files with 38 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

22
lib/pairing.js
View file

@ -4,6 +4,7 @@ const readFile = pify(fs.readFile)
const db = require('./db')
const options = require('./options')
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.
// This makes sure that the server stores a default value
@ -16,15 +17,22 @@ function pullToken (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) {
// TODO new-admin: We should remove all configs related to that device. This can get tricky.
return db.tx(t => {
const q1 = t.none('DELETE FROM devices WHERE device_id=$1', [deviceId])
const q2 = t.none('DELETE FROM machine_pings WHERE device_id=$1', [deviceId])
const q3 = t.none('DELETE FROM machine_network_heartbeat WHERE device_id=$1', [deviceId])
const q4 = t.none('DELETE FROM machine_network_performance WHERE device_id=$1', [deviceId])
return Promise.all([q1, q2, q3, q4])
return db.tx(t =>
t.none(`INSERT INTO unpaired_devices(id, device_id, name, model, paired, unpaired)
SELECT $1, $2, d.name, d.model, d.created, now()
FROM devices d
WHERE device_id=$2`
, [uuid.v4(), deviceId])
.then(() => {
const q1 = t.none(`DELETE FROM devices WHERE device_id=$1`, [deviceId])
const q2 = t.none(`DELETE FROM machine_pings WHERE device_id=$1`, [deviceId])
const q3 = t.none(`DELETE FROM machine_network_heartbeat WHERE device_id=$1`, [deviceId])
const q4 = t.none(`DELETE FROM machine_network_performance WHERE device_id=$1`, [deviceId])
return t.batch([q1, q2, q3, q4])
})
)
}
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()
}