From 9c007a028e7f7293ca6c73a7a8e1f95e1ff4dbc6 Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Wed, 11 Mar 2020 20:59:52 +0100 Subject: [PATCH] Rafactoring --- Multi-Period-Daily/User.bot.js | 8 ++++---- Multi-Period-Market/User.bot.js | 8 ++++---- this.bot.config.json | 30 +++++++++++++++--------------- 3 files changed, 23 insertions(+), 23 deletions(-) diff --git a/Multi-Period-Daily/User.bot.js b/Multi-Period-Daily/User.bot.js index c8f3d8694..996fb574e 100644 --- a/Multi-Period-Daily/User.bot.js +++ b/Multi-Period-Daily/User.bot.js @@ -86,7 +86,7 @@ Read the candles and volumes from Exchange Raw Data and produce a file for each /* We look first for Exchange Raw Data in order to get when the market starts. */ - reportKey = "AAMasters" + "-" + "Exchange-Raw-Data" + "-" + "Historic-OHLCVs" + "-" + "dataSet.V1"; + reportKey = "Masters" + "-" + "Exchange-Raw-Data" + "-" + "Historic-OHLCVs" + "-" + "dataSet.V1"; if (FULL_LOG === true) { logger.write(MODULE_NAME, "[INFO] start -> getContextVariables -> reportKey = " + reportKey); } statusReport = statusDependencies.statusReports.get(reportKey); @@ -122,7 +122,7 @@ Read the candles and volumes from Exchange Raw Data and produce a file for each /* Second, we get the report from Exchange Raw Data, to know when the marted ends. */ - reportKey = "AAMasters" + "-" + "Exchange-Raw-Data" + "-" + "Historic-OHLCVs" + "-" + "dataSet.V1" + reportKey = "Masters" + "-" + "Exchange-Raw-Data" + "-" + "Historic-OHLCVs" + "-" + "dataSet.V1" if (FULL_LOG === true) { logger.write(MODULE_NAME, "[INFO] start -> getContextVariables -> reportKey = " + reportKey); } statusReport = statusDependencies.statusReports.get(reportKey); @@ -157,7 +157,7 @@ Read the candles and volumes from Exchange Raw Data and produce a file for each /* Finally we get our own Status Report. */ - reportKey = "AAMasters" + "-" + "Candles-Volumes" + "-" + "Multi-Period-Daily" + "-" + "dataSet.V1"; + reportKey = "Masters" + "-" + "Candles-Volumes" + "-" + "Multi-Period-Daily" + "-" + "dataSet.V1"; if (FULL_LOG === true) { logger.write(MODULE_NAME, "[INFO] start -> getContextVariables -> reportKey = " + reportKey); } statusReport = statusDependencies.statusReports.get(reportKey); @@ -775,7 +775,7 @@ Read the candles and volumes from Exchange Raw Data and produce a file for each try { - let reportKey = "AAMasters" + "-" + "Candles-Volumes" + "-" + "Multi-Period-Daily" + "-" + "dataSet.V1"; + let reportKey = "Masters" + "-" + "Candles-Volumes" + "-" + "Multi-Period-Daily" + "-" + "dataSet.V1"; let thisReport = statusDependencies.statusReports.get(reportKey); thisReport.file.lastExecution = bot.processDatetime; diff --git a/Multi-Period-Market/User.bot.js b/Multi-Period-Market/User.bot.js index 21456f708..c6ebfdc3a 100644 --- a/Multi-Period-Market/User.bot.js +++ b/Multi-Period-Market/User.bot.js @@ -95,7 +95,7 @@ /* We look first for Exchange Raw Data in order to get when the market starts. */ - reportKey = "AAMasters" + "-" + "Exchange-Raw-Data" + "-" + "Historic-OHLCVs" + "-" + "dataSet.V1"; + reportKey = "Masters" + "-" + "Exchange-Raw-Data" + "-" + "Historic-OHLCVs" + "-" + "dataSet.V1"; if (FULL_LOG === true) { logger.write(MODULE_NAME, "[INFO] start -> getContextVariables -> reportKey = " + reportKey); } statusReport = statusDependencies.statusReports.get(reportKey); @@ -131,7 +131,7 @@ /* Second, we get the report from Exchange Raw Data, to know when the marted ends. */ - reportKey = "AAMasters" + "-" + "Exchange-Raw-Data" + "-" + "Historic-OHLCVs" + "-" + "dataSet.V1" + reportKey = "Masters" + "-" + "Exchange-Raw-Data" + "-" + "Historic-OHLCVs" + "-" + "dataSet.V1" if (FULL_LOG === true) { logger.write(MODULE_NAME, "[INFO] start -> getContextVariables -> reportKey = " + reportKey); } statusReport = statusDependencies.statusReports.get(reportKey); @@ -166,7 +166,7 @@ /* Finally we get our own Status Report. */ - reportKey = "AAMasters" + "-" + "Candles-Volumes" + "-" + "Multi-Period-Market" + "-" + "dataSet.V1"; + reportKey = "Masters" + "-" + "Candles-Volumes" + "-" + "Multi-Period-Market" + "-" + "dataSet.V1"; if (FULL_LOG === true) { logger.write(MODULE_NAME, "[INFO] start -> getContextVariables -> reportKey = " + reportKey); } statusReport = statusDependencies.statusReports.get(reportKey); @@ -888,7 +888,7 @@ try { - let reportKey = "AAMasters" + "-" + "Candles-Volumes" + "-" + "Multi-Period-Market" + "-" + "dataSet.V1"; + let reportKey = "Masters" + "-" + "Candles-Volumes" + "-" + "Multi-Period-Market" + "-" + "dataSet.V1"; let thisReport = statusDependencies.statusReports.get(reportKey); thisReport.file.lastExecution = bot.processDatetime; diff --git a/this.bot.config.json b/this.bot.config.json index d21ed687e..b1cc979c9 100644 --- a/this.bot.config.json +++ b/this.bot.config.json @@ -7,7 +7,7 @@ "minor": 0, "patch": 0 }, - "dataMine": "AAMasters", + "dataMine": "Masters", "profilePicture": "Candles Volumes.png", "dataSetVersion": "dataSet.V1", "processes": [ @@ -50,7 +50,7 @@ ], "statusDependencies": [ { - "dataMine": "AAMasters", + "dataMine": "Masters", "bot": "Exchange-Raw-Data", "botVersion": { "major": 1, @@ -60,7 +60,7 @@ "dataSetVersion": "dataSet.V1" }, { - "dataMine": "AAMasters", + "dataMine": "Masters", "bot": "Exchange-Raw-Data", "botVersion": { "major": 1, @@ -72,7 +72,7 @@ "waitUntilNextUpdate": true }, { - "dataMine": "AAMasters", + "dataMine": "Masters", "bot": "Candles-Volumes", "botVersion": { "major": 1, @@ -122,7 +122,7 @@ ], "statusDependencies": [ { - "dataMine": "AAMasters", + "dataMine": "Masters", "bot": "Exchange-Raw-Data", "botVersion": { "major": 1, @@ -132,7 +132,7 @@ "dataSetVersion": "dataSet.V1" }, { - "dataMine": "AAMasters", + "dataMine": "Masters", "bot": "Exchange-Raw-Data", "botVersion": { "major": 1, @@ -144,7 +144,7 @@ "waitUntilNextUpdate": true }, { - "dataMine": "AAMasters", + "dataMine": "Masters", "bot": "Candles-Volumes", "botVersion": { "major": 1, @@ -168,17 +168,17 @@ "codeName": "Multi-Period-Market", "type": "Market Files", "validPeriods": [ "24-hs", "12-hs", "08-hs", "06-hs", "04-hs", "03-hs", "02-hs", "01-hs" ], - "filePath": "AAMasters/Candles-Volumes.1.0/AACloud.1.1/@Exchange/dataSet.V1/Output/Candles/Multi-Period-Market/@Period", + "filePath": "Masters/Candles-Volumes.1.0/AACloud.1.1/@Exchange/dataSet.V1/Output/Candles/Multi-Period-Market/@Period", "fileName": "@AssetA_@AssetB.json" }, { "codeName": "Multi-Period-Daily", "type": "Daily Files", "validPeriods": [ "45-min", "40-min", "30-min", "20-min", "15-min", "10-min", "05-min", "04-min", "03-min", "02-min", "01-min" ], - "filePath": "AAMasters/Candles-Volumes.1.0/AACloud.1.1/@Exchange/dataSet.V1/Output/Candles/Multi-Period-Daily/@Period/@Year/@Month/@Day", + "filePath": "Masters/Candles-Volumes.1.0/AACloud.1.1/@Exchange/dataSet.V1/Output/Candles/Multi-Period-Daily/@Period/@Year/@Month/@Day", "fileName": "@AssetA_@AssetB.json", "dataRange": { - "filePath": "AAMasters/Candles-Volumes.1.0/AACloud.1.1/@Exchange/dataSet.V1/Output/Candles/Multi-Period-Daily", + "filePath": "Masters/Candles-Volumes.1.0/AACloud.1.1/@Exchange/dataSet.V1/Output/Candles/Multi-Period-Daily", "fileName": "Data.Range.@AssetA_@AssetB.json" } } @@ -192,7 +192,7 @@ } ], "plotter": { - "dataMine": "AAMasters", + "dataMine": "Masters", "codeName": "PlottersCandlesVolumes", "moduleName": "Candles" } @@ -208,17 +208,17 @@ "codeName": "Multi-Period-Market", "type": "Market Files", "validPeriods": [ "24-hs", "12-hs", "08-hs", "06-hs", "04-hs", "03-hs", "02-hs", "01-hs" ], - "filePath": "AAMasters/Candles-Volumes.1.0/AACloud.1.1/@Exchange/dataSet.V1/Output/Volumes/Multi-Period-Market/@Period", + "filePath": "Masters/Candles-Volumes.1.0/AACloud.1.1/@Exchange/dataSet.V1/Output/Volumes/Multi-Period-Market/@Period", "fileName": "@AssetA_@AssetB.json" }, { "codeName": "Multi-Period-Daily", "type": "Daily Files", "validPeriods": [ "45-min", "40-min", "30-min", "20-min", "15-min", "10-min", "05-min", "04-min", "03-min", "02-min", "01-min" ], - "filePath": "AAMasters/Candles-Volumes.1.0/AACloud.1.1/@Exchange/dataSet.V1/Output/Volumes/Multi-Period-Daily/@Period/@Year/@Month/@Day", + "filePath": "Masters/Candles-Volumes.1.0/AACloud.1.1/@Exchange/dataSet.V1/Output/Volumes/Multi-Period-Daily/@Period/@Year/@Month/@Day", "fileName": "@AssetA_@AssetB.json", "dataRange": { - "filePath": "AAMasters/Candles-Volumes.1.0/AACloud.1.1/@Exchange/dataSet.V1/Output/Volumes/Multi-Period-Daily", + "filePath": "Masters/Candles-Volumes.1.0/AACloud.1.1/@Exchange/dataSet.V1/Output/Volumes/Multi-Period-Daily", "fileName": "Data.Range.@AssetA_@AssetB.json" } } @@ -232,7 +232,7 @@ } ], "plotter": { - "dataMine": "AAMasters", + "dataMine": "Masters", "codeName": "PlottersCandlesVolumes", "moduleName": "Volumes" }