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

Merge pull request #1887 from siiky/fix/lam-1454/settings-loader-tasks

Browse source 
LAM-1454 fix: drop all `db.task.batch()` uses
This commit is contained in:
Rafael Taranto 2025-06-18 18:30:20 +01:00 • committed by GitHub
commit 0937e03c77
1 changed files with 8 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -171,7 +171,7 @@ function migrationSaveConfig(config) {
const loadLatest = schemaVersion => const loadLatest = schemaVersion =>
db db
.task(t => .task(t =>
t.batch([ Promise.all([
loadLatestConfigOrNoneReturningVersion(t, schemaVersion), loadLatestConfigOrNoneReturningVersion(t, schemaVersion),
_loadAccounts(t, schemaVersion), _loadAccounts(t, schemaVersion),
]), ]),
@ -252,15 +252,13 @@ function loadConfig(db, versionId) {
function load(versionId) { function load(versionId) {
if (!versionId) Promise.reject('versionId is required') if (!versionId) Promise.reject('versionId is required')
return db.task(t => { return db
t.batch([loadConfig(t, versionId), _loadAccounts(t)]).then( .task(t => Promise.all([loadConfig(t, versionId), _loadAccounts(t)]))
([config, accounts]) => ({ .then(([config, accounts]) => ({
config, config,
version: versionId, version: versionId,
accounts, accounts,
}), }))
)
})
} }
const fetchCurrentConfigVersion = () => { const fetchCurrentConfigVersion = () => {