updating

docs/scripts/floExchangeAPI.js

@@ -577,6 +577,16 @@
         });
     }
 
+    exchangeAPI.getRateHistory = function(asset, duration = null) {
+        return new Promise((resolve, reject) => {
+            fetch_api('/rate-history?asset=' + asset + (duration ? '&duration=' + duration : ""))
+                .then(result => responseParse(result)
+                    .then(result => resolve(result))
+                    .catch(error => reject(error)))
+                .catch(error => reject(error));
+        });
+    }
+
     exchangeAPI.getBalance = function(floID = null, token = null) {
         return new Promise((resolve, reject) => {
             if (!floID && !token)

src/app.js

@@ -75,6 +75,7 @@ module.exports = function App(secret, DB) {
 
     //get rates, balance and tx
     app.get('/get-rates', Request.GetRates);
+    app.get('/rate-history', Request.GetRateHistory);
     app.get('/get-balance', Request.GetBalance);
     app.get('/get-transaction', Request.GetTransaction);
 

src/coupling.js

@@ -11,7 +11,7 @@ var DB; //container for database
 
 function startCouplingForAsset(asset) {
     price.getRates(asset).then(cur_rate => {
-        cur_rate = cur_rate.toFixed(3);
+        cur_rate = cur_rate.toFixed(8);
         group.getBestPairs(asset, cur_rate)
             .then(bestPairQueue => processCoupling(bestPairQueue))
             .catch(error => console.error("initiateCoupling", error))

src/market.js

@@ -30,6 +30,17 @@ function logout(floID) {
     })
 }
 
+function getRateHistory(asset, duration) {
+    return new Promise((resolve, reject) => {
+        if (!asset || !assetList.includes(asset))
+            reject(INVALID(`Invalid asset(${asset})`));
+        else
+            coupling.price.getHistory(asset, duration)
+            .then(result => resolve(result))
+            .catch(error => reject(error))
+    })
+}
+
 function getBalance(floID, token) {
     return new Promise((resolve, reject) => {
         if (floID && !floCrypto.validateAddr(floID))
@@ -58,7 +69,7 @@ getBalance.floID_token = (floID, token) => new Promise((resolve, reject) => {
     ).then(result => resolve({
         floID,
         token,
-        balance: result[0].balance.toFixed(4)
+        balance: result[0].balance.toFixed(8)
     })).catch(error => reject(error))
 });
 
@@ -71,9 +82,9 @@ getBalance.floID = (floID) => new Promise((resolve, reject) => {
             floID,
             balance: {}
         };
-        response.balance[floGlobals.currency] = result[0][0].balance.toFixed(4);
+        response.balance[floGlobals.currency] = result[0][0].balance.toFixed(8);
         for (let row of result[1])
-            response.balance[row.asset] = row.balance.toFixed(4);
+            response.balance[row.asset] = row.balance.toFixed(8);
         resolve(response);
     }).catch(error => reject(error))
 });
@@ -88,7 +99,7 @@ getBalance.token = (token) => new Promise((resolve, reject) => {
             balance: {}
         };
         for (let row of result)
-            response.balance[row.floID] = row.balance.toFixed(4);
+            response.balance[row.floID] = row.balance.toFixed(8);
         resolve(response);
     }).catch(error => reject(error))
 });
@@ -621,6 +632,7 @@ module.exports = {
     addBuyOrder,
     addSellOrder,
     cancelOrder,
+    getRateHistory,
     getBalance,
     getAccountDetails,
     getTransactionDetails,

src/price.js

@@ -20,14 +20,14 @@ var currentRate = {}, //container for FLO price (from API or by model)
 const updateLastTime = asset => lastTime[asset] = Date.now();
 
 //store FLO price in DB every 1 hr
-function storeRate(asset, rate) {
-    DB.query("INSERT INTO PriceHistory (asset, rate) VALUE (?, ?)", [asset, rate.toFixed(3)])
+function storeHistory(asset, rate) {
+    DB.query("INSERT INTO PriceHistory (asset, rate) VALUE (?, ?)", [asset, rate.toFixed(8)])
         .then(_ => null).catch(error => console.error(error))
 }
 setInterval(() => {
     for (let asset in currentRate)
-        storeRate(asset, currentRate[asset]);
-}, REC_HISTORY_INTERVAL)
+        storeHistory(asset, currentRate[asset]);
+}, REC_HISTORY_INTERVAL);
 
 function getPastRate(asset, hrs = 24) {
     return new Promise((resolve, reject) => {
@@ -37,6 +37,45 @@ function getPastRate(asset, hrs = 24) {
     });
 }
 
+function getHistory(asset, duration) {
+    return new Promise((resolve, reject) => {
+        duration = getHistory.validateDuration(duration);
+        let statement = "SELECT " +
+            (!duration || duration.endsWith("month") || duration.endsWith("year") ? "DATE(rec_time) AS time, AVG(rate) as rate" : "rec_time AS time, rate") +
+            " FROM PriceHistory WHERE asset=?" + (duration ? " AND rec_time >= NOW() - INTERVAL " + duration : "") +
+            (!duration || duration.endsWith("month") || duration.endsWith("year") ? " GROUP BY time" : "") +
+            " ORDER BY time";
+        DB.query(statement, asset)
+            .then(result => resolve(result))
+            .catch(error => reject(error))
+    });
+}
+
+getHistory.validateDuration = duration => {
+    let n = duration.match(/\d+/g),
+        d = duration.match(/\D+/g);
+    n = n ? n[0] || 1 : 1;
+    d = d ? d[0].replace(/[-\s]/g, '') : "";
+    switch (d.toLowerCase()) {
+        case "day":
+        case "days":
+            return n + " day";
+        case "week":
+        case "weeks":
+            return n + " week";
+        case "month":
+        case "months":
+            return n + " month";
+        case "year":
+        case "years":
+            return n + " year";
+        case "alltime":
+            return null;
+        default:
+            return '1 day';
+    }
+}
+
 function loadRate(asset) {
     return new Promise((resolve, reject) => {
         if (typeof currentRate[asset] !== "undefined")
@@ -60,7 +99,7 @@ function fetchRates() {
             fetchRates.USD_INR().then(INR_rate => {
                 let FLO_INR_rate = FLO_rate * INR_rate;
                 console.debug('Rates:', FLO_rate, INR_rate, FLO_INR_rate);
-                storeRate(FLO_INR_rate);
+                storeHistory(FLO_INR_rate);
                 resolve(FLO_INR_rate);
             }).catch(error => reject(error))
         }).catch(error => reject(error))
@@ -153,6 +192,7 @@ function checkForRatedSellers(asset) {
 
 module.exports = {
     getRates,
+    getHistory,
     updateLastTime,
     noOrder(asset, buy, sell) {
         noBuyOrder[asset] = buy;

src/request.js

@@ -334,6 +334,25 @@ function GetRates(req, res) {
 
 }
 
+function GetRateHistory(req, res) {
+    if (!serving)
+        res.status(INVALID.e_code).send(INVALID_SERVER_MSG);
+    else {
+        let asset = req.query.asset,
+            duration = req.query.duration || "";
+        market.getRateHistory(asset, duration)
+            .then(result => res.send(result))
+            .catch(error => {
+                if (error instanceof INVALID)
+                    res.status(INVALID.e_code).send(error.message);
+                else {
+                    console.error(error);
+                    res.status(INTERNAL.e_code).send("Unable to process! Try again later!");
+                }
+            });
+    }
+}
+
 function GetTransaction(req, res) {
     if (!serving)
         res.status(INVALID.e_code).send(INVALID_SERVER_MSG);
@@ -385,6 +404,7 @@ module.exports = {
     ListBuyOrders,
     ListTradeTransactions,
     GetRates,
+    GetRateHistory,
     GetTransaction,
     GetBalance,
     Account,