Skip to content

Commit

Permalink
Merge branch 'development' of github.com:cassandre-tech/cassandre-tra…
Browse files Browse the repository at this point in the history 
…ding-bot into development
  • Loading branch information
@straumat
straumat committed Jan 8, 2022
2 parents 9bf9cff + 7efa926 commit d0c512b
Show file tree
Hide file tree
Showing 2 changed files with 34 additions and 28 deletions.
2 changes: 1 addition & 1 deletion ...ure/src/main/java/tech/cassandre/trading/bot/configuration/ExchangeAutoConfiguration.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ public void configure() {
// Force login to check credentials.
logger.info("Exchange connection with {} driver.", exchangeParameters.getDriverClassName());
xChangeAccountService.getAccountInfo();
logger.info("Exchange connection with username {} successful (Dry mode: {} / Sandbox: {}.)",
logger.info("Exchange connection with username {} successful (Dry mode: {} / Sandbox: {})",
exchangeParameters.getUsername(),
exchangeParameters.getModes().getDry(),
exchangeParameters.getModes().getSandbox());
Expand Down
60 changes: 33 additions & 27 deletions ...e/src/main/java/tech/cassandre/trading/bot/configuration/StrategiesAutoConfiguration.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -140,26 +140,32 @@ public void configure() {
final Optional<UserDTO> user = userService.getUser();
if (user.isEmpty()) {
throw new ConfigurationException("Impossible to retrieve your user information",
"Impossible to retrieve your user information - Check logs.");
"Impossible to retrieve your user information - Check logs");
} else {
logger.info("Available accounts on the exchange:");
user.get()
.getAccounts()
.values()
.forEach(account -> {
logger.info("- Account id / name: {} / {}.",
account.getAccountId(),
account.getName());
account.getBalances()
.stream()
.filter(balance -> balance.getAvailable().compareTo(ZERO) != 0)
.forEach(balance -> logger.info(" - {} {}.", balance.getAvailable(), balance.getCurrency()));
});
if (user.get().getAccounts().isEmpty()) {
// We were able to retrieve the user from the exchange but no account was found.
throw new ConfigurationException("User information retrieved but no associated accounts found",
"Check the permissions you set on the API you created");
} else {
logger.info("Available accounts on the exchange:");
user.get()
.getAccounts()
.values()
.forEach(account -> {
logger.info("- Account id / name: {} / {}.",
account.getAccountId(),
account.getName());
account.getBalances()
.stream()
.filter(balance -> balance.getAvailable().compareTo(ZERO) != 0)
.forEach(balance -> logger.info(" - {} {}.", balance.getAvailable(), balance.getCurrency()));
});
}
}

// Check that there is at least one strategy.
if (strategies.isEmpty()) {
throw new ConfigurationException("No strategy found", "You must have one class with @CassandreStrategy annotation.");
throw new ConfigurationException("No strategy found", "You must have one class with @CassandreStrategy annotation");
}

// Check that all strategies extends CassandreStrategyInterface.
Expand Down Expand Up @@ -270,7 +276,7 @@ public void configure() {
final StrategyDTO strategyDTO = strategyMapper.mapToStrategyDTO(existingStrategy);
strategyDTO.initializeLastPositionIdUsed(positionRepository.getLastPositionIdUsedByStrategy(strategyDTO.getId()));
strategy.setStrategy(strategyDTO);
logger.debug("Strategy updated in database: {}", existingStrategy);
logger.debug("Strategy updated in database: {}.", existingStrategy);
}, () -> {
// Creation.
Strategy newStrategy = new Strategy();
Expand All @@ -283,7 +289,7 @@ public void configure() {
if (strategy instanceof BasicTa4jCassandreStrategy) {
newStrategy.setType(BASIC_TA4J_STRATEGY);
}
logger.debug("Strategy created in database: {}", newStrategy);
logger.debug("Strategy created in database: {}.", newStrategy);
StrategyDTO strategyDTO = strategyMapper.mapToStrategyDTO(strategyRepository.save(newStrategy));
strategyDTO.initializeLastPositionIdUsed(positionRepository.getLastPositionIdUsedByStrategy(strategyDTO.getId()));
strategy.setStrategy(strategyDTO);
Expand All @@ -306,11 +312,11 @@ public void configure() {
strategy.initialize();

// Connecting flux to strategy.
connectableAccountFlux.subscribe(strategy::accountsUpdates, throwable -> logger.error("AccountsUpdates failing: {}", throwable.getMessage()));
connectablePositionFlux.subscribe(strategy::positionsUpdates, throwable -> logger.error("PositionsUpdates failing: {}", throwable.getMessage()));
connectableOrderFlux.subscribe(strategy::ordersUpdates, throwable -> logger.error("OrdersUpdates failing: {}", throwable.getMessage()));
connectableTradeFlux.subscribe(strategy::tradesUpdates, throwable -> logger.error("TradesUpdates failing: {}", throwable.getMessage()));
connectableTickerFlux.subscribe(strategy::tickersUpdates, throwable -> logger.error("TickersUpdates failing: {}", throwable.getMessage()));
connectableAccountFlux.subscribe(strategy::accountsUpdates, throwable -> logger.error("AccountsUpdates failing: {}.", throwable.getMessage()));
connectablePositionFlux.subscribe(strategy::positionsUpdates, throwable -> logger.error("PositionsUpdates failing: {}.", throwable.getMessage()));
connectableOrderFlux.subscribe(strategy::ordersUpdates, throwable -> logger.error("OrdersUpdates failing: {}.", throwable.getMessage()));
connectableTradeFlux.subscribe(strategy::tradesUpdates, throwable -> logger.error("TradesUpdates failing: {}.", throwable.getMessage()));
connectableTickerFlux.subscribe(strategy::tickersUpdates, throwable -> logger.error("TickersUpdates failing: {}.", throwable.getMessage()));
});

// Start flux.
Expand Down Expand Up @@ -344,7 +350,7 @@ private void loadImportedTickers() {
getFilesToLoad()
.parallelStream()
.filter(resource -> resource.getFilename() != null)
.peek(resource -> logger.info("Importing file {}", resource.getFilename()))
.peek(resource -> logger.info("Importing file {}.", resource.getFilename()))
.forEach(resource -> {
try {
// Insert the tickers in database.
Expand All @@ -354,15 +360,15 @@ private void loadImportedTickers() {
.build()
.parse()
.forEach(importedTicker -> {
logger.debug("Importing ticker {}", importedTicker);
logger.debug("Importing ticker {}.", importedTicker);
importedTicker.setId(counter.incrementAndGet());
importedTickersRepository.save(importedTicker);
});
} catch (IOException e) {
logger.error("Impossible to load imported tickers: {}", e.getMessage());
logger.error("Impossible to load imported tickers: {}.", e.getMessage());
}
});
logger.info("{} tickers imported", importedTickersRepository.count());
logger.info("{} tickers imported.", importedTickersRepository.count());
}

/**
Expand All @@ -376,7 +382,7 @@ public List<Resource> getFilesToLoad() {
final Resource[] resources = resolver.getResources("classpath*:" + TICKERS_FILE_PREFIX + "*" + TICKERS_FILE_SUFFIX);
return Arrays.asList(resources);
} catch (IOException e) {
logger.error("Impossible to load imported tickers: {}", e.getMessage());
logger.error("Impossible to load imported tickers: {}.", e.getMessage());
}
return Collections.emptyList();
}
Expand Down

0 comments on commit d0c512b

Please sign in to comment.