From dfaa8a9c513183f267bd84847678007fc84cf9c1 Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Mon, 11 Nov 2019 15:24:27 +0100 Subject: [PATCH] Refactoring for nodeArray --- DataDependencies.js | 16 ++++++++-------- MultiPeriod.js | 12 ++++++------ MultiPeriodDaily.js | 6 +++--- MultiPeriodMarket.js | 8 ++++---- 4 files changed, 21 insertions(+), 21 deletions(-) diff --git a/DataDependencies.js b/DataDependencies.js index 0be8aa16e..20bca751d 100644 --- a/DataDependencies.js +++ b/DataDependencies.js @@ -6,7 +6,7 @@ const MODULE_NAME = "Data Dependencies"; let thisObject = { - config: undefined, + nodeArray: undefined, dataSets: new Map(), initialize: initialize, keys: [] @@ -21,9 +21,9 @@ if (FULL_LOG === true) { logger.write(MODULE_NAME, "[INFO] initialize -> Entering function."); } - thisObject.config = pDataDependenciesConfig; + thisObject.nodeArray = pDataDependenciesConfig; - if (thisObject.config === undefined) { + if (thisObject.nodeArray === undefined) { // We allow old indicators not to declare their data dependencies. @@ -32,17 +32,17 @@ } /* - For each dependency declared at the bot config, we will initialize a DataSet as part of this initialization process. + For each dependency declared at the bot nodeArray, we will initialize a DataSet as part of this initialization process. */ let alreadyCalledBack = false; let addCount = 0; - for (let i = 0; i < thisObject.config.length; i++) { + for (let i = 0; i < thisObject.nodeArray.length; i++) { let dataSetModule = DATA_SET.newDataSet(BOT, logger); - dataSetModule.initialize(thisObject.config[i], onInitilized); + dataSetModule.initialize(thisObject.nodeArray[i], onInitilized); function onInitilized(err) { @@ -65,14 +65,14 @@ let key; - key = thisObject.config[i].devTeam + "-" + thisObject.config[i].bot + "-" + thisObject.config[i].product + "-" + thisObject.config[i].dataSet + "-" + thisObject.config[i].dataSetVersion; + key = thisObject.nodeArray[i].devTeam + "-" + thisObject.nodeArray[i].bot + "-" + thisObject.nodeArray[i].product + "-" + thisObject.nodeArray[i].dataSet + "-" + thisObject.nodeArray[i].dataSetVersion; thisObject.keys.push(key); thisObject.dataSets.set(key, dataSetModule); if (FULL_LOG === true) { logger.write(MODULE_NAME, "[INFO] initialize -> addDataSet -> DataSet added to Map. -> key = " + key); } - if (addCount === thisObject.config.length) { + if (addCount === thisObject.nodeArray.length) { if (alreadyCalledBack === false) { alreadyCalledBack = true callBackFunction(global.DEFAULT_OK_RESPONSE); diff --git a/MultiPeriod.js b/MultiPeriod.js index 024f7f111..a2707c4e3 100644 --- a/MultiPeriod.js +++ b/MultiPeriod.js @@ -42,11 +42,11 @@ dataDependencies = pDataDependencies; processConfig = pProcessConfig; - for (let i = 0; i < dataDependencies.config.length; i++) { + for (let i = 0; i < dataDependencies.nodeArray.length; i++) { let key; let dataset; - let dependency = dataDependencies.config[i]; + let dependency = dataDependencies.nodeArray[i]; key = dependency.devTeam + "-" + dependency.bot + "-" + @@ -307,7 +307,7 @@ if (FULL_LOG === true) { logger.write(MODULE_NAME, "[INFO] start -> processTimePeriodsMarketFiles -> periodsLoopBody -> dependencyLoopBody -> Entering function."); } - let dependency = dataDependencies.config[dependencyIndex]; + let dependency = dataDependencies.nodeArray[dependencyIndex]; let dataset = datasets[dependencyIndex]; getFile(); @@ -377,7 +377,7 @@ dependencyIndex++; - if (dependencyIndex < dataDependencies.config.length) { + if (dependencyIndex < dataDependencies.nodeArray.length) { dependencyLoopBody(); @@ -611,7 +611,7 @@ if (FULL_LOG === true) { logger.write(MODULE_NAME, "[INFO] start -> processTimePeriodsDailyFiles -> periodsLoopBody -> dependencyLoopBody -> Entering function."); } - let dependency = dataDependencies.config[dependencyIndex]; + let dependency = dataDependencies.nodeArray[dependencyIndex]; let dataset = datasets[dependencyIndex]; let previousFile; @@ -785,7 +785,7 @@ dependencyIndex++; - if (dependencyIndex < dataDependencies.config.length) { + if (dependencyIndex < dataDependencies.nodeArray.length) { dependencyLoopBody(); diff --git a/MultiPeriodDaily.js b/MultiPeriodDaily.js index 3802235d0..33588ac3b 100644 --- a/MultiPeriodDaily.js +++ b/MultiPeriodDaily.js @@ -42,7 +42,7 @@ dataDependencies = pDataDependencies; processConfig = pProcessConfig; - for (let i = 0; i < dataDependencies.config.length; i++) { + for (let i = 0; i < dataDependencies.nodeArray.length; i++) { let key; let dataset; @@ -410,7 +410,7 @@ if (FULL_LOG === true) { logger.write(MODULE_NAME, "[INFO] start -> processTimePeriods -> periodsLoopBody -> dependencyLoopBody -> Entering function."); } - let dependency = dataDependencies.config[dependencyIndex]; + let dependency = dataDependencies.nodeArray[dependencyIndex]; let dataset = datasets[dependencyIndex]; let previousFile; @@ -577,7 +577,7 @@ dependencyIndex++; - if (dependencyIndex < dataDependencies.config.length) { + if (dependencyIndex < dataDependencies.nodeArray.length) { dependencyLoopBody(); diff --git a/MultiPeriodMarket.js b/MultiPeriodMarket.js index 70c77d75d..a5f286233 100644 --- a/MultiPeriodMarket.js +++ b/MultiPeriodMarket.js @@ -36,11 +36,11 @@ dataDependencies = pDataDependencies; processConfig = pProcessConfig; - for (let i = 0; i < dataDependencies.config.length; i++) { + for (let i = 0; i < dataDependencies.nodeArray.length; i++) { let key; let dataset; - let dependency = dataDependencies.config[i]; + let dependency = dataDependencies.nodeArray[i]; key = dependency.devTeam + "-" + dependency.bot + "-" + @@ -162,7 +162,7 @@ if (FULL_LOG === true) { logger.write(MODULE_NAME, "[INFO] start -> processTimePeriods -> periodsLoopBody -> dependencyLoopBody -> Entering function."); } - let dependency = dataDependencies.config[dependencyIndex]; + let dependency = dataDependencies.nodeArray[dependencyIndex]; let dataset = datasets[dependencyIndex]; getFile(); @@ -231,7 +231,7 @@ dependencyIndex++; - if (dependencyIndex < dataDependencies.config.length) { + if (dependencyIndex < dataDependencies.nodeArray.length) { dependencyLoopBody();