[coinmate] attempt to get transaction hash from the deposit description, fixed getFundingHistory, fixed getTradeHistory

Author: npomfret

xchange-coinmate/src/main/java/org/knowm/xchange/coinmate/CoinmateAdapters.java

@@ -194,9 +194,27 @@ public static List<FundingRecord> adaptFundingHistory(CoinmateTransactionHistory
 
       String transactionId = Long.toString(entry.getTransactionId());
 
-      FundingRecord funding = new FundingRecord(null,
-          new Date(entry.getTimestamp()), Currency.getInstance(entry.getAmountCurrency()), entry.getAmount(),
-          transactionId, transactionId , type, status, null, entry.getFee(), entry.getDescription());
+      String description = entry.getDescription();
+
+      String feeCurrency = entry.getFeeCurrency();
+      String externalId = null;
+      if (entry.getTransactionType().equals("DEPOSIT") && description.startsWith(feeCurrency + ": ")) {
+        externalId = description.replace(feeCurrency + ": ", "");//the transaction hash is in the description
+      }
+
+      FundingRecord funding = new FundingRecord(
+          null,
+          new Date(entry.getTimestamp()),
+          Currency.getInstance(entry.getAmountCurrency()),
+          entry.getAmount(),
+          transactionId,
+          externalId,
+          type,
+          status,
+          null,
+          entry.getFee(),
+          description
+      );
 
       fundings.add(funding);
     }

xchange-coinmate/src/main/java/org/knowm/xchange/coinmate/service/CoinmateAccountService.java

@@ -31,13 +31,14 @@
 import org.knowm.xchange.coinmate.CoinmateAdapters;
 import org.knowm.xchange.coinmate.dto.account.CoinmateDepositAddresses;
 import org.knowm.xchange.coinmate.dto.trade.CoinmateTradeResponse;
+import org.knowm.xchange.coinmate.dto.trade.CoinmateTransactionHistory;
 import org.knowm.xchange.currency.Currency;
 import org.knowm.xchange.dto.account.AccountInfo;
 import org.knowm.xchange.dto.account.FundingRecord;
-import org.knowm.xchange.exceptions.NotAvailableFromExchangeException;
 import org.knowm.xchange.service.account.AccountService;
-import org.knowm.xchange.service.trade.params.DefaultTradeHistoryParamPagingSorted;
 import org.knowm.xchange.service.trade.params.DefaultWithdrawFundsParams;
+import org.knowm.xchange.service.trade.params.TradeHistoryParamLimit;
+import org.knowm.xchange.service.trade.params.TradeHistoryParamOffset;
 import org.knowm.xchange.service.trade.params.TradeHistoryParams;
 import org.knowm.xchange.service.trade.params.TradeHistoryParamsSorted;
 import org.knowm.xchange.service.trade.params.WithdrawFundsParams;
@@ -90,15 +91,33 @@ public String requestDepositAddress(Currency currency,
 
   @Override
   public TradeHistoryParams createFundingHistoryParams() {
-    return new DefaultTradeHistoryParamPagingSorted(DEFAULT_RESULT_LIMIT, TradeHistoryParamsSorted.Order.asc);
+    return new CoinmateFundingHistoryParams();
   }
 
   @Override
   public List<FundingRecord> getFundingHistory(
       TradeHistoryParams params) throws IOException {
 
-    DefaultTradeHistoryParamPagingSorted myParams = (DefaultTradeHistoryParamPagingSorted) params;
-    return CoinmateAdapters.adaptFundingHistory(
-            getCoinmateTransactionHistory(myParams.getPageNumber(), myParams.getPageLength(), CoinmateAdapters.adaptSortOrder(myParams.getOrder())));
+    TradeHistoryParamsSorted.Order order = TradeHistoryParamsSorted.Order.asc;
+    int limit = 1000;
+    int offset = 0;
+
+    if (params instanceof TradeHistoryParamOffset) {
+      offset = Math.toIntExact(((TradeHistoryParamOffset) params).getOffset());
+    }
+
+    if (params instanceof TradeHistoryParamLimit) {
+      limit = ((TradeHistoryParamLimit) params).getLimit();
+    }
+
+    if (params instanceof TradeHistoryParamsSorted) {
+      order = ((TradeHistoryParamsSorted) params).getOrder();
+    }
+
+    CoinmateTransactionHistory coinmateTransactionHistory = getCoinmateTransactionHistory(offset, limit, CoinmateAdapters.adaptSortOrder(order));
+    return CoinmateAdapters.adaptFundingHistory(coinmateTransactionHistory);
+  }
+
+  public static class CoinmateFundingHistoryParams extends CoinmateTradeService.CoinmateTradeHistoryHistoryParams {
   }
 }

xchange-coinmate/src/main/java/org/knowm/xchange/coinmate/service/CoinmateTradeService.java

