Merge pull request #16 from cryptomkt/fix/transaction-history-order-by

Fix/transaction history order by

Author: ppbustamante

pom.xml

@@ -6,7 +6,7 @@
   <groupId>com.cryptomkt.api</groupId>
   <artifactId>cryptomarket</artifactId>
   <packaging>jar</packaging>
-  <version>3.0.0</version>
+  <version>3.0.1</version>
 
   <licenses>
     <license>

src/main/java/com/cryptomarket/params/OrderBy.java

@@ -0,0 +1,22 @@
+package com.cryptomarket.params;
+
+/** Param to sort by */
+public enum OrderBy {
+  /** sort by creation date */
+  CREATED_AT("created_at"),
+  /** sort by id */
+  ID("id"),
+  /** sort by update date */
+  UPDATE_AT("updated_at");
+
+  private final String label;
+
+  private OrderBy(String label) {
+    this.label = label;
+  }
+
+  @Override
+  public String toString() {
+    return label;
+  }
+}

src/main/java/com/cryptomarket/params/ParamsBuilder.java

@@ -230,6 +230,17 @@ public ParamsBuilder by(@Nullable SortBy by) {
     return addArg(ArgNames.BY, by);
   }
 
+
+  /**
+   * Adds an order_by param to the ParamBuilder.
+   *
+   * @param by An OrderBy type
+   * @return The ParamsBuilder
+   */
+  public ParamsBuilder orderBy(@Nullable OrderBy by) {
+    return addArg(ArgNames.ORDER_BY, by);
+  }
+
   /**
    * Adds a to param to the ParamBuilder.
    *

src/main/java/com/cryptomarket/sdk/ArgNames.java

@@ -22,6 +22,8 @@ public class ArgNames {
   /** */
   public static final String BY = "by";
   /** */
+  public static final String ORDER_BY = "order_by";
+  /** */
   public static final String TO = "to";
   /** */
   public static final String SINCE = "since";

src/main/java/com/cryptomarket/sdk/rest/CryptomarketRestClient.java

@@ -10,6 +10,7 @@
 import com.cryptomarket.params.ContingencyType;
 import com.cryptomarket.params.IdentifyBy;
 import com.cryptomarket.params.OrderBuilder;
+import com.cryptomarket.params.OrderBy;
 import com.cryptomarket.params.OrderType;
 import com.cryptomarket.params.ParamsBuilder;
 import com.cryptomarket.params.Period;
@@ -1525,7 +1526,7 @@ public String transferMoneyToAnotherUser(ParamsBuilder paramsBuilder)
    *                       'SUCCESS' and 'ROLLED_BACK'
    * @param sort           Optional. Sort direction. 'ASC' or 'DESC'. Default
    *                       is 'DESC'
-   * @param sortBy         Optional. sorting parameter.'created_at' or 'id'.
+   * @param orderBy         Optional. sorting parameter.'created_at', 'updated_at' or 'id'.
    *                       Default is 'created_at'
    * @param from           Optional. Interval initial value when ordering by
    *                       'created_at'. As Datetime
