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

refactor: use a single DB task to load the latest settings

Browse source
This commit is contained in:
siiky 2025-06-03 12:20:21 +01:00
parent 593f7fe949
commit dddbe98fca
1 changed files with 14 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

25
packages/server/lib/new-settings-loader.js
View file

@ -168,16 +168,19 @@ function migrationSaveConfig(config) {
})
}
function loadLatest(schemaVersion) {
return Promise.all([
loadLatestConfigOrNoneReturningVersion(schemaVersion),
loadAccounts(schemaVersion),
]).then(([configObj, accounts]) => ({
config: configObj.config,
accounts,
version: configObj.version,
}))
}
const loadLatest = schemaVersion =>
db
.task(t =>
t.batch([
loadLatestConfigOrNoneReturningVersion(t, schemaVersion),
_loadAccounts(t, schemaVersion),
]),
)
.then(([configObj, accounts]) => ({
config: configObj.config,
accounts,
version: configObj.version,
}))
function loadLatestConfig() {
const sql = `SELECT data
@ -196,7 +199,7 @@ function loadLatestConfig() {
})
}
function loadLatestConfigOrNoneReturningVersion(schemaVersion) {
function loadLatestConfigOrNoneReturningVersion(db, schemaVersion) {
const sql = `SELECT data, id
FROM user_config
WHERE type = 'config'