Merge pull request #71 from onesimus-wiafe/SCRUM-62-portfolio-control…

…-and-access update ordervalidation
onesimus-wiafe · Aug 8, 2024 · a87c208 · a87c208
2 parents 7180fe8 + a3da697
commit a87c208
Showing 1 changed file with 14 additions and 2 deletions.
diff --git a/...java/com/joe/trading/order_processing/services/validation/OrderValidationServiceImpl.java b/...java/com/joe/trading/order_processing/services/validation/OrderValidationServiceImpl.java
@@ -97,8 +97,20 @@ private List<MarketData> getMarketDataFromExchange(String ticker, String exchang
 
  private List<MarketData> getMarketDataFromCache(String ticker, String exchanges) {
  return switch (AvailableExchanges.valueOf(exchanges.toUpperCase())) {
- case EXCHANGE1 -> List.of(this.marketDataRepo.getMarketData(ticker + "_EX1").orElse(null));
- case EXCHANGE2 -> List.of(this.marketDataRepo.getMarketData(ticker + "_EX2").orElse(null));
+ case EXCHANGE1 -> {
+ MarketData data = this.marketDataRepo.getMarketData(ticker + "_EX1").orElse(null);
+ if (data == null){
+ yield List.of();
+ }
+ else yield List.of(data);
+ }
+ case EXCHANGE2 -> {
+ MarketData data = this.marketDataRepo.getMarketData(ticker + "_EX2").orElse(null);
+ if (data == null){
+ yield List.of();
+ }
+ else yield List.of(data);
+ }
  case NONE -> List.of();
  case ALL -> {
  List<MarketData> data = getMarketDataFromCache(ticker, "EXCHANGE1");