u
This commit is contained in:
@@ -76,7 +76,7 @@ export default function upsert(provider) {
|
|||||||
|
|
||||||
const sort = input.sort !== undefined ? input.sort : existing.rows[0].sort;
|
const sort = input.sort !== undefined ? input.sort : existing.rows[0].sort;
|
||||||
const enabled = input.enabled !== undefined ? (input.enabled ? 1 : 0) : (existing.rows[0].enabled ? 1 : 0);
|
const enabled = input.enabled !== undefined ? (input.enabled ? 1 : 0) : (existing.rows[0].enabled ? 1 : 0);
|
||||||
const clientversion = input.clientversion !== undefined ? (input.clientversion ? String(input.clientversion).trim() : null) : (existing.rows[0].clientversion ?? null);
|
const clientversion = existing.rows[0].clientversion ?? null;
|
||||||
|
|
||||||
const pairingpin =
|
const pairingpin =
|
||||||
input.pairingpin !== undefined
|
input.pairingpin !== undefined
|
||||||
|
|||||||
@@ -62,16 +62,15 @@ test('schema migrations & posterminal version 2', async (t) => {
|
|||||||
assert.equal(list[0].enabled, 1);
|
assert.equal(list[0].enabled, 1);
|
||||||
assert.equal(list[0].clientversion, '2.1.0');
|
assert.equal(list[0].clientversion, '2.1.0');
|
||||||
|
|
||||||
// patch update
|
// patch update (clientversion is not updated via upsert; existing value is preserved)
|
||||||
const updated = await store.posterminal.upsert(tenant.googleAuthId, {
|
const updated = await store.posterminal.upsert(tenant.googleAuthId, {
|
||||||
id: terminalId,
|
id: terminalId,
|
||||||
sort: 10,
|
sort: 10,
|
||||||
enabled: false,
|
enabled: false,
|
||||||
clientversion: '2.2.0',
|
|
||||||
});
|
});
|
||||||
assert.equal(updated.sort, 10);
|
assert.equal(updated.sort, 10);
|
||||||
assert.equal(updated.enabled, 0);
|
assert.equal(updated.enabled, 0);
|
||||||
assert.equal(updated.clientversion, '2.2.0');
|
assert.equal(updated.clientversion, '2.1.0');
|
||||||
|
|
||||||
// pair with clientversion
|
// pair with clientversion
|
||||||
const paired = await store.posterminal.pair(terminalId, {
|
const paired = await store.posterminal.pair(terminalId, {
|
||||||
|
|||||||
Reference in New Issue
Block a user