From 182882495d399804770a2fba0cd5443b4c0cf894 Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Wed, 2 Dec 2020 14:11:54 +0100 Subject: [PATCH] Sensor bot moved --- Projects/ProjectsSchema.json | 6 +++--- .../Bot-Modules/{ => Sensor-Bot}/SingleMarketSensorBot.js | 0 TaskServer/MultiProject.js | 3 ++- TaskServer/ProcessInstance.js | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) rename Projects/Superalgos/TS/Bot-Modules/{ => Sensor-Bot}/SingleMarketSensorBot.js (100%) diff --git a/Projects/ProjectsSchema.json b/Projects/ProjectsSchema.json index 54dfcc438..d3cd211a9 100644 --- a/Projects/ProjectsSchema.json +++ b/Projects/ProjectsSchema.json @@ -485,13 +485,13 @@ "fileName": "ProcessOutput.js" } ], - "botsModules": [ + "botModules": [ { - "botType": "Sensor Bot", "name": "Single Market Sensor Bot", "propertyName": "singleMarketSensorBot", "functionName": "newSuperalgosBotModulesSingleMarketSensorBot", - "fileName": "SingleMarketSensorBot.js" + "fileName": "SingleMarketSensorBot.js", + "folderName": "Sensor-Bot" } ] }, diff --git a/Projects/Superalgos/TS/Bot-Modules/SingleMarketSensorBot.js b/Projects/Superalgos/TS/Bot-Modules/Sensor-Bot/SingleMarketSensorBot.js similarity index 100% rename from Projects/Superalgos/TS/Bot-Modules/SingleMarketSensorBot.js rename to Projects/Superalgos/TS/Bot-Modules/Sensor-Bot/SingleMarketSensorBot.js diff --git a/TaskServer/MultiProject.js b/TaskServer/MultiProject.js index 8362a68ad..2b26abcb9 100644 --- a/TaskServer/MultiProject.js +++ b/TaskServer/MultiProject.js @@ -29,6 +29,7 @@ exports.newMultiProject = function () { projectInstance.functionLibraries = {} projectInstance.taskModules = {} projectInstance.processModules = {} + projectInstance.botModules = {} /* Set up Utilities of this Project */ if (projectDefinition.TS.utilities !== undefined) { @@ -92,7 +93,7 @@ exports.newMultiProject = function () { if (projectDefinition.TS.botModules !== undefined) { for (let j = 0; j < projectDefinition.TS.botModules.length; j++) { let botModuleDefinition = projectDefinition.TS.botModules[j] - let path = global.env.PATH_TO_PROJECTS_REQUIRED + '/' + projectDefinition.name + '/' + 'TS' + '/' + 'Bot-Modules' + '/' + botModuleDefinition.fileName + let path = global.env.PATH_TO_PROJECTS_REQUIRED + '/' + projectDefinition.name + '/' + 'TS' + '/' + 'Bot-Modules' + '/' + botModuleDefinition.folderName + '/' + botModuleDefinition.fileName let requiredObject = require(path) projectInstance.botModules[botModuleDefinition.propertyName] = requiredObject diff --git a/TaskServer/ProcessInstance.js b/TaskServer/ProcessInstance.js index c9ae3a280..a2a615923 100644 --- a/TaskServer/ProcessInstance.js +++ b/TaskServer/ProcessInstance.js @@ -94,7 +94,7 @@ try { TS.projects.superalgos.globals.processVariables.TOTAL_PROCESS_INSTANCES_CREATED++ - botInstance = TS.projects.superalgos.botsModules.singleMarketSensorBot.newSuperalgosBotModulesSingleMarketSensorBot(processIndex); + botInstance = TS.projects.superalgos.botModules.singleMarketSensorBot.newSuperalgosBotModulesSingleMarketSensorBot(processIndex); botInstance.initialize(processConfig, onInitializeReady); } catch (err) {