From f84665a51551b0885772408411d5535d6ca2a0ad Mon Sep 17 00:00:00 2001
From: Luis Fernando Molina <Luis-Fernando-Molina@users.noreply.github.com>
Date: Tue, 20 Mar 2018 13:05:57 +0100
Subject: [PATCH] Constructor upgraded to Alpha

---
 .vs/AABruce-Indicator-Bot/v15/.suo        | Bin 23040 -> 23040 bytes
 One-Min-Daily-Candles-Volumes/Interval.js |  56 +++++++++++-----------
 2 files changed, 27 insertions(+), 29 deletions(-)

diff --git a/.vs/AABruce-Indicator-Bot/v15/.suo b/.vs/AABruce-Indicator-Bot/v15/.suo
index 8432b339766f68d2e091481c21bfc73680c7e222..1234d51b64859dbf57552d8863c3ac1ed531ee86 100644
GIT binary patch
delta 867
zcmZ`%&ubG=5YD{pw(It7lWfwY)&599LBvBX8VyP<Zoon+SulF@e`w(yJjR=co-#L2
zf*w3dUQS*-s3`Pc1pgD?B?pZ&+rG_1aN&cU@0%HBzIlT&494*OP(X;=V#`1J@ajvV
zkHs(8*eDbVmk8^GCgCDsi|}VQn{DbB-YLK`{t!*?-II@0vhWzBN3u_#j2Xh(Wi*Sm
zt4#bRg6l&1zd(?LB|<=0AS@E}PB4Md?tuu(6y+^cm`XuJ!y&Z^B@9~$eri3#*R8j*
zNFvWVuPXI0S$Txz`b}9QVbv7}o1T7N?*b;p8))vPlE>gu{<67M+>3xCUN~n>+{bU?
zI;!f)aIYg*NaH1PUF}Wqv)DmZNhQ0+TUpVsQ{drrsVn1i+DfSIq_RZhwv&%Wrjj$7
zE~(o6fc?r#O?zFJYZ@Zp{%o(6{D^`+P8(gxj#nKC_nTzE>Pr}P9>)GPQtJBf>9{!B
zO+-`xig`8L2>Akhl4X}P;Y3<fZKgK2dJtuo;%O|6s?>|JhzH48LoD!%`NzYbf$JNp
z`zOP=lbwh?&CCCDqI(lrp|mwOb#TRl0H?Q4GefQYXAhKI<_F65&s#@l*1Jw?)Bb+`
YU>f~52m2y$9o6c=*J_3H?KgMzFKJCIdH?_b

delta 892
zcmZuvL2DCH5Z?DT+ph8LHffSgZPGSE3jrl0LeW|lLla8Tz%I0ZqDSEgdRr01gQv_t
z=r54I+`K3&DD==AJoTi%!97^8#+fC%eWD8=Z{IiH%<jxL(S$`4_HM*k9d7dtD|&YI
zYfnApKiFEsFpPD?Dq;iCLaZTv&t|ixdRaJQ%t~{<T^xSLoP|RsZepAxP%;D7*o0)U
z+Abh*g@lFY0%8$iBW@sy2uh-&s%uZ#SRB~&wY-89p)lvlj8usbZ0rpMm8fcJtBaR?
zc;P*Ej3s<+X)#E=P`F4mbyE7FpdX|k%gS3@c;Rrl9l#fU7o;0N%zKcyp{QfT)1)Am
z=E3^`3|t?gY77Ij2eKB56%<mlSzSnWLiohHAeT{$qU7N@#1;Q^C1wy0{Bdb0XfPE$
zCt5G4=cOmiVKt;ndMJ5xWH0MPzlGY>H|*pdKWU2MJ~l<QxB(aK_fTw4U1k^zkv_+L
zqD^iL=~TTtMYH^R9;4$UViQIk38h9&edxThoHX|zduVoL#C4zO84XqFq;x`&b(Ser
zvK?S&w@^n`W^^`Hi`K$`%iS|Ui$e3vC5aa}sTJgN&dU0c?P!Eb{PX{gt{e&)-QT;A
z+cFijth6k7<!Gw_KPw|a1Z`{{kPp7v<k~f{^Y*lVz-`@nCHFp8V7DWzbgF99nV5e7
DhEW`z

diff --git a/One-Min-Daily-Candles-Volumes/Interval.js b/One-Min-Daily-Candles-Volumes/Interval.js
index 598da0690..26037f4fa 100644
--- a/One-Min-Daily-Candles-Volumes/Interval.js
+++ b/One-Min-Daily-Candles-Volumes/Interval.js
@@ -1,16 +1,17 @@
-exports.newInterval = function newInterval(BOT, UTILITIES, AZURE_FILE_STORAGE, DEBUG_MODULE, MARKETS_MODULE, POLONIEX_CLIENT_MODULE) {
+exports.newUserBot = function newUserBot(BOT, COMMONS, UTILITIES, DEBUG_MODULE, FILE_STORAGE, STATUS_REPORT, POLONIEX_CLIENT_MODULE) {
+
+    const FULL_LOG = true;
+    const LOG_FILE_CONTENT = false;
 
     let bot = BOT;
-    const ROOT_DIR = '../';
+
     const GMT_SECONDS = ':00.000 GMT+0000';
     const GMT_MILI_SECONDS = '.000 GMT+0000';
     const ONE_DAY_IN_MILISECONDS = 24 * 60 * 60 * 1000;
 
-    const MODULE_NAME = "Interval";
-    const LOG_INFO = true;
+    const MODULE_NAME = "User Bot";
 
     const EXCHANGE_NAME = "Poloniex";
-    const EXCHANGE_ID = 1;
 
     const TRADES_FOLDER_NAME = "Trades";
 
@@ -20,29 +21,26 @@
     const VOLUMES_FOLDER_NAME = "Volumes";
     const VOLUMES_ONE_MIN = "One-Min";
 
-    const GO_RANDOM = false;
-    const FORCE_MARKET = 2;     // This allows to debug the execution of an specific market. Not intended for production. 
-
     const logger = DEBUG_MODULE.newDebugLog();
     logger.fileName = MODULE_NAME;
     logger.bot = bot;
 
-    interval = {
+    thisObject = {
         initialize: initialize,
         start: start
     };
 
-    let markets;
-
-    let charlyAzureFileStorage = AZURE_FILE_STORAGE.newAzureFileStorage(bot);
-    let bruceAzureFileStorage = AZURE_FILE_STORAGE.newAzureFileStorage(bot);
+    let charlyFileStorage = AZURE_FILE_STORAGE.newFileStorage(bot);
+    let bruceFileStorage = AZURE_FILE_STORAGE.newFileStorage(bot);
 
     let utilities = UTILITIES.newUtilities(bot);
 
     let year;
     let month;
 
-    return interval;
+    let dependencies;
+
+    return thisObject;
 
     function initialize(yearAssigend, monthAssigned, callBackFunction) {
 
@@ -59,8 +57,8 @@
             console.log(logText);
             logger.write(logText);
 
-            charlyAzureFileStorage.initialize("Charly");
-            bruceAzureFileStorage.initialize("Bruce");
+            charlyFileStorage.initialize("Charly");
+            bruceFileStorage.initialize("Bruce");
 
             markets = MARKETS_MODULE.newMarkets(bot);
             markets.initialize(callBackFunction);
@@ -156,7 +154,7 @@ Read the trades from Charly's Output and pack them into daily files with candles
 
                         reportFilePath = EXCHANGE_NAME + "/Processes/" + "Poloniex-Historic-Trades";
 
-                        charlyAzureFileStorage.getTextFile(reportFilePath, fileName, onStatusReportReceived, true);
+                        charlyFileStorage.getTextFile(reportFilePath, fileName, onStatusReportReceived, true);
 
                         function onStatusReportReceived(text) {
 
@@ -202,7 +200,7 @@ Read the trades from Charly's Output and pack them into daily files with candles
 
                         reportFilePath = EXCHANGE_NAME + "/Processes/" + "Poloniex-Hole-Fixing" + "/" + year + "/" + month;
 
-                        charlyAzureFileStorage.getTextFile(reportFilePath, fileName, onStatusReportReceived, true);
+                        charlyFileStorage.getTextFile(reportFilePath, fileName, onStatusReportReceived, true);
 
                         function onStatusReportReceived(text) {
 
@@ -262,7 +260,7 @@ Read the trades from Charly's Output and pack them into daily files with candles
 
                         reportFilePath = EXCHANGE_NAME + "/Processes/" + "One-Min-Daily-Candles-Volumes" + "/" + year + "/" + month;
 
-                        bruceAzureFileStorage.getTextFile(reportFilePath, fileName, onStatusReportReceived, true);
+                        bruceFileStorage.getTextFile(reportFilePath, fileName, onStatusReportReceived, true);
 
                         function onStatusReportReceived(text) {
 
@@ -337,7 +335,7 @@ Read the trades from Charly's Output and pack them into daily files with candles
 
                         let filePath = EXCHANGE_NAME + "/Output/" + CANDLES_FOLDER_NAME + '/' + CANDLES_ONE_MIN + '/' + dateForPath;
 
-                        bruceAzureFileStorage.getTextFile(filePath, fileName, onFileReceived, true);
+                        bruceFileStorage.getTextFile(filePath, fileName, onFileReceived, true);
 
                         function onFileReceived(text) {
 
@@ -369,7 +367,7 @@ Read the trades from Charly's Output and pack them into daily files with candles
 
                         let filePath = EXCHANGE_NAME + "/Output/" + CANDLES_FOLDER_NAME + '/' + CANDLES_ONE_MIN + '/' + dateForPath;
 
-                        bruceAzureFileStorage.getTextFile(filePath, fileName, onFileReceived, true);
+                        bruceFileStorage.getTextFile(filePath, fileName, onFileReceived, true);
 
                         function onFileReceived(text) {
 
@@ -453,7 +451,7 @@ Read the trades from Charly's Output and pack them into daily files with candles
                             let fileName = market.assetA + '_' + market.assetB + ".json"
                             let filePath = EXCHANGE_NAME + "/Output/" + TRADES_FOLDER_NAME + '/' + dateForPath;
 
-                            charlyAzureFileStorage.getTextFile(filePath, fileName, onFileReceived, true);
+                            charlyFileStorage.getTextFile(filePath, fileName, onFileReceived, true);
 
                             function onFileReceived(text) {
 
@@ -648,7 +646,7 @@ Read the trades from Charly's Output and pack them into daily files with candles
                             let fileName = market.assetA + '_' + market.assetB + ".json"
                             let filePath = EXCHANGE_NAME + "/Output/" + TRADES_FOLDER_NAME + '/' + dateForPath;
 
-                            charlyAzureFileStorage.getTextFile(filePath, fileName, onFileReceived, true);
+                            charlyFileStorage.getTextFile(filePath, fileName, onFileReceived, true);
 
                             function onFileReceived(text) {
 
@@ -791,11 +789,11 @@ Read the trades from Charly's Output and pack them into daily files with candles
 
                         let filePath = EXCHANGE_NAME + "/Output/" + CANDLES_FOLDER_NAME + '/' + CANDLES_ONE_MIN + '/' + dateForPath;
 
-                        utilities.createFolderIfNeeded(filePath, bruceAzureFileStorage, onFolderCreated);
+                        utilities.createFolderIfNeeded(filePath, bruceFileStorage, onFolderCreated);
 
                         function onFolderCreated() {
 
-                            bruceAzureFileStorage.createTextFile(filePath, fileName, fileContent + '\n', onFileCreated);
+                            bruceFileStorage.createTextFile(filePath, fileName, fileContent + '\n', onFileCreated);
 
                             function onFileCreated() {
 
@@ -836,11 +834,11 @@ Read the trades from Charly's Output and pack them into daily files with candles
 
                         let filePath = EXCHANGE_NAME + "/Output/" + VOLUMES_FOLDER_NAME + '/' + VOLUMES_ONE_MIN + '/' + dateForPath;
 
-                        utilities.createFolderIfNeeded(filePath, bruceAzureFileStorage, onFolderCreated);
+                        utilities.createFolderIfNeeded(filePath, bruceFileStorage, onFolderCreated);
 
                         function onFolderCreated() {
 
-                            bruceAzureFileStorage.createTextFile(filePath, fileName, fileContent + '\n', onFileCreated);
+                            bruceFileStorage.createTextFile(filePath, fileName, fileContent + '\n', onFileCreated);
 
                             function onFileCreated() {
 
@@ -883,7 +881,7 @@ Read the trades from Charly's Output and pack them into daily files with candles
 
                     let reportFilePath = EXCHANGE_NAME + "/Processes/" + bot.process + "/" + year + "/" + month;
 
-                    utilities.createFolderIfNeeded(reportFilePath, bruceAzureFileStorage, onFolderCreated);
+                    utilities.createFolderIfNeeded(reportFilePath, bruceFileStorage, onFolderCreated);
 
                     function onFolderCreated() {
 
@@ -911,7 +909,7 @@ Read the trades from Charly's Output and pack them into daily files with candles
 
                             let fileContent = JSON.stringify(report); 
 
-                            bruceAzureFileStorage.createTextFile(reportFilePath, fileName, fileContent + '\n', onFileCreated);
+                            bruceFileStorage.createTextFile(reportFilePath, fileName, fileContent + '\n', onFileCreated);
 
                             function onFileCreated() {