From 2225a043d1e1f6b71a0135be0e6c38c2a6b99d33 Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Wed, 7 Mar 2018 19:08:16 +0100 Subject: [PATCH] .createTextFile fixed across the solution --- .vs/AACloudPlatform/v15/.suo | Bin 73728 -> 73728 bytes AACloudPlatform.njsproj | 1 - Context.js | 37 +++-- Markets.js | 252 ----------------------------------- 4 files changed, 29 insertions(+), 261 deletions(-) delete mode 100644 Markets.js diff --git a/.vs/AACloudPlatform/v15/.suo b/.vs/AACloudPlatform/v15/.suo index 4ab0d24e111116e7f4954dd887a823da0eb2587b..9cf92d21d4ad428d47c2ce1971177ac0e57d170d 100644 GIT binary patch delta 1955 zcmcIlYfKzf6rOu`7T5=5*|ikQYoRMEWwFb%<<%}NR;<{#rXnUyg{HREG|JnirS7!a zm>@Llp2DV&6dWiaX$-KpcB^UX)R_3k2h}E8QUi$?TZ70C_<;?s=PrYiVt*0uFi^6_&Vjs#URL%peUBEWm_nNiYb%|ll!x^5Ifw9RM_EV&yN-BHCl)gQ4i^X6$1$gzsdS~Q{Y)|Rl69g~Dv zx6F`#nu*1`?rG$0RIZ?MwJ29o_->(vwY<KW@1gR6 z2>DP%povfzt&d}C>wY6}ayOEr_qBo6Ayf2T+yGIL4ky~JhDPDA@MhQ+*0o_B8d(+W z>qx;b*$JmR>~Ohb4Je%wbDfqbxV$cqd@itg6X62b`Xny_v)2hTU;@Rb_|7OGbxEL{ zQGDHwgfi?uCthWU?Lr~m`Bx|)&xKNN2F!Gs41@St@Dsrx$WVK|9^U$~ABKDKq2kVE zSrWyzv{`e@?f1Hv` z0Qm-4ikD+B2<82xyvT`{{2qnc^B1A_p5kva5`Cmy$;PK|f%^MiIC0&L;b#4kh8UUq z(%$G*7R?2{9^>zgBvnkhB55Fd%)*jC&7$Fle7uWX(a1MMpV!4)pG)G(`hKbT z|LP03+S6h9vvP2`(^&gxljc#?j)Kbm`QQVQL=w1p?u`|-_utf#m!RhE_Beht1;Fia1IBLu(FlLDfx{uX~epzSX9rDgCVwOH7S_hZ)M$%kPl%_%ygS^jul}*L?EyS9{%-MT(-D<|P!?MB06MXV@CNIbaUR>a%wL6kv*tg8wm{=s(Z1|)Z3CNOpE((w zLx{H!2N6~9iQ$l!9x+^cdm)o6u_3GkeW*m_8W_;ao(jpGh0{$4E&$(~3&8DDXmyB{ z2rdARMWYQ1k&2uPz~fucuG2X8`QT!30YZ-UC_z6L@uC*b<63cr_(;T{4Y5K?K8<#h z#(91f{48xvd;ufb2>!({AxaTd2(am{=KmesZ+HU1H|1zT zUXM7b#ZIGjYdo;BhVr_UvxL$3RLZRB6GUB2y;-xm!#Jl0=Cb~bXhwFAvOm^F(17(0 zk^i{^Oxg>(tm#;th}Aiv>g`y=c(w6iHM$sB$WN1)b=?Gk>P8E*Y@8-)ffR7aRDTB3 z{B2oc@sy~RQcrmyD|~K}Flz~}xm{9sQ@A}}$Ld~fBC3UW|DaaNM?mZF&X&V?eAo7kWLG$k)E(mt6ou%Vst_ zT})Jk8X2C%I1CzvYp{O&T~K~}miam?1Y)~PP^V_Ww$5&F`TWpx;R^J&Rkx2sk!U#4 z!4uW6<(>&fKfM6f^Z9VMGg&=N;r`Gb`2Ct0>Tl%&TpT8g%Ytj%1;c(5d)>b?=D!I; zQJ>2bDbPAr$&>*_B*u0RAvM}NPMP^N4G%k#Y&h2C0p(&GiyN|2Grx)9!Ee04TsQrA zQf3^?F&q@>zl;8rA}xvjjrf0v4zw`?`bM1KaII!7qcx(jXR!tTPz%D!_qKhuOysOc zl{f{#c{MZ#6=wCf-Y3xCb_`Co`Ip+V>-^_1Ixc~)BZ?LKMKU-?iI2q3hXp{Z$8*Mi z|IY5vTCHO-U?2MyNXKEg+m+093w51$9GeQKzQ|z7WmDRzbqzYtmx*5c!QFUY5dY5$PDryWievu3z>cFP5Ss34EiF80Z)JkuD!>h RVsB*#@{T0jp*xk(zX3Fmz(fE5 diff --git a/AACloudPlatform.njsproj b/AACloudPlatform.njsproj index b7d3265dd..0099752c7 100644 --- a/AACloudPlatform.njsproj +++ b/AACloudPlatform.njsproj @@ -36,7 +36,6 @@ Code - diff --git a/Context.js b/Context.js index fad53504c..30e64cadd 100644 --- a/Context.js +++ b/Context.js @@ -356,13 +356,20 @@ cloudStorage.createTextFile(filePath, fileName, fileContent + '\n', onFileCreated); - function onFileCreated() { + function onFileCreated(err) { + + if (err.result !== global.DEFAULT_OK_RESPONSE.result) { + logger.write("[ERROR] saveThemAll -> writeExucutionHistory -> onFolderCreated -> onFileCreated -> err = " + err.message); + callBack(err); + return; + } if (LOG_INFO === true) { - logger.write("[INFO] saveThemAll -> writeExecutionContext -> onFolderCreated -> Content written = " + fileContent); + logger.write("[INFO] saveThemAll -> writeExucutionHistory -> onFolderCreated -> onFileCreated -> Content written = " + fileContent); } writeExucutionHistory(callBack); + return; } } catch (err) { @@ -370,7 +377,6 @@ callBackFunction(global.DEFAULT_FAIL_RESPONSE); } } - } catch (err) { logger.write("[ERROR] saveThemAll -> writeExecutionContext -> err = " + err.message); @@ -415,9 +421,20 @@ cloudStorage.createTextFile(filePath, fileName, fileContent + '\n', onFileCreated); - function onFileCreated() { + function onFileCreated(err) { + + if (err.result !== global.DEFAULT_OK_RESPONSE.result) { + logger.write("[ERROR] saveThemAll -> writeExucutionHistory -> onFolderCreated -> onFileCreated -> err = " + err.message); + callBack(err); + return; + } + + if (LOG_INFO === true) { + logger.write("[INFO] saveThemAll -> writeExucutionHistory -> onFolderCreated -> onFileCreated -> Content written = " + fileContent); + } writeStatusReport(callBack); + return; } } catch (err) { @@ -425,7 +442,6 @@ callBackFunction(global.DEFAULT_FAIL_RESPONSE); } } - } catch (err) { logger.write("[ERROR] saveThemAll -> writeExucutionHistory -> err = " + err.message); @@ -462,10 +478,16 @@ cloudStorage.createTextFile(filePath, fileName, fileContent + '\n', onFileCreated); - function onFileCreated() { + function onFileCreated(err) { + + if (err.result !== global.DEFAULT_OK_RESPONSE.result) { + logger.write("[ERROR] saveThemAll -> writeStatusReport -> onFolderCreated -> onFileCreated -> err = " + err.message); + callBack(err); + return; + } if (LOG_INFO === true) { - logger.write("[INFO] saveThemAll -> writeStatusReport -> onFolderCreated -> Content written = " + fileContent); + logger.write("[INFO] saveThemAll -> writeStatusReport -> onFolderCreated -> onFileCreated -> Content written = " + fileContent); } callBack(global.DEFAULT_OK_RESPONSE); @@ -477,7 +499,6 @@ callBackFunction(global.DEFAULT_FAIL_RESPONSE); } } - } catch (err) { logger.write("[ERROR] saveThemAll -> writeStatusReport -> err = " + err.message); diff --git a/Markets.js b/Markets.js deleted file mode 100644 index 854e575ef..000000000 --- a/Markets.js +++ /dev/null @@ -1,252 +0,0 @@ -/* This business logic module is responsible for Markets and Assets. */ - - -exports.newMarkets = function newMarkets(BOT) { - - let bot = BOT; - const ROOT_DIR = '../'; - - const MODULE_NAME = "Markets"; - - const FOLDER_PATHS = 'data'; - const MARKETS_FOLDER_NAME = "other-files"; - - const DEBUG_MODULE = require('./Debug Log'); - const logger = DEBUG_MODULE.newDebugLog(); - logger.fileName = MODULE_NAME; - logger.bot = bot; - - const EXCHANGE_ID = 1; - const fileName = "Markets_" + EXCHANGE_ID + ".json"; - - const DATA_OWNER_BOT_NAME = "Legacy"; - - const markets = { - DISABLED: 0, - ENABLED: 1, - getMarketsByExchange: getMarketsByExchange, - getExistingOrNewMarketId: getExistingOrNewMarketId, - createNewAsset: createNewAsset, - createNewMarket: createNewMarket, - disableMarket: disableMarket, - initialize: initialize - }; - - //const dataLayer = DATA_LAYER_MODULE.newDataLayer(); - - let marketsArray; - - const AZURE_FILE_STORAGE = require('./Azure File Storage'); - let azureFileStorage = AZURE_FILE_STORAGE.newAzureFileStorage(bot); - - return markets; - - - function initialize(callBackFunction) { - - azureFileStorage.initialize(DATA_OWNER_BOT_NAME); - - try { - - azureFileStorage.getTextFile(MARKETS_FOLDER_NAME, fileName, onFileRead); - - function onFileRead(text) { - - try { - - var fileString = text; - let cleanString = fileString; - - /* Dont know why but sometimes files comes with a first characater that is not supposed to be there and you can not see it at the file opened with notepad */ - - if (fileString[0] !== "[") { - - cleanString = ''; - - for (let i = 1; i < fileString.length; i++) { - cleanString = cleanString + fileString[i]; - } - } - - marketsArray = JSON.parse(cleanString); - callBackFunction(); - - } - catch (err) { - const logText = "[ERROR] initialize - onFileRead ' ERROR : " + err.message + " File: " + fileName; - console.log(logText); - logger.write(logText); - } - - } - } - catch (err) { - const logText = "[ERROR] initialize - ' ERROR : " + err.message + " File Not Found: " + fileName; - console.log(logText); - logger.write(logText); - } - - - } - - - - function getMarketsByExchange(exchangeId, callBackFunction) { - - try { - - // TODO: Currently the exchange Id is ignored as the class is still working with only one exchange. We must fix this. - - callBackFunction(JSON.stringify(marketsArray)); - - - } catch (err) { - - const logText = "[ERROR] getMarketsByExchange - ' ERROR : " + err.message; - console.log(logText); - logger.write(logText); - - } - - } - - - function getExistingOrNewMarketId(marketName, market, exchangeId, callBackFunction) { - - // TODO: At this function is missing the following: If a market does not exists, it must be greated, and Id generated and returned. We automatically discover new markets when this function is called with a market that didn-t previuously existed. - - try { - - for (let i = 0; i < marketsArray.length; i++) { - - if (marketsArray[i][1] + "_" + marketsArray[i][2] === marketName) { - - callBackFunction(marketName, market, marketsArray[i][0]); - return; - - } - } - - - } catch (err) { - - const logText = "[ERROR] getExistingOrNewMarketId - ' ERROR : " + err.message + " marketId = " + marketId + " idAssetA = " + idAssetA + " idAssetB = " + idAssetB; - console.log(logText); - logger.write(logText); - - } - - } - - - function createNewAsset(assetCode, callBackFunction) { - - // TODO: Upgrade this function in order to update the file containing all assets, not the database that will be deprecated. - - try { - - dataLayer.newAsset(assetCode, onIdReady); - - function onIdReady(resultSet) { - - try { - - callBackFunction(resultSet); - resultSet = []; - - } catch (err) { - - const logText = "[ERROR] createNewAsset - onIdReady ' ERROR : " + err.message; - console.log(logText); - logger.write(logText); - - } - } - - } catch (err) { - - const logText = "[ERROR] createNewAsset - ' ERROR : " + err.message; - console.log(logText); - logger.write(logText); - - } - - } - - - - function createNewMarket(exchangeId, idAssetA, idAssetB, callBackFunction) { - - // TODO: Upgrade this function in order to update the file containing all markets, not the database that will be deprecated. - - try { - - dataLayer.newMarket(exchangeId, idAssetA, idAssetB, onIdReady); - - function onIdReady(resultSet) { - - try { - - callBackFunction(resultSet); - - } catch (err) { - - const logText = "[ERROR] createNewMarket - onIdReady ' ERROR : " + err.message; - console.log(logText); - logger.write(logText); - } - } - - } catch (err) { - - const logText = "[ERROR] createNewMarket - ' ERROR : " + err.message; - console.log(logText); - logger.write(logText); - } - } - - - function disableMarket(exchangeId, marketId, callBackFunction) { - - // This function puts the requested market in a DISABLED status. - - // TODO: Currently the exchangeId is ignored. - - try { - - for (let i = 0; i < marketsArray.length; i++) { - - if (marketsArray[i][0] === marketId) { - - marketsArray[i][3] = markets.DISABLED; - break; - - } - - } - - azureFileStorage.createTextFile(MARKETS_FOLDER_NAME, fileName, JSON.stringify(marketsArray), onFileReplaced); - - function onFileReplaced() { - - try { - - callBackFunction(); - - } catch (err) { - - const logText = "[ERROR] disableMarket - onFileReplaced ' ERROR : " + err.message; - console.log(logText); - logger.write(logText); - } - } - - } catch (err) { - - const logText = "[ERROR] disableMarket - ' ERROR : " + err.message; - console.log(logText); - logger.write(logText); - } - } - -}; \ No newline at end of file