Merge pull request #62 from CSID-DGU/feature/#16/backtesting-refactoring

[feat] : 백테스팅 관련 에러 처리 추가
CSID-DGU · Jun 9, 2024 · d69cc39 · d69cc39
2 parents 9fea88a + 6532865
commit d69cc39
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 3 deletions.
diff --git a/backend/src/main/java/org/dgu/backend/exception/BackTestingErrorResult.java b/backend/src/main/java/org/dgu/backend/exception/BackTestingErrorResult.java
@@ -9,7 +9,9 @@
 @Getter
 @RequiredArgsConstructor
 public enum BackTestingErrorResult implements BaseErrorCode {
-    NOT_FOUND_START_INDEX(HttpStatus.NOT_FOUND, "404", "시작 인덱스를 찾을 수 없습니다.");
+    NOT_FOUND_START_INDEX(HttpStatus.NOT_FOUND, "404", "시작 인덱스를 찾을 수 없습니다."),
+    START_DATE_AFTER_END_DATE(HttpStatus.BAD_REQUEST, "400", "시작일이 종료일보다 늦습니다."),
+    N_DAY_LONGER_THAN_M_DAY(HttpStatus.BAD_REQUEST, "400", "N일이 M일보다 큽니다.");
 
     private final HttpStatus httpStatus;
     private final String code;

diff --git a/backend/src/main/java/org/dgu/backend/service/BackTestingServiceImpl.java b/backend/src/main/java/org/dgu/backend/service/BackTestingServiceImpl.java
@@ -4,8 +4,7 @@
 import lombok.RequiredArgsConstructor;
 import org.dgu.backend.domain.*;
 import org.dgu.backend.dto.BackTestingDto;
-import org.dgu.backend.exception.PortfolioErrorResult;
-import org.dgu.backend.exception.PortfolioException;
+import org.dgu.backend.exception.*;
 import org.dgu.backend.repository.*;
 import org.dgu.backend.util.CandleUtil;
 import org.dgu.backend.util.DateUtil;
@@ -53,8 +52,17 @@ protected BackTestingDto.BackTestingResponse fetchBackTestingResult(String autho
         Candle candle = candleRepository.findByCandleName(stepInfo.getCandleName());
         LocalDateTime startDate = dateUtil.convertToLocalDateTime(stepInfo.getStartDate());
         LocalDateTime endDate = dateUtil.convertToLocalDateTime(stepInfo.getEndDate());
+        if (startDate.isAfter(endDate)) {
+            throw new BackTestingException(BackTestingErrorResult.START_DATE_AFTER_END_DATE);
+        }
+        if (stepInfo.getNDate() > stepInfo.getMDate()) {
+            throw new BackTestingException(BackTestingErrorResult.N_DAY_LONGER_THAN_M_DAY);
+        }
 
         List<CandleInfo> candles = candleInfoRepository.findFilteredCandleInfo(market, candle, startDate, endDate);
+        if (candles.isEmpty()) {
+            throw new CandleException(CandleErrorResult.NOT_FOUND_CANDLES);
+        }
         candles = candleUtil.removeDuplicatedCandles(candles);
 
         // 골든 크로스 지점 찾기

diff --git a/backend/src/main/java/org/dgu/backend/service/CandleInfoUpdater.java b/backend/src/main/java/org/dgu/backend/service/CandleInfoUpdater.java
@@ -4,6 +4,10 @@
 import org.dgu.backend.domain.Candle;
 import org.dgu.backend.domain.CandleInfo;
 import org.dgu.backend.domain.Market;
+import org.dgu.backend.exception.CandleErrorResult;
+import org.dgu.backend.exception.CandleException;
+import org.dgu.backend.exception.MarketErrorResult;
+import org.dgu.backend.exception.MarketException;
 import org.dgu.backend.repository.CandleInfoRepository;
 import org.dgu.backend.repository.CandleRepository;
 import org.dgu.backend.repository.MarketRepository;
@@ -28,7 +32,13 @@ public class CandleInfoUpdater {
     // 현재 시각을 기준으로 캔들 정보를 최신화하는 메서드
     public void ensureCandleInfoUpToDate(String koreanName, String candleName) {
         Market market = marketRepository.findByKoreanName(koreanName);
+        if (Objects.isNull(market)) {
+            throw new MarketException(MarketErrorResult.NOT_FOUND_MARKET);
+        }
         Candle candle = candleRepository.findByCandleName(candleName);
+        if (Objects.isNull(candle)) {
+            throw new CandleException(CandleErrorResult.NOT_FOUND_CANDLE);
+        }
 
         // 가장 최근 캔들 차트
         CandleInfo latestCandleInfo = candleInfoRepository.findTopByMarketAndCandleOrderByTimestampDesc(market, candle);