From 4ebdb86a6f82d7083a157009dbeb9426afb2b69b Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Tue, 3 Nov 2020 15:08:45 +0100 Subject: [PATCH] Intel Mine code implementation --- Commons.js | 15 ++++++++++++--- DataDependencies.js | 4 ++-- ProcessOutput.js | 4 ++-- 3 files changed, 16 insertions(+), 7 deletions(-) diff --git a/Commons.js b/Commons.js index eff4397be..19c917f82 100644 --- a/Commons.js +++ b/Commons.js @@ -118,9 +118,18 @@ if (dataMineNode === undefined) { let tradingMineNode = global.FIND_NODE_IN_NODE_MESH(outputDatasetNode, 'Trading Mine') if (tradingMineNode === undefined) { - logger.write(MODULE_NAME, "[ERROR] start -> Bot not attached to a Data Mine or a Trading Mine."); - callBackFunction(global.DEFAULT_FAIL_RESPONSE); - return + let intelMineNode = global.FIND_NODE_IN_NODE_MESH(outputDatasetNode, 'Intel Mine') + if (intelMineNode === undefined) { + logger.write(MODULE_NAME, "[ERROR] start -> Bot not attached to a Data Mine, Trading Mine or Intel Mine."); + callBackFunction(global.DEFAULT_FAIL_RESPONSE); + return + } else { + if (tradingMineNode.config.codeName === undefined) { + logger.write(MODULE_NAME, "[ERROR] start -> Intel Mine witn no codeName defined."); + callBackFunction(global.DEFAULT_FAIL_RESPONSE); + return + } + } } else { if (tradingMineNode.config.codeName === undefined) { logger.write(MODULE_NAME, "[ERROR] start -> Trading Mine witn no codeName defined."); diff --git a/DataDependencies.js b/DataDependencies.js index 54eb5916d..361fc3307 100644 --- a/DataDependencies.js +++ b/DataDependencies.js @@ -36,7 +36,7 @@ thisObject.nodeArray = global.FILTER_OUT_NODES_WITHOUT_REFERENCE_PARENT_FROM_NODE_ARRAY(thisObject.nodeArray) } else { - logger.write(MODULE_NAME, "[ERROR] initialize -> onInitilized -> It is not possible to not have process dependencies, which means not data dependencies."); + logger.write(MODULE_NAME, "[ERROR] initialize -> onInitilized -> It is not possible not to have process dependencies, which means not data dependencies."); callBackFunction(global.DEFAULT_OK_RESPONSE) return } @@ -65,7 +65,7 @@ let skipCount = 0 /* - The current nodeArray that we have includes all the dependencies daclared in the Data Mine / Trading Mine + The current nodeArray that we have includes all the dependencies daclared in the Data Mine | Trading Mine | Intel Mine process dependencies, minus the ones without reference parent, meaning that references Data Mines that are not present at the workspace. From all the remaining dependencies there will be others that we need to filter out, and they are the ones which the user does not have a data product anywhere on the network where diff --git a/ProcessOutput.js b/ProcessOutput.js index 8af65ef2a..48d008c7d 100644 --- a/ProcessOutput.js +++ b/ProcessOutput.js @@ -144,11 +144,11 @@ } if (botNode.parentNode !== undefined) { if (botNode.parentNode.config.codeName === undefined) { - logger.write(MODULE_NAME, "[ERROR] raiseEvents -> codeName at Data Mine not defined. Data Mine = " + JSON.stringify(botNode.parentNode)); + logger.write(MODULE_NAME, "[ERROR] raiseEvents -> codeName at Mine not defined. Mine = " + JSON.stringify(botNode.parentNode)); throw (global.DEFAULT_FAIL_RESPONSE); } } else { - logger.write(MODULE_NAME, "[ERROR] raiseEvents -> Bot not attached to a Data Mine or Trading Mine. Bot = " + JSON.stringify(botNode)); + logger.write(MODULE_NAME, "[ERROR] raiseEvents -> Bot not attached to a Data Mine | Trading Mine | Intel Mine. Bot = " + JSON.stringify(botNode)); throw (global.DEFAULT_FAIL_RESPONSE); } } else {