@@ -1,14 +1,14 @@
 /*
  * The MIT License
- * 
+ *
  * Copyright 2015-2016 Coinmate.
- * 
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in
  * the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
  * the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
  * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
  * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
@@ -27,6 +27,7 @@
 import org.knowm.xchange.coinmate.dto.trade.CoinmateCancelOrderResponse;
 import org.knowm.xchange.coinmate.dto.trade.CoinmateOpenOrders;
 import org.knowm.xchange.coinmate.dto.trade.CoinmateTradeResponse;
+import org.knowm.xchange.coinmate.dto.trade.CoinmateTransactionHistory;
 import org.knowm.xchange.currency.CurrencyPair;
 import org.knowm.xchange.dto.Order;
 import org.knowm.xchange.dto.trade.LimitOrder;
@@ -37,7 +38,8 @@
 import org.knowm.xchange.service.trade.TradeService;
 import org.knowm.xchange.service.trade.params.CancelOrderByIdParams;
 import org.knowm.xchange.service.trade.params.CancelOrderParams;
-import org.knowm.xchange.service.trade.params.DefaultTradeHistoryParamPagingSorted;
+import org.knowm.xchange.service.trade.params.TradeHistoryParamLimit;
+import org.knowm.xchange.service.trade.params.TradeHistoryParamOffset;
 import org.knowm.xchange.service.trade.params.TradeHistoryParams;
 import org.knowm.xchange.service.trade.params.TradeHistoryParamsSorted;
 import org.knowm.xchange.service.trade.params.orders.OpenOrdersParamCurrencyPair;
@@ -122,19 +124,29 @@ public boolean cancelOrder(CancelOrderParams orderParams) throws IOException {
 
   @Override
   public UserTrades getTradeHistory(TradeHistoryParams params) throws IOException {
-    // here we use the Transaction History call, which includes also withdrawals etc.
-    // there is also Order History call, but this returns orders rather than trades
-    DefaultTradeHistoryParamPagingSorted myParams = (DefaultTradeHistoryParamPagingSorted) params;
-    return CoinmateAdapters.adaptTransactionHistory(
-        getCoinmateTradeHistory(myParams.getPageNumber(), myParams.getPageLength(), CoinmateAdapters.adaptSortOrder(myParams.getOrder())));
+    TradeHistoryParamsSorted.Order order = TradeHistoryParamsSorted.Order.asc;
+    int limit = 1000;
+    int offset = 0;
+
+    if (params instanceof TradeHistoryParamOffset) {
+      offset = Math.toIntExact(((TradeHistoryParamOffset) params).getOffset());
+    }
+
+    if (params instanceof TradeHistoryParamLimit) {
+      limit = ((TradeHistoryParamLimit) params).getLimit();
+    }
+
+    if (params instanceof TradeHistoryParamsSorted) {
+      order = ((TradeHistoryParamsSorted) params).getOrder();
+    }
+
+    CoinmateTransactionHistory coinmateTradeHistory = getCoinmateTradeHistory(offset, limit, CoinmateAdapters.adaptSortOrder(order));
+    return CoinmateAdapters.adaptTransactionHistory(coinmateTradeHistory);
   }
 
   @Override
   public TradeHistoryParams createTradeHistoryParams() {
-    DefaultTradeHistoryParamPagingSorted params = new DefaultTradeHistoryParamPagingSorted(100);
-    params.setPageNumber(0);
-    params.setOrder(TradeHistoryParamsSorted.Order.asc);
-    return params;
+    return new CoinmateTradeHistoryHistoryParams();
   }
 
   @Override
@@ -148,4 +160,51 @@ public Collection<Order> getOrder(
     throw new NotYetImplementedForExchangeException();
   }
 
+  public static class CoinmateTradeHistoryHistoryParams implements TradeHistoryParamOffset, TradeHistoryParamLimit, TradeHistoryParamsSorted {
+
+    private Integer limit;
+    private Long offset;
+    private Order order;
+
+    public CoinmateTradeHistoryHistoryParams(Integer limit, Long offset, Order order) {
+      this.limit = limit;
+      this.offset = offset;
+      this.order = order;
+    }
+
+    public CoinmateTradeHistoryHistoryParams() {
+      this(100, 0L, Order.asc);
+    }
+
+    @Override
+    public void setLimit(Integer limit) {
+      this.limit = limit;
+    }
+
+    @Override
+    public Integer getLimit() {
+      return limit;
+    }
+
+    @Override
+    public void setOffset(Long offset) {
+      this.offset = offset;
+    }
+
+    @Override
+    public Long getOffset() {
+      return offset;
+    }
+
+    @Override
+    public Order getOrder() {
+      return order;
+    }
+
+    @Override
+    public void setOrder(Order order) {
+      this.order = order;
+    }
+  }
+
 }