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

refactor: move getCustomInfoRequests call out of config manager

Browse source
This commit is contained in:
André Sá 2022-04-26 15:23:42 +01:00
parent 2f1d60b7e5
commit 6c43f7536d
3 changed files with 14 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lib/routes/pollingRoutes.js
View file

@ -10,7 +10,7 @@ const plugins = require('../plugins')
const semver = require('semver')
const state = require('../middlewares/state')
const version = require('../../package.json').version
const customRequestQueries = require('../new-admin/services/customInfoRequests')
const { batchGetCustomInfoRequest, getCustomInfoRequests } = require('../new-admin/services/customInfoRequests')
const urlsToPing = [
`us.archive.ubuntu.com`,
@ -45,7 +45,7 @@ const buildTriggers = (allTriggers) => {
return !_.isNil(o.customInfoRequestId) && !_.isEmpty(o.customInfoRequestId)
}, allTriggers)
return _.flow([_.map(_.get('customInfoRequestId')), customRequestQueries.batchGetCustomInfoRequest])(customTriggers)
return _.flow([_.map(_.get('customInfoRequestId')), batchGetCustomInfoRequest])(customTriggers)
.then(res => {
res.forEach((details, index) => {
// make sure we aren't attaching the details to the wrong trigger
@ -85,7 +85,7 @@ function poll (req, res, next) {
pi.recordPing(deviceTime, machineVersion, machineModel),
pi.pollQueries(),
buildTriggers(configManager.getTriggers(settings.config)),
configManager.getTriggersAutomation(settings.config)
configManager.getTriggersAutomation(getCustomInfoRequests(true), settings.config),
])
.then(([_pingRes, results, triggers, triggersAutomation]) => {
const reboot = pid && state.reboots?.[operatorId]?.[deviceId] === pid