Merge pull request #2214 from npomfret/develop

[dsx] fixed open order timestamp and cumulative amount

Author: timmolter

xchange-dsx/src/main/java/org/knowm/xchange/dsx/DSXAdapters.java

@@ -1,15 +1,5 @@
 package org.knowm.xchange.dsx;
 
-import java.math.BigDecimal;
-import java.math.RoundingMode;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.concurrent.TimeUnit;
-
 import org.knowm.xchange.currency.Currency;
 import org.knowm.xchange.currency.CurrencyPair;
 import org.knowm.xchange.dsx.dto.account.DSXAccountInfo;
@@ -40,6 +30,16 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.concurrent.TimeUnit;
+
 /**
  * @author Mikhail Wall
  */
@@ -133,16 +133,25 @@ public static OpenOrders adaptOrders(Map<Long, DSXOrder> dsxOrderMap) {
       OrderType orderType = dsxOrder.getType() == DSXOrder.Type.buy ? OrderType.BID : OrderType.ASK;
       BigDecimal price = dsxOrder.getRate();
       CurrencyPair currencyPair = adaptCurrencyPair(dsxOrder.getPair());
-
-      limitOrders.add(new LimitOrder(orderType, dsxOrder.getAmount(), currencyPair, Long.toString(id), null, price));
+      Date timestamp = DateUtils.fromUnixTime(Long.valueOf(dsxOrder.getTimestampCreated()));
+
+      limitOrders.add(new LimitOrder(
+              orderType,
+              dsxOrder.getAmount(),
+              dsxOrder.getAmount().subtract(dsxOrder.getRemainingVolume()),
+              currencyPair,
+              Long.toString(id),
+              timestamp,
+              price
+      ));
     }
     return new OpenOrders(limitOrders);
   }
 
   public static UserTrades adaptTradeHistory(Map<Long, DSXTradeHistoryResult> tradeHistory) {
 
     List<UserTrade> trades = new ArrayList<>(tradeHistory.size());
-    for (Map.Entry<Long, DSXTradeHistoryResult> entry : tradeHistory.entrySet()) {
+    for (Entry<Long, DSXTradeHistoryResult> entry : tradeHistory.entrySet()) {
       DSXTradeHistoryResult result = entry.getValue();
       OrderType type = result.getType() == DSXTradeHistoryResult.Type.buy ? OrderType.BID : OrderType.ASK;
       BigDecimal price = result.getRate();
@@ -193,7 +202,7 @@ public static ExchangeMetaData toMetaData(DSXExchangeInfo dsxExchangeInfo, DSXMe
     Map<Currency, CurrencyMetaData> currencies = new HashMap<>();
 
     if (dsxExchangeInfo != null) {
-      for (Map.Entry<String, DSXPairInfo> e : dsxExchangeInfo.getPairs().entrySet()) {
+      for (Entry<String, DSXPairInfo> e : dsxExchangeInfo.getPairs().entrySet()) {
         CurrencyPair pair = adaptCurrencyPair(e.getKey());
         CurrencyPairMetaData marketMetaData = toMarketMetaData(e.getValue());
         currencyPairs.put(pair, marketMetaData);

xchange-dsx/src/main/java/org/knowm/xchange/dsx/dto/trade/DSXOrder.java

@@ -1,10 +1,10 @@
 package org.knowm.xchange.dsx.dto.trade;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
+
 import java.math.BigDecimal;
 import java.text.MessageFormat;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
-
 /**
  * @author Mikhail Wall
  */
@@ -14,20 +14,36 @@ public class DSXOrder {
   private final String pair;
   private final Type type;
   private final BigDecimal volume;
+  private final BigDecimal remainingVolume;
   private final BigDecimal rate;
   private final int status;
   private final OrderType orderType;
+  private final String timestampCreated;
 
-  public DSXOrder(@JsonProperty("pair") String pair, @JsonProperty("type") Type type, @JsonProperty("volume") BigDecimal volume,
-      @JsonProperty("rate") BigDecimal rate, @JsonProperty("status") int status,
-      @JsonProperty("orderType") OrderType orderType) {
+  public DSXOrder(@JsonProperty("pair") String pair, @JsonProperty("type") Type type, @JsonProperty("volume") BigDecimal volume, @JsonProperty("remainingVolume") BigDecimal remainingVolume,
+                  @JsonProperty("rate") BigDecimal rate, @JsonProperty("status") int status,
+                  @JsonProperty("orderType") OrderType orderType, @JsonProperty("timestampCreated") String timestampCreated) {
 
     this.pair = pair;
     this.type = type;
     this.volume = volume;
+    this.remainingVolume = remainingVolume;
     this.rate = rate;
     this.status = status;
     this.orderType = orderType;
+    this.timestampCreated = timestampCreated;
+  }
+
+  public BigDecimal getVolume() {
+    return volume;
+  }
+
+  public BigDecimal getRemainingVolume() {
+    return remainingVolume;
+  }
+
+  public String getTimestampCreated() {
+    return timestampCreated;
   }
 
   public String getPair() {
@@ -54,10 +70,18 @@ public OrderType getOrderType() {
     return orderType;
   }
 
+  @Override
   public String toString() {
-
-    return MessageFormat.format("DSXOrder[pair=''{0}'', type={1}, volume={2}, rate={3}, status={4}, orderType={5}",
-        pair, type, volume, rate, status, orderType);
+    return "DSXOrder{" +
+            "pair='" + pair + '\'' +
+            ", type=" + type +
+            ", volume=" + volume +
+            ", remainingVolume=" + remainingVolume +
+            ", rate=" + rate +
+            ", status=" + status +
+            ", orderType=" + orderType +
+            ", timestampCreated='" + timestampCreated + '\'' +
+            '}';
   }
 
   public enum Type {

xchange-dsx/src/main/java/org/knowm/xchange/dsx/service/DSXTradeService.java

@@ -1,6 +1,7 @@
 package org.knowm.xchange.dsx.service;
 
 import java.io.IOException;
+import java.math.BigDecimal;
 import java.util.Collection;
 import java.util.Date;
 import java.util.Map;
@@ -82,8 +83,8 @@ public String placeLimitOrder(LimitOrder limitOrder) throws IOException {
 
     String pair = DSXAdapters.getPair(limitOrder.getCurrencyPair());
 
-    DSXOrder dsxOrder = new DSXOrder(pair, type, limitOrder.getOriginalAmount(), limitOrder.getLimitPrice(),
-        3, DSXOrder.OrderType.limit);
+    DSXOrder dsxOrder = new DSXOrder(pair, type, limitOrder.getOriginalAmount(), limitOrder.getOriginalAmount(), limitOrder.getLimitPrice(),
+        3, DSXOrder.OrderType.limit, null);
 
     DSXTradeResult result = tradeDSX(dsxOrder);
     return Long.toString(result.getOrderId());

xchange-examples/src/main/java/org/knowm/xchange/examples/dsx/trade/DSXTradeDemo.java

@@ -62,7 +62,7 @@ private static void rawCancelAllOrders(Exchange exchange) throws IOException {
 
     DSXOrder.Type type = DSXOrder.Type.buy;
     String pair = "btcusd";
-    DSXOrder dsxOrder = new DSXOrder(pair, type, new BigDecimal("0.01"), new BigDecimal("900"), 0, DSXOrder.OrderType.limit);
+    DSXOrder dsxOrder = new DSXOrder(pair, type, new BigDecimal("0.01"), new BigDecimal("900"), new BigDecimal("900"), 0, DSXOrder.OrderType.limit, null);
 
     DSXTradeResult result = null;
     DSXTradeResult result1 = null;
@@ -100,7 +100,8 @@ private static void raw(Exchange exchange) throws IOException {
     // place buy order
     DSXOrder.Type type = DSXOrder.Type.buy;
     String pair = "btcusd";
-    DSXOrder dsxOrder = new DSXOrder(pair, type, new BigDecimal("0.1"), new BigDecimal("900"), 0, DSXOrder.OrderType.limit);
+    DSXOrder dsxOrder = new DSXOrder(pair, type, new BigDecimal("0.1"), new BigDecimal("900"), new BigDecimal("900"), 0, DSXOrder.OrderType
+        .limit, null);
 
     DSXTradeResult result = null;
     try {