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

fix: migrate accounts and default cash-out commissions

Browse source
This commit is contained in:
José Oliveira 2021-04-21 16:24:46 +01:00 • committed by Rafael Taranto
parent 58b74a6425
commit b1a2c20e87
2 changed files with 15 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

7
lib/config-migration.js
View file

@ -81,6 +81,11 @@ function migrateCommissions (config) {
} }
const { global, scoped } = getConfigFields(_.keys(codes), config) const { global, scoped } = getConfigFields(_.keys(codes), config)
const defaultCashOutCommissions = { code: 'cashOutCommission', value: 0, scope: global[0].scope }
const isCashOutDisabled =
_.isEmpty(_.filter(commissionElement => commissionElement.code === 'cashOutCommission', global))
const globalWithDefaults =
isCashOutDisabled ? _.concat(global, defaultCashOutCommissions) : global
const machineAndCryptoScoped = scoped.filter( const machineAndCryptoScoped = scoped.filter(
f => f.scope.machine !== GLOBAL_SCOPE.machine && f.scope.crypto.length === 1 f => f.scope.machine !== GLOBAL_SCOPE.machine && f.scope.crypto.length === 1
@ -112,7 +117,7 @@ function migrateCommissions (config) {
const allCommissionsOverrides = withCryptoScoped.concat(filteredMachineScoped) const allCommissionsOverrides = withCryptoScoped.concat(filteredMachineScoped)
return { return {
..._.fromPairs(global.map(f => [`commissions_${codes[f.code]}`, f.value])), ..._.fromPairs(globalWithDefaults.map(f => [`commissions_${codes[f.code]}`, f.value])),
...(allCommissionsOverrides.length > 0 && { ...(allCommissionsOverrides.length > 0 && {
commissions_overrides: allCommissionsOverrides.map(s => ({ commissions_overrides: allCommissionsOverrides.map(s => ({
..._.fromPairs(s.values.map(f => [codes[f.code], f.value])), ..._.fromPairs(s.values.map(f => [codes[f.code], f.value])),

15
migrations/1599523522436-migrate-config.js
View file

@ -1,20 +1,21 @@
const db = require('./db') const db = require('./db')
const settingsLoader = require('../lib/admin/settings-loader')
const machineLoader = require('../lib/machine-loader') const machineLoader = require('../lib/machine-loader')
const { saveConfig, saveAccounts } = require('../lib/new-settings-loader') const { saveConfig, saveAccounts, loadLatest } = require('../lib/new-settings-loader')
const { migrate } = require('../lib/config-migration') const { migrate } = require('../lib/config-migration')
const OLD_SETTINGS_LOADER_SCHEMA_VERSION = 1
module.exports.up = function (next) { module.exports.up = function (next) {
function migrateConfig(settings) { function migrateConfig (settings) {
const newSettings = migrate(settings.config, settings.accounts) const newSettings = migrate(settings.config, settings.accounts)
return Promise.all([ return Promise.all([
saveConfig(newSettings.config), saveConfig(newSettings.config),
saveAccounts(newSettings.accounts) saveAccounts(newSettings.accounts)
]) ])
.then(() => next()) .then(() => next())
} }
settingsLoader.loadLatest(false) loadLatest(OLD_SETTINGS_LOADER_SCHEMA_VERSION)
.then(async settings => ({ .then(async settings => ({
settings, settings,
machines: await machineLoader.getMachineNames(settings.config) machines: await machineLoader.getMachineNames(settings.config)
@ -26,9 +27,9 @@ module.exports.up = function (next) {
return db.multi(sql, () => migrateConfig(settings)) return db.multi(sql, () => migrateConfig(settings))
}) })
.catch(err => { .catch(err => {
if (err.message = 'lamassu-server is not configured') if (err.message === 'lamassu-server is not configured') {
next() next()
}
console.log(err.message) console.log(err.message)
}) })
} }