@@ -1549,7 +1550,7 @@ public List<Transaction> getTransactionHistory(
       @Nullable List<TransactionSubtype> subtypes,
       @Nullable List<TransactionStatus> statuses,
       @Nullable Sort sort,
-      @Nullable SortBy sortBy,
+      @Nullable OrderBy orderBy,
       @Nullable String from,
       @Nullable String till,
       @Nullable Integer idFrom,

src/main/java/com/cryptomarket/sdk/rest/CryptomarketRestClientImpl.java

@@ -12,6 +12,7 @@
 import com.cryptomarket.params.ContingencyType;
 import com.cryptomarket.params.IdentifyBy;
 import com.cryptomarket.params.OrderBuilder;
+import com.cryptomarket.params.OrderBy;
 import com.cryptomarket.params.OrderType;
 import com.cryptomarket.params.ParamsBuilder;
 import com.cryptomarket.params.Period;
@@ -1013,7 +1014,7 @@ public List<Transaction> getTransactionHistory(
       List<TransactionSubtype> subtypes,
       List<TransactionStatus> statuses,
       Sort sort,
-      SortBy sortBy,
+      OrderBy orderBy,
       String from,
       String till,
       Integer idFrom,
@@ -1028,7 +1029,7 @@ public List<Transaction> getTransactionHistory(
         .subtypes(subtypes)
         .statuses(statuses)
         .sort(sort)
-        .by(sortBy)
+        .orderBy(orderBy)
         .from(from)
         .till(till)
         .idFrom(idFrom)

src/test/java/com/cryptomarket/sdk/TestRestClientMarketData.java

@@ -209,7 +209,6 @@ public void getConvertedCandles() throws CryptomarketSDKException {
     var targetCurrency = "BTC";
     var convertedCandles = client.getConvertedCandles(targetCurrency, symbols, Period._4_HOURS, Sort.ASC, null, null,
         null);
-    System.out.println(convertedCandles);
     assertEquals(targetCurrency, convertedCandles.getTargetCurrency());
     assertTrue(convertedCandles.getData().keySet().size() == 3);
     convertedCandles.getData().forEach((key, candleList) -> {
@@ -222,7 +221,6 @@ public void getConvertedCandlesBySymbol() throws CryptomarketSDKException {
     var targetCurrency = "BTC";
     var convertedCandles = client.getConvertedCandlesBySymbol(targetCurrency, "EOSETH", Period._4_HOURS, Sort.ASC, null,
         null, null, null);
-    System.out.println(convertedCandles);
     assertEquals(targetCurrency, convertedCandles.getTargetCurrency());
     convertedCandles.getData().forEach(Checker.checkCandle);
   }

src/test/java/com/cryptomarket/sdk/TestRestClientSpotTradingHistory.java

@@ -3,6 +3,8 @@
 import java.util.List;
 
 import com.cryptomarket.params.ParamsBuilder;
+import com.cryptomarket.params.Sort;
+import com.cryptomarket.params.SortBy;
 import com.cryptomarket.sdk.exceptions.CryptomarketSDKException;
 import com.cryptomarket.sdk.models.Order;
 import com.cryptomarket.sdk.models.Trade;
@@ -12,18 +14,41 @@
 import org.junit.Test;
 
 public class TestRestClientSpotTradingHistory {
-    CryptomarketRestClient client = new CryptomarketRestClientImpl(KeyLoader.getApiKey(), KeyLoader.getApiSecret());
-
-    @Test
-    public void testGetOrderHistoryAndGetOrders() throws CryptomarketSDKException {
-        List<Order> orders = client.getSpotOrderHistory(new ParamsBuilder()
-                .symbol("EOSETH"));
-        orders.forEach(Checker.checkOrder);
-    }
-
-    @Test
-    public void testGetTradingHistory() throws CryptomarketSDKException {
-        List<Trade> trades = client.getSpotTradesHistory(new ParamsBuilder().limit(12));
-        trades.forEach(Checker.checkTrade);
-    }
+  CryptomarketRestClient client = new CryptomarketRestClientImpl(KeyLoader.getApiKey(), KeyLoader.getApiSecret());
+
+  @Test
+  public void testGetOrderHistoryAndGetOrders() throws CryptomarketSDKException {
+    List<Order> orders = client.getSpotOrderHistory(new ParamsBuilder()
+        .symbol("EOSETH"));
+    orders.forEach(Checker.checkOrder);
+  }
+
+  @Test
+  public void testGetOrderHistoryAndGetOrdersWithParams() throws CryptomarketSDKException {
+    List<Order> orders = client.getSpotOrderHistory(new ParamsBuilder()
+        .by(SortBy.TIMESTAMP)
+        .sort(Sort.DESC)
+        .limit(1000)
+        .offset(0)
+        .from("1610701510"));
+    orders.forEach(Checker.checkOrder);
+  }
+
+  @Test
+  public void testGetTradingHistory() throws CryptomarketSDKException {
+    List<Trade> trades = client.getSpotTradesHistory(new ParamsBuilder().limit(12));
+    trades.forEach(Checker.checkTrade);
+  }
+
+
+  @Test
+  public void testGetTradingHistoryWithParamsWithParams() throws CryptomarketSDKException {
+    List<Trade> trades = client.getSpotTradesHistory(new ParamsBuilder()
+        .by(SortBy.TIMESTAMP)
+        .sort(Sort.DESC)
+        .limit(1000)
+        .offset(0)
+        .from("1610701510"));
+    trades.forEach(Checker.checkTrade);
+  }
 }

src/test/java/com/cryptomarket/sdk/TestRestClientWalletManagement.java

@@ -7,7 +7,9 @@
 import org.junit.Test;
 
 import com.cryptomarket.params.AccountType;
+import com.cryptomarket.params.OrderBy;
 import com.cryptomarket.params.ParamsBuilder;
+import com.cryptomarket.params.Sort;
 import com.cryptomarket.sdk.exceptions.CryptomarketSDKException;
 import com.cryptomarket.sdk.models.Address;
 import com.cryptomarket.sdk.models.Balance;
@@ -166,6 +168,18 @@ public void testGetTransactionHistory() throws CryptomarketSDKException {
     transactions.forEach(Checker.checkTransaction);
   }
 
+  @Test
+  public void testGetTransactionHistoryWithParams() throws CryptomarketSDKException {
+    List<Transaction> transactions = client.getTransactionHistory(new ParamsBuilder()
+        .orderBy(OrderBy.CREATED_AT)
+        .sort(Sort.DESC)
+        .limit(1000)
+        .offset(0)
+        .currencies(List.of())
+        .from("1614815872000"));
+    transactions.forEach(Checker.checkTransaction);
+  }
+
   @Test
   public void testGetTransaction() throws CryptomarketSDKException {
     List<Transaction> transactions = client.getTransactionHistory(new ParamsBuilder().limit(1));