From aef97236e64228d13aabde7507e93844ed3e558a Mon Sep 17 00:00:00 2001
From: Luis Fernando Molina <Luis-Fernando-Molina@users.noreply.github.com>
Date: Wed, 2 Dec 2020 13:38:20 +0100
Subject: [PATCH] Sensor Bot moved

---
 Projects/ProjectsSchema.json                  | 10 +++++++-
 .../TS/Bot-Modules/SingleMarketSensorBot.js   |  2 +-
 TaskServer/MultiProject.js                    | 25 +++++++++----------
 TaskServer/ProcessInstance.js                 |  3 +--
 4 files changed, 23 insertions(+), 17 deletions(-)
 rename TaskServer/SensorBot.js => Projects/Superalgos/TS/Bot-Modules/SingleMarketSensorBot.js (99%)

diff --git a/Projects/ProjectsSchema.json b/Projects/ProjectsSchema.json
index af6a30a27..f7b376d80 100644
--- a/Projects/ProjectsSchema.json
+++ b/Projects/ProjectsSchema.json
@@ -479,7 +479,15 @@
                     "fileName": "ProcessOutput.js"
                 }
             ],
-            "botClasses": []
+            "botsModules": [
+                {
+                    "botType": "Sensor Bot",
+                    "name": "Single Market Sensor Bot",
+                    "propertyName": "singleMarketSensorBot",
+                    "functionName": "newSuperalgosBotModulesSingleMarketSensorBot",
+                    "fileName": "SingleMarketSensorBot.js"
+                }
+            ]
         },
         "CL": {}
     },
diff --git a/TaskServer/SensorBot.js b/Projects/Superalgos/TS/Bot-Modules/SingleMarketSensorBot.js
similarity index 99%
rename from TaskServer/SensorBot.js
rename to Projects/Superalgos/TS/Bot-Modules/SingleMarketSensorBot.js
index 11e95baee..35b1d67c9 100644
--- a/TaskServer/SensorBot.js
+++ b/Projects/Superalgos/TS/Bot-Modules/SingleMarketSensorBot.js
@@ -1,4 +1,4 @@
-exports.newSensorBot = function newSensorBot(processIndex) {
+exports.newSuperalgosBotModulesSingleMarketSensorBot = function (processIndex) {
 
     const MODULE_NAME = "Sensor Bot";
 
diff --git a/TaskServer/MultiProject.js b/TaskServer/MultiProject.js
index a26cc5a98..8362a68ad 100644
--- a/TaskServer/MultiProject.js
+++ b/TaskServer/MultiProject.js
@@ -10,7 +10,7 @@ exports.newMultiProject = function () {
         /*
         First thing is to load the project schema file.
         */
-       let PROJECTS_SCHEMA = require(global.env.PATH_TO_PROJECTS_REQUIRED + '/' + 'ProjectsSchema.json')
+        let PROJECTS_SCHEMA = require(global.env.PATH_TO_PROJECTS_REQUIRED + '/' + 'ProjectsSchema.json')
 
         /*
         Here we will setup the TS object, with all the
@@ -66,18 +66,6 @@ exports.newMultiProject = function () {
                 }
             }
 
-            /* Set up Bot Classes of this Project */
-            if (projectDefinition.TS.botClasses !== undefined) {
-                for (let j = 0; j < projectDefinition.TS.botClasses.length; j++) {
-                    let botClassDefinition = projectDefinition.TS.botClasses[j]
-                    let path = global.env.PATH_TO_PROJECTS_REQUIRED + '/' + projectDefinition.name + '/' + 'TS' + '/' + 'Bot-Classes' + '/' + botClassDefinition.fileName
-
-                    let requiredObject = require(path)
-                    let requiredFunction = requiredObject[botClassDefinition.functionName]
-                    projectInstance.botClasses[botClassDefinition.propertyName] = requiredFunction.call()
-                }
-            }
-
             /* Set up Process Modules for this Project */
             if (projectDefinition.TS.taskModules !== undefined) {
                 for (let j = 0; j < projectDefinition.TS.taskModules.length; j++) {
@@ -99,6 +87,17 @@ exports.newMultiProject = function () {
                     projectInstance.processModules[processModuleDefinition.propertyName] = requiredObject
                 }
             }
+
+            /* Set up Bot Modules for this Project */
+            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 requiredObject = require(path)
+                    projectInstance.botModules[botModuleDefinition.propertyName] = requiredObject
+                }
+            }
         }
 
         TS.projects.superalgos.globals.taskConstants.PROJECTS_SCHEMA = PROJECTS_SCHEMA
diff --git a/TaskServer/ProcessInstance.js b/TaskServer/ProcessInstance.js
index 38c72cd71..142fd9bab 100644
--- a/TaskServer/ProcessInstance.js
+++ b/TaskServer/ProcessInstance.js
@@ -15,7 +15,6 @@
             /* Process Loops Declarations. */
 
             const INDICATOR_BOT_MODULE = require('./IndicatorBot');
-            const SENSOR_BOT = require('./SensorBot');
             const TRADING_BOT_MODULE = require('./TradingBot');
             const DEBUG_MODULE = require(TS.projects.superalgos.globals.nodeJSConstants.REQUIRE_ROOT_DIR + 'DebugLog');
 
@@ -96,7 +95,7 @@
                 try {
                     TS.projects.superalgos.globals.processVariables.TOTAL_PROCESS_INSTANCES_CREATED++
 
-                    botInstance = SENSOR_BOT.newSensorBot(processIndex);
+                    botInstance = TS.projects.superalgos.botsModules.singleMarketSensorBot.newSuperalgosBotModulesSingleMarketSensorBot(processIndex);
                     botInstance.initialize(processConfig, onInitializeReady);
                 }
                 catch (err) {