From bcf5aeb82892a63c83edaa854f683c2af02efb97 Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Thu, 26 Dec 2019 10:46:03 +0100 Subject: [PATCH] Data Mine Refactoring --- Commons.js | 4 ++-- Single-Period-Daily/User.Bot.js | 18 +++++++++--------- this.bot.config.json | 12 ++++++------ 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/Commons.js b/Commons.js index 2fc5d52f5..10d791988 100644 --- a/Commons.js +++ b/Commons.js @@ -26,7 +26,7 @@ function initializeBruceStorage() { - bruceStorage.initialize(bot.devTeam, onBruceInizialized); + bruceStorage.initialize(bot.dataMine, onBruceInizialized); function onBruceInizialized(err) { @@ -43,7 +43,7 @@ function initializeCharlyStorage() { - charlyStorage.initialize(bot.devTeam, onCharlyInizialized); + charlyStorage.initialize(bot.dataMine, onCharlyInizialized); function onCharlyInizialized(err) { diff --git a/Single-Period-Daily/User.Bot.js b/Single-Period-Daily/User.Bot.js index c94fbcbe8..f48650f79 100644 --- a/Single-Period-Daily/User.Bot.js +++ b/Single-Period-Daily/User.Bot.js @@ -324,7 +324,7 @@ let filePath = bot.filePathRoot + "/Output/" + CANDLES_FOLDER_NAME + '/' + CANDLES_ONE_MIN + '/' + dateForPath; filePath += '/' + fileName - fileStorage.getTextFile(bot.devTeam, filePath, onFileReceived); + fileStorage.getTextFile(bot.dataMine, filePath, onFileReceived); logger.write(MODULE_NAME, "[INFO] start -> findPreviousContent -> getCandles -> reading file at dateForPath = " + dateForPath); @@ -375,7 +375,7 @@ let filePath = bot.filePathRoot + "/Output/" + VOLUMES_FOLDER_NAME + '/' + VOLUMES_ONE_MIN + '/' + dateForPath; filePath += '/' + fileName - fileStorage.getTextFile(bot.devTeam, filePath, onFileReceived); + fileStorage.getTextFile(bot.dataMine, filePath, onFileReceived); logger.write(MODULE_NAME, "[INFO] start -> findPreviousContent -> getVolumes -> reading file at dateForPath = " + dateForPath); @@ -472,11 +472,11 @@ let dateForPath = date.getUTCFullYear() + '/' + utilities.pad(date.getUTCMonth() + 1, 2) + '/' + utilities.pad(date.getUTCDate(), 2) + '/' + utilities.pad(date.getUTCHours(), 2) + '/' + utilities.pad(date.getUTCMinutes(), 2); let fileName = market.assetA + '_' + market.assetB + ".json" - let filePathRoot = bot.devTeam + "/" + "AACharly" + "." + bot.version.major + "." + bot.version.minor + "/" + global.CLONE_EXECUTOR.codeName + "." + global.CLONE_EXECUTOR.version + "/" + global.EXCHANGE_NAME + "/" + bot.dataSetVersion; + let filePathRoot = bot.dataMine + "/" + "AACharly" + "." + bot.version.major + "." + bot.version.minor + "/" + global.CLONE_EXECUTOR.codeName + "." + global.CLONE_EXECUTOR.version + "/" + global.EXCHANGE_NAME + "/" + bot.dataSetVersion; let filePath = filePathRoot + "/Output/" + TRADES_FOLDER_NAME + '/' + dateForPath; filePath += '/' + fileName - fileStorage.getTextFile(bot.devTeam, filePath, onFileReceived); + fileStorage.getTextFile(bot.dataMine, filePath, onFileReceived); logger.write(MODULE_NAME, "[INFO] start -> findPreviousContent -> loopStart -> reading file at dateForPath = " + dateForPath); @@ -726,11 +726,11 @@ let dateForPath = date.getUTCFullYear() + '/' + utilities.pad(date.getUTCMonth() + 1, 2) + '/' + utilities.pad(date.getUTCDate(), 2) + '/' + utilities.pad(date.getUTCHours(), 2) + '/' + utilities.pad(date.getUTCMinutes(), 2); let fileName = market.assetA + '_' + market.assetB + ".json" - let filePathRoot = bot.devTeam + "/" + "AACharly" + "." + bot.version.major + "." + bot.version.minor + "/" + global.CLONE_EXECUTOR.codeName + "." + global.CLONE_EXECUTOR.version + "/" + global.EXCHANGE_NAME + "/" + bot.dataSetVersion; + let filePathRoot = bot.dataMine + "/" + "AACharly" + "." + bot.version.major + "." + bot.version.minor + "/" + global.CLONE_EXECUTOR.codeName + "." + global.CLONE_EXECUTOR.version + "/" + global.EXCHANGE_NAME + "/" + bot.dataSetVersion; let filePath = filePathRoot + "/Output/" + TRADES_FOLDER_NAME + '/' + dateForPath; filePath += '/' + fileName - fileStorage.getTextFile(bot.devTeam, filePath, onFileReceived); + fileStorage.getTextFile(bot.dataMine, filePath, onFileReceived); logger.write(MODULE_NAME, "[INFO] start -> buildCandlesAndVolumes -> nextFile -> nextDate -> readTrades -> reading file at dateForPath = " + dateForPath); @@ -883,7 +883,7 @@ let filePath = bot.filePathRoot + "/Output/" + CANDLES_FOLDER_NAME + '/' + CANDLES_ONE_MIN + '/' + dateForPath; filePath += '/' + fileName - fileStorage.createTextFile(bot.devTeam, filePath, fileContent + '\n', onFileCreated); + fileStorage.createTextFile(bot.dataMine, filePath, fileContent + '\n', onFileCreated); logger.write(MODULE_NAME, "[INFO] start -> writeFiles -> writeCandles -> writing file at dateForPath = " + dateForPath); @@ -957,7 +957,7 @@ let filePath = bot.filePathRoot + "/Output/" + VOLUMES_FOLDER_NAME + '/' + VOLUMES_ONE_MIN + '/' + dateForPath; filePath += '/' + fileName - fileStorage.createTextFile(bot.devTeam, filePath, fileContent + '\n', onFileCreated); + fileStorage.createTextFile(bot.dataMine, filePath, fileContent + '\n', onFileCreated); logger.write(MODULE_NAME, "[INFO] start -> writeFiles -> writeVolumes -> writing file at dateForPath = " + dateForPath); @@ -1058,7 +1058,7 @@ return; } - let key = bot.devTeam + "-" + bot.codeName + "-" + bot.process + "-" + bot.dataSetVersion + "-" + year + "-" + month; + let key = bot.dataMine + "-" + bot.codeName + "-" + bot.process + "-" + bot.dataSetVersion + "-" + year + "-" + month; let statusReport = statusDependencies.statusReports.get(key); statusReport.file = { diff --git a/this.bot.config.json b/this.bot.config.json index f425dcf14..708d76f8b 100644 --- a/this.bot.config.json +++ b/this.bot.config.json @@ -7,7 +7,7 @@ "minor": 0, "patch": 0 }, - "devTeam": "AAMasters", + "dataMine": "AAMasters", "profilePicture": "Bruce.png", "dataSetVersion": "dataSet.V1", "processes": [ @@ -40,7 +40,7 @@ "comaWaitTime": 86400000, "statusDependencies": [ { - "devTeam": "AAMasters", + "dataMine": "AAMasters", "bot": "AACharly", "botVersion": { "major": 1, @@ -50,7 +50,7 @@ "dataSetVersion": "dataSet.V1" }, { - "devTeam": "AAMasters", + "dataMine": "AAMasters", "bot": "AACharly", "botVersion": { "major": 1, @@ -62,7 +62,7 @@ "waitUntilNextUpdate": true }, { - "devTeam": "AAMasters", + "dataMine": "AAMasters", "bot": "AABruce", "botVersion": { "major": 1, @@ -99,7 +99,7 @@ } ], "plotter": { - "devTeam": "AAMasters", + "dataMine": "AAMasters", "codeName": "PlottersCandlesVolumes", "moduleName": "Candles" } @@ -127,7 +127,7 @@ } ], "plotter": { - "devTeam": "AAMasters", + "dataMine": "AAMasters", "codeName": "PlottersCandlesVolumes", "moduleName": "Volumes" }