Services on dry mode tests #881

cassandre-tech · Mar 3, 2022 · fd1498c · fd1498c
1 parent 7f4ab2f
commit fd1498c
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 24 deletions.
diff --git a/...nfigure/src/main/java/tech/cassandre/trading/bot/strategy/internal/CassandreStrategy.java b/...nfigure/src/main/java/tech/cassandre/trading/bot/strategy/internal/CassandreStrategy.java
@@ -18,6 +18,7 @@
 import tech.cassandre.trading.bot.strategy.BasicTa4jCassandreStrategy;
 
 import java.math.BigDecimal;
+import java.util.LinkedHashMap;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
@@ -57,6 +58,20 @@ public final Optional<AccountDTO> getTradeAccount() {
         return getTradeAccount(new LinkedHashSet<>(getAccounts().values()));
     }
 
+    /**
+     * Returns trade account balances.
+     *
+     * @return trade account balances
+     */
+    public final Map<CurrencyDTO, BalanceDTO> getTradeAccountBalances() {
+        Map<CurrencyDTO, BalanceDTO> balances = new LinkedHashMap<>();
+        getTradeAccount().ifPresent(accountDTO ->
+                accountDTO.getBalances()
+                        .forEach(balanceDTO -> balances.put(balanceDTO.getCurrency(), balanceDTO))
+        );
+        return balances;
+    }
+
     /**
      * Returns list of accounts.
      *

diff --git a/.../java/tech/cassandre/trading/bot/test/core/services/dry/UserServiceWithPositionsTest.java b/.../java/tech/cassandre/trading/bot/test/core/services/dry/UserServiceWithPositionsTest.java
@@ -25,11 +25,8 @@
 import tech.cassandre.trading.bot.util.exception.PositionException;
 
 import java.math.BigDecimal;
-import java.util.Collections;
 import java.util.Map;
 import java.util.Optional;
-import java.util.function.Function;
-import java.util.stream.Collectors;
 
 import static org.awaitility.Awaitility.await;
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -90,7 +87,7 @@ public void checkUserBalancesUpdatesWithPosition() {
         // ETH  10
         accountFlux.update();
         await().until(() -> !strategy.getAccountsUpdatesReceived().isEmpty());
-        Map<CurrencyDTO, BalanceDTO> balances = getBalances();
+        Map<CurrencyDTO, BalanceDTO> balances = strategy.getTradeAccountBalances();
         assertEquals(0, new BigDecimal("0.99962937").compareTo(balances.get(BTC).getAvailable()));
         assertEquals(0, new BigDecimal("1000").compareTo(balances.get(USDT).getAvailable()));
         assertEquals(0, new BigDecimal("10").compareTo(balances.get(ETH).getAvailable()));
@@ -151,7 +148,7 @@ public void checkUserBalancesUpdatesWithPosition() {
         long position1Id = position1.getPosition().getPositionId();
         await().untilAsserted(() -> assertEquals(OPENED, getPositionDTO(position1Id).getStatus()));
         await().untilAsserted(() -> assertEquals(4, strategy.getAccountsUpdatesReceived().size()));
-        balances = getBalances();
+        balances = strategy.getTradeAccountBalances();
         assertEquals(0, new BigDecimal("0.99962937").compareTo(balances.get(BTC).getAvailable()));
         assertEquals(0, new BigDecimal("250").compareTo(balances.get(USDT).getAvailable()));
         assertEquals(0, new BigDecimal("10.5").compareTo(balances.get(ETH).getAvailable()));
@@ -190,7 +187,7 @@ public void checkUserBalancesUpdatesWithPosition() {
         long position2Id = position2.getPosition().getPositionId();
         await().untilAsserted(() -> assertEquals(OPENED, getPositionDTO(position2Id).getStatus()));
         await().untilAsserted(() -> assertEquals(5, strategy.getAccountsUpdatesReceived().size()));
-        balances = getBalances();
+        balances = strategy.getTradeAccountBalances();
         assertEquals(0, new BigDecimal("0.99962937").compareTo(balances.get(BTC).getAvailable()));
         assertEquals(0, new BigDecimal("150").compareTo(balances.get(USDT).getAvailable()));
         assertEquals(0, new BigDecimal("20.5").compareTo(balances.get(ETH).getAvailable()));
@@ -227,7 +224,7 @@ public void checkUserBalancesUpdatesWithPosition() {
         long position3Id = position3.getPosition().getPositionId();
         await().untilAsserted(() -> assertEquals(OPENED, getPositionDTO(position3Id).getStatus()));
         await().untilAsserted(() -> assertEquals(6, strategy.getAccountsUpdatesReceived().size()));
-        balances = getBalances();
+        balances = strategy.getTradeAccountBalances();
         assertEquals(0, new BigDecimal("0.99962937").compareTo(balances.get(BTC).getAvailable()));
         assertEquals(0, new BigDecimal("70").compareTo(balances.get(USDT).getAvailable()));
         assertEquals(0, new BigDecimal("20.5").compareTo(balances.get(ETH).getAvailable()));
@@ -261,7 +258,7 @@ public void checkUserBalancesUpdatesWithPosition() {
         long position4Id = position4.getPosition().getPositionId();
         await().untilAsserted(() -> assertEquals(OPENED, getPositionDTO(position4Id).getStatus()));
         await().untilAsserted(() -> assertEquals(7, strategy.getAccountsUpdatesReceived().size()));
-        balances = getBalances();
+        balances = strategy.getTradeAccountBalances();
         assertEquals(0, new BigDecimal("0.99962937").compareTo(balances.get(BTC).getAvailable()));
         assertEquals(0, new BigDecimal("80").compareTo(balances.get(USDT).getAvailable()));
         assertEquals(0, new BigDecimal("19.5").compareTo(balances.get(ETH).getAvailable()));
@@ -313,7 +310,7 @@ public void checkUserBalancesUpdatesWithPosition() {
         // 19.5 ETH             =>  19.5 - 10 (position 2 sell) + 5 (position 4 buy)
         // 0 KCS                =>  20 KCS (20 lock in positions).
         await().untilAsserted(() -> assertEquals(9, strategy.getAccountsUpdatesReceived().size()));
-        balances = getBalances();
+        balances = strategy.getTradeAccountBalances();
         assertEquals(0, new BigDecimal("0.99962937").compareTo(balances.get(BTC).getAvailable()));
         assertEquals(0, new BigDecimal("1070").compareTo(balances.get(USDT).getAvailable()));
         assertEquals(0, new BigDecimal("14.5").compareTo(balances.get(ETH).getAvailable()));
@@ -346,19 +343,4 @@ private PositionDTO getPositionDTO(final long uid) {
         }
     }
 
-    /**
-     * Returns the updated balances of the trade account.
-     *
-     * @return balances
-     */
-    private Map<CurrencyDTO, BalanceDTO> getBalances() {
-        return userService.getUser()
-                .map(userDTO -> userDTO.getAccounts()
-                .get("trade")
-                .getBalances()
-                .stream()
-                .collect(Collectors.toMap(BalanceDTO::getCurrency, Function.identity())))
-                .orElse(Collections.emptyMap());
-    }
-
 }