Merge branch 'livecoin-fetchOrder' of https://github.com/egorFiNE/ccxt …

…into egorFiNE-livecoin-fetchOrder
ccxt · Jun 5, 2018 · f0f1127 · f0f1127
2 parents 1709a14 + 5cdb1b4
commit f0f1127
Showing 1 changed file with 101 additions and 28 deletions.
diff --git a/js/livecoin.js b/js/livecoin.js
@@ -22,6 +22,7 @@ module.exports = class livecoin extends Exchange {
                 'fetchCurrencies': true,
                 'fetchTradingFees': true,
                 'fetchOrders': true,
+                'fetchOrder': true,
                 'fetchOpenOrders': true,
                 'fetchClosedOrders': true,
                 'withdraw': true,
@@ -378,64 +379,136 @@ module.exports = class livecoin extends Exchange {
         return this.parseTrades (response, market, since, limit);
     }
 
+    async fetchOrder (id, symbol = undefined, params = {}) {
+        await this.loadMarkets ();
+        let request = {
+            'orderId': id,
+        };
+        let response = await this.privateGetExchangeOrder (this.extend (request, params));
+        return this.parseOrder (response);
+    }
+
     parseOrder (order, market = undefined) {
-        let timestamp = this.safeInteger (order, 'lastModificationTime');
-        if (!timestamp)
-            timestamp = this.parse8601 (order['lastModificationTime']);
+        let timestamp = undefined;
+        let datetime = undefined;
+        if ('lastModificationTime' in order) {
+            timestamp = this.safeString (order, 'lastModificationTime');
+            if (typeof timestamp !== 'undefined') {
+                if (timestamp.indexOf ('T') >= 0) {
+                    timestamp = this.parse8601 (timestamp);
+                } else {
+                    timestamp = this.safeInteger (order, 'lastModificationTime');
+                }
+            }
+        }
+        if (timestamp) {
+            datetime = this.iso8601 (timestamp);
+        }
         let trades = undefined;
         if ('trades' in order)
             // TODO currently not supported by livecoin
             // trades = this.parseTrades (order['trades'], market, since, limit);
             trades = undefined;
         let status = undefined;
-        if (order['orderStatus'] === 'OPEN' || order['orderStatus'] === 'PARTIALLY_FILLED') {
+        let orderStatus = undefined;
+        if ('status' in order) {
+            orderStatus = this.safeString (order, 'status');
+        }
+        if ('orderStatus' in order) {
+            orderStatus = this.safeString (order, 'orderStatus');
+        }
+        if (orderStatus === 'OPEN' || orderStatus === 'PARTIALLY_FILLED') {
             status = 'open';
-        } else if (order['orderStatus'] === 'EXECUTED' || order['orderStatus'] === 'PARTIALLY_FILLED_AND_CANCELLED') {
+        } else if (orderStatus === 'EXECUTED' || orderStatus === 'PARTIALLY_FILLED_AND_CANCELLED') {
             status = 'closed';
         } else {
             status = 'canceled';
         }
-        let symbol = order['currencyPair'];
-        let parts = symbol.split ('/');
-        let quote = parts[1];
-        // let [ base, quote ] = symbol.split ('/');
+        let symbol = undefined;
+        if ('currencyPair' in order) {
+            symbol = order['currencyPair'];
+        }
+        if ('symbol' in order) {
+            symbol = order['symbol'];
+        }
+        let parts = undefined;
+        let quote = undefined;
+        if (symbol) {
+            parts = symbol.split ('/');
+            quote = parts[1];
+        }
         let type = undefined;
         let side = undefined;
-        if (order['type'].indexOf ('MARKET') >= 0) {
-            type = 'market';
-        } else {
-            type = 'limit';
+        if ('type' in order) {
+            if (order['type'].indexOf ('MARKET') >= 0) {
+                type = 'market';
+            }
+            if (order['type'].indexOf ('LIMIT') >= 0) {
+                type = 'limit';
+            }
+            if (order['type'].indexOf ('SELL') >= 0) {
+                side = 'sell';
+            }
+            if (order['type'].indexOf ('BUY') >= 0) {
+                side = 'buy';
+            }
         }
-        if (order['type'].indexOf ('SELL') >= 0) {
-            side = 'sell';
-        } else {
-            side = 'buy';
+        let price = this.safeFloat (order, 'price');
+        let remaining = undefined;
+        if ('remainingQuantity' in order) {
+            remaining = this.safeFloat (order, 'remainingQuantity');
+        }
+        if ('remaining_quantity' in order) {
+            remaining = this.safeFloat (order, 'remaining_quantity');
         }
-        let price = this.safeFloat (order, 'price', 0.0);
-        let cost = this.safeFloat (order, 'commissionByTrade', 0.0);
-        let remaining = this.safeFloat (order, 'remainingQuantity', 0.0);
         let amount = this.safeFloat (order, 'quantity', remaining);
-        let filled = amount - remaining;
-        return {
+        let filled = undefined;
+        if (typeof remaining !== 'undefined') {
+            filled = amount - remaining;
+        }
+        const result = {
             'info': order,
             'id': order['id'],
             'timestamp': timestamp,
-            'datetime': this.iso8601 (timestamp),
+            'datetime': datetime,
             'lastTradeTimestamp': undefined,
             'status': status,
             'symbol': symbol,
             'type': type,
             'side': side,
             'price': price,
-            'cost': cost,
             'amount': amount,
             'filled': filled,
             'remaining': remaining,
             'trades': trades,
-            'fee': {
-                'cost': cost,
-                'currency': quote,
-            },
+        };
+        const fee = this.calculateOrderFee (status, amount, filled, price, quote);
+        if (typeof fee !== 'undefined') {
+            result['fee'] = fee;
+            result['cost'] = fee.cost;
+        }
+        return result;
+    }
+
+    calculateOrderFee (status, amount, filled, price, quote) {
+        let cost = undefined;
+        if (status === 'open') {
+            if (typeof filled !== 'undefined' && typeof amount !== 'undefined' && typeof price !== 'undefined') {
+                cost = amount * price;
+            }
+        }
+        if (status === 'closed' || status === 'canceled') {
+            if (typeof filled !== 'undefined' && typeof price !== 'undefined') {
+                cost = filled * price;
+            }
+        }
+        if (typeof cost === 'undefined') {
+            return undefined;
+        }
+        return {
+            'cost': cost,
+            'currency': quote,
+            'price': price,
         };
     }