Merge pull request #84 from SynergyX-AI-Pattern/feat/#83_backtest_candle_api

Soomxn · web-flow · commit a3abfab5a35f · 2025-09-02T19:20:06.000+09:00
Feat/#83 backtest candle api
diff --git a/src/main/java/com/synergyx/trading/apiPayload/code/status/ErrorStatus.java b/src/main/java/com/synergyx/trading/apiPayload/code/status/ErrorStatus.java
@@ -43,6 +43,7 @@ public enum ErrorStatus implements BaseErrorCode {
     BACKTEST_NOT_FOUND(HttpStatus.NOT_FOUND, "BACKTEST404", "해당 백테스트 결과가 존재하지 않습니다."),
     BACKTEST_PERIOD_EXCEEDS_LIMIT(HttpStatus.BAD_REQUEST, "BACKTEST400", "백테스트 기간은 최대 5년까지 가능합니다."),
     FASTAPI_BACKTEST_FAILED(HttpStatus.INTERNAL_SERVER_ERROR, "BACKTEST502", "FastAPI 백테스트 서버 호출에 실패했습니다."),
+    HIGHLIGHT_RANGE_NOT_FOUND(HttpStatus.NOT_FOUND, "BACKTEST4041", "해당 백테스트 결과에 하이라이트 구간이 존재하지 않습니다."),
 
     // 캔들 데이터 관련 예외 처리
     CANDLE_DATA_NOT_FOUND(HttpStatus.NOT_FOUND, "CANDLE404", "캔들 데이터가 존재하지 않습니다."),
diff --git a/src/main/java/com/synergyx/trading/controller/BacktestController.java b/src/main/java/com/synergyx/trading/controller/BacktestController.java
@@ -1,7 +1,9 @@
 package com.synergyx.trading.controller;
 
 import com.synergyx.trading.apiPayload.ApiResponse;
+import com.synergyx.trading.apiPayload.code.status.ErrorStatus;
 import com.synergyx.trading.apiPayload.code.status.SuccessStatus;
+import com.synergyx.trading.apiPayload.exception.GeneralException;
 import com.synergyx.trading.dto.backtest.BacktestRequestDTO;
 import com.synergyx.trading.dto.backtest.BacktestResponseDTO;
 import com.synergyx.trading.service.backtestService.BacktestService;
@@ -42,7 +44,7 @@ public ResponseEntity<?> runBacktest(
     // 과거 백테스팅 결과 상세 조회
     @Operation(summary = "백테스팅 결과 상세 조회", description = "해당 백테스팅 결과의 상세 정보를 조회합니다.")
     @GetMapping("/results/{backtestId}")
-    public ResponseEntity<?>  getBacktestResultDetail(
+    public ResponseEntity<?> getBacktestResultDetail(
             @Parameter
             @PathVariable Long backtestId) {
         BacktestResponseDTO.BacktestResultDetailDTO dto = backtestService.getBacktestResultDetail(TEMP_USER_ID, backtestId);
@@ -52,7 +54,7 @@ public ResponseEntity<?>  getBacktestResultDetail(
     // 최근 백테스팅 결과 목록 조회
     @Operation(summary = "백테스팅 결과 목록 조회", description = "최근 백테스팅 결과 목록을 조회합니다.")
     @GetMapping("/results")
-    public ResponseEntity<?>  getBacktestResultList(
+    public ResponseEntity<?> getBacktestResultList(
             @RequestParam(defaultValue = "1") int page,
             @RequestParam(defaultValue = "10") int size) {
 
@@ -70,4 +72,28 @@ public ResponseEntity<?>  getBacktestResultList(
 
         return ResponseEntity.ok(ApiResponse.onSuccess(dto));
     }
+
+    // 백테스트 결과 차트 조회
+    @Operation(summary = "백테스팅 결과 차트 조회", description = "해당 백테스팅 결과의 상세 화면에 나타낼 캔들 데이터를 조회합니다. (조회 구간: 최대 수익률 구간, 마진은 선택 사항)")
+    @GetMapping("/results/{backtestId}/candles")
+    public ResponseEntity<?> getBacktestCandles(
+            @Parameter(description = "백테스트 ID")
+            @PathVariable Long backtestId,
+            @Parameter(
+                    description = "기간의 앞뒤 여유 간격(기본값: 20, 최소: 0)"
+            )
+            @RequestParam(defaultValue = "20") int margin
+    ) {
+        // 마진 입력값 검증
+        if (margin < 0) {
+            throw new GeneralException(ErrorStatus._BAD_REQUEST);
+        }
+        var candles = backtestService.getBacktestResultCandles(TEMP_USER_ID, backtestId, margin);
+
+        return ResponseEntity.ok(ApiResponse.onSuccess(
+                candles,
+                SuccessStatus.SUCCESS_CHART_DATA.getCode(),
+                SuccessStatus.SUCCESS_CHART_DATA.getMessage()
+        ));
+    }
 }
diff --git a/src/main/java/com/synergyx/trading/dto/backtest/BacktestResponseDTO.java b/src/main/java/com/synergyx/trading/dto/backtest/BacktestResponseDTO.java
@@ -1,10 +1,12 @@
 package com.synergyx.trading.dto.backtest;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.synergyx.trading.enums.PeriodUnit;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.util.List;
 
 public class BacktestResponseDTO  {
@@ -46,7 +48,20 @@ public static class BacktestExecutionDTO {
         private Double totalReturn; // 모든 매칭 결과 누적 수익률
         private LocalDate lastMatchedDate; // 마지막 패턴 발생일
         private Double lastMatchedReturn; // 마지막 패턴 발생시 수익률
+        private HighlightRangeDTO highlightRange; // 최대 수익률 하이라이트 범위
+        private PeriodUnit periodUnit; // 단위
     }
+
+    // 백테스팅 최대 수익률 하이라이트 부분
+    @Getter
+    @Builder
+    @NoArgsConstructor
+    @AllArgsConstructor
+    public static class HighlightRangeDTO  {
+        private LocalDateTime fromDate;
+        private LocalDateTime toDate;
+    }
+
     // 백테스팅 결과 상세 조회
     @Getter
     @Builder
@@ -69,6 +84,8 @@ public static class BacktestResultDetailDTO {
         private Double totalReturn; // 모든 매칭 결과 누적 수익률
         private LocalDate lastMatchedDate; // 마지막 패턴 발생일
         private Double lastMatchedReturn; // 마지막 패턴 발생시 수익률
+        private HighlightRangeDTO highlightRange; // 최대 수익률 하이라이트 범위
+        private PeriodUnit periodUnit; // 단위
     }
 
     // 백테스팅 결과 목록 조회용 content
@@ -106,5 +123,4 @@ public static class PageInfoDTO {
             private int totalPages; // 전체 페이지 수
         }
     }
-
 }
diff --git a/src/main/java/com/synergyx/trading/model/Backtest.java b/src/main/java/com/synergyx/trading/model/Backtest.java
@@ -1,9 +1,11 @@
 package com.synergyx.trading.model;
 
+import com.synergyx.trading.enums.PeriodUnit;
 import com.synergyx.trading.model.common.BaseEntity;
 import jakarta.persistence.*;
 import lombok.*;
 import java.time.LocalDate;
+import java.time.LocalDateTime;
 
 @Entity
 @Table(
@@ -77,4 +79,14 @@ public class Backtest extends BaseEntity {
 
     @Column(nullable = false)
     private Double lastMatchedReturn; // 마지막 패턴 발생시 수익률
+
+    @Column(name = "highlight_from_date")
+    private LocalDateTime highlightFromDate; // 최대 수익률 발생 시 매칭 시작일
+
+    @Column(name = "highlight_to_date")
+    private LocalDateTime highlightToDate; // 최대 수익률 발생 시 매칭 종료일
+
+    @Column(name = "period_unit", nullable = false)
+    @Enumerated(EnumType.STRING)
+    private PeriodUnit periodUnit; // 기간 단위
 }
diff --git a/src/main/java/com/synergyx/trading/model/StockOhlcv1h.java b/src/main/java/com/synergyx/trading/model/StockOhlcv1h.java
@@ -1,6 +1,7 @@
 package com.synergyx.trading.model;
 
 import com.synergyx.trading.model.common.BaseEntity;
+import com.synergyx.trading.model.common.Ohlcv;
 import jakarta.persistence.*;
 import lombok.*;
 
@@ -18,7 +19,7 @@
 @NoArgsConstructor
 @AllArgsConstructor
 @Builder
-public class StockOhlcv1h extends BaseEntity {
+public class StockOhlcv1h extends BaseEntity implements Ohlcv {
 
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
diff --git a/src/main/java/com/synergyx/trading/repository/BacktestRepository.java b/src/main/java/com/synergyx/trading/repository/BacktestRepository.java
@@ -32,4 +32,7 @@ Optional<Backtest> findTop1ByPatternIdAndStockIdAndUserIdOrderByExecutedAtDesc(
 
     // 특정 패턴에 대한 최근 3개 백테스트 조회 (패턴 목록 조회용)
     List<Backtest> findTop3ByPatternIdAndUserIdOrderByExecutedAtDescIdDesc(Long patternId, Long userId);
+
+    // 사용자의 백테스팅 정보 조회
+    Optional<Backtest> findByIdAndUserId(Long backtestId, Long userId);
 }
diff --git a/src/main/java/com/synergyx/trading/repository/StockOhlcv1dRepository.java b/src/main/java/com/synergyx/trading/repository/StockOhlcv1dRepository.java
@@ -17,4 +17,11 @@ public interface StockOhlcv1dRepository extends JpaRepository<StockOhlcv1d, Long
 
     // 상위 63개 ohlcv 조회 (약 3개월)
     List<StockOhlcv1d> findTop63ByStockIdOrderByTimestampDesc(Long stockId);
+
+    // 기간별 일봉 조회 (오름차순 정렬)
+    List<StockOhlcv1d> findByStockIdAndTimestampBetweenOrderByTimestampAsc(
+            Long stockId,
+            LocalDateTime startDate,
+            LocalDateTime endDate
+    );
 }
diff --git a/src/main/java/com/synergyx/trading/repository/StockOhlcv1hRepository.java b/src/main/java/com/synergyx/trading/repository/StockOhlcv1hRepository.java
@@ -4,11 +4,17 @@
 import org.springframework.data.jpa.repository.JpaRepository;
 
 import java.time.LocalDateTime;
+import java.util.List;
 import java.util.Optional;
 
 public interface StockOhlcv1hRepository extends JpaRepository<StockOhlcv1h, Long> {
 
     // 중복 방지용
     Optional<StockOhlcv1h> findByStock_IdAndTimestamp(Long stockId, LocalDateTime timestamp);
+
+    // 기간별 시간봉 조회 (오름차순 정렬)
+    List<StockOhlcv1h> findByStockIdAndTimestampBetweenOrderByTimestampAsc(
+            Long stockId, LocalDateTime start, LocalDateTime end
+    );
 }
 
diff --git a/src/main/java/com/synergyx/trading/service/backtestService/BacktestService.java b/src/main/java/com/synergyx/trading/service/backtestService/BacktestService.java
@@ -2,8 +2,11 @@
 
 import com.synergyx.trading.dto.backtest.BacktestRequestDTO;
 import com.synergyx.trading.dto.backtest.BacktestResponseDTO;
+import com.synergyx.trading.dto.stockDetail.StockCandleResponseDTO;
 import org.springframework.data.domain.Page;
 
+import java.util.List;
+
 public interface BacktestService {
     // 백테스팅 실행
     BacktestResponseDTO.BacktestExecutionDTO runBacktest(Long userId, Long patternId, Long stockId, BacktestRequestDTO request);
@@ -14,4 +17,6 @@ public interface BacktestService {
     // 백테스팅 결과 목록 조회
     Page<BacktestResponseDTO.BacktestSummaryDTO> getBacktestResultList(Long userId, int page, int size);
 
+    // 백테스팅 결과 차트 조회
+    List<StockCandleResponseDTO> getBacktestResultCandles(Long userId, Long backtestId, int margin);
 }
diff --git a/src/main/java/com/synergyx/trading/service/backtestService/BacktestServiceImpl.java b/src/main/java/com/synergyx/trading/service/backtestService/BacktestServiceImpl.java
@@ -3,6 +3,7 @@
 import com.synergyx.trading.apiPayload.exception.GeneralException;
 import com.synergyx.trading.dto.backtest.BacktestRequestDTO;
 import com.synergyx.trading.dto.backtest.BacktestResponseDTO;
+import com.synergyx.trading.dto.stockDetail.StockCandleResponseDTO;
 import com.synergyx.trading.model.Backtest;
 import com.synergyx.trading.model.Pattern;
 import com.synergyx.trading.model.Stock;
@@ -11,6 +12,7 @@
 import com.synergyx.trading.repository.PatternRepository;
 import com.synergyx.trading.repository.StockRepository;
 import com.synergyx.trading.repository.UserRepository;
+import com.synergyx.trading.service.stockService.candle.StockCandleQueryService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
@@ -21,6 +23,8 @@
 import com.synergyx.trading.service.backtestService.client.BacktestClientService;
 
 import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.util.List;
 
 @Service
 @RequiredArgsConstructor
@@ -30,6 +34,7 @@ public class BacktestServiceImpl implements BacktestService {
     private final StockRepository stockRepository;
     private final UserRepository userRepository;
     private final BacktestClientService backtestClientService;
+    private final StockCandleQueryService stockCandleQueryService;
 
     // 백테스팅 실행
     @Override
@@ -75,6 +80,14 @@ public BacktestResponseDTO.BacktestExecutionDTO runBacktest(Long userId, Long pa
                 .lastMatchedDate(result.getLastMatchedDate())
                 .lastMatchedReturn(result.getLastMatchedReturn())
                 .totalReturn(result.getTotalReturn())
+                // null 허용
+                .highlightFromDate(
+                        result.getHighlightRange() != null ? result.getHighlightRange().getFromDate() : null
+                )
+                .highlightToDate(
+                        result.getHighlightRange() != null ? result.getHighlightRange().getToDate() : null
+                )
+                .periodUnit(pattern.getPeriodUnit())
                 .build());
 
         return BacktestResponseDTO.BacktestExecutionDTO.builder()
@@ -93,6 +106,15 @@ public BacktestResponseDTO.BacktestExecutionDTO runBacktest(Long userId, Long pa
                 .totalReturn(saved.getTotalReturn())
                 .lastMatchedDate(saved.getLastMatchedDate())
                 .lastMatchedReturn(saved.getLastMatchedReturn())
+                .highlightRange(
+                        (saved.getHighlightFromDate() != null && saved.getHighlightToDate() != null)
+                                ? BacktestResponseDTO.HighlightRangeDTO.builder()
+                                .fromDate(saved.getHighlightFromDate())
+                                .toDate(saved.getHighlightToDate())
+                                .build()
+                                : null
+                )
+                .periodUnit(saved.getPeriodUnit())
                 .build();
     }
 
@@ -101,12 +123,13 @@ public BacktestResponseDTO.BacktestExecutionDTO runBacktest(Long userId, Long pa
     @Transactional(readOnly = true)
     public BacktestResponseDTO.BacktestResultDetailDTO getBacktestResultDetail(Long userId, Long backtestId) {
 
-        // 사용자 조회
-        User user = userRepository.findById(userId)
-                .orElseThrow(() -> new GeneralException(ErrorStatus.USER_NOT_FOUND));
+        // 유저 존재 여부 확인
+        if (!userRepository.existsById(userId)) {
+            throw new GeneralException(ErrorStatus.USER_NOT_FOUND);
+        }
 
         // 백테스팅 조회
-        Backtest backtest = backtestRepository.findById(backtestId)
+        Backtest backtest = backtestRepository.findByIdAndUserId(backtestId, userId)
                 .orElseThrow(() -> new GeneralException(ErrorStatus.BACKTEST_NOT_FOUND));
 
         return BacktestResponseDTO.BacktestResultDetailDTO.builder()
@@ -126,6 +149,15 @@ public BacktestResponseDTO.BacktestResultDetailDTO getBacktestResultDetail(Long
                 .lastMatchedDate(backtest.getLastMatchedDate())
                 .lastMatchedReturn(backtest.getLastMatchedReturn())
                 .totalReturn(backtest.getTotalReturn())
+                .highlightRange(
+                        (backtest.getHighlightFromDate() != null && backtest.getHighlightToDate() != null)
+                                ? BacktestResponseDTO.HighlightRangeDTO.builder()
+                                .fromDate(backtest.getHighlightFromDate())
+                                .toDate(backtest.getHighlightToDate())
+                                .build()
+                                : null
+                )
+                .periodUnit(backtest.getPeriodUnit())
                 .build();
     }
 
@@ -134,9 +166,10 @@ public BacktestResponseDTO.BacktestResultDetailDTO getBacktestResultDetail(Long
     @Transactional(readOnly = true)
     public Page<BacktestResponseDTO.BacktestSummaryDTO> getBacktestResultList(Long userId, int page, int size) {
 
-        // 사용자 조회
-        User user = userRepository.findById(userId)
-                .orElseThrow(() -> new GeneralException(ErrorStatus.USER_NOT_FOUND));
+        // 유저 존재 여부 확인
+        if (!userRepository.existsById(userId)) {
+            throw new GeneralException(ErrorStatus.USER_NOT_FOUND);
+        }
 
         Pageable pageable = PageRequest.of(page, size, Sort.by("executedAt").descending());
         Page<Backtest> resultPage = backtestRepository.findByUserId(userId, pageable);
@@ -151,4 +184,38 @@ public Page<BacktestResponseDTO.BacktestSummaryDTO> getBacktestResultList(Long u
                 .build());
     }
 
-}
+    // 백테스팅 결과 차트 조회
+    @Override
+    @Transactional(readOnly = true)
+    public List<StockCandleResponseDTO> getBacktestResultCandles(Long userId, Long backtestId, int margin) {
+
+        // 유저 존재 여부 확인
+        if (!userRepository.existsById(userId)) {
+            throw new GeneralException(ErrorStatus.USER_NOT_FOUND);
+        }
+
+        Backtest backtest = backtestRepository.findByIdAndUserId(backtestId, userId)
+                .orElseThrow(() -> new GeneralException(ErrorStatus.BACKTEST_NOT_FOUND));
+
+        if (backtest.getHighlightFromDate() == null || backtest.getHighlightToDate() == null) {
+            throw new GeneralException(ErrorStatus.HIGHLIGHT_RANGE_NOT_FOUND);
+        }
+
+        Long stockId = backtest.getStock().getId();
+        LocalDateTime from = backtest.getHighlightFromDate();
+        LocalDateTime to = backtest.getHighlightToDate();
+
+        return switch (backtest.getPeriodUnit()) {
+            case DAY -> stockCandleQueryService.getBacktestDailyCandles(
+                    stockId,
+                    from.toLocalDate().minusDays(margin),
+                    to.toLocalDate().plusDays(margin)
+            );
+            case HOUR -> stockCandleQueryService.getBacktestHourlyCandles(
+                    stockId,
+                    from.minusHours(margin),
+                    to.plusHours(margin)
+            );
+        };
+    }
+}
diff --git a/src/main/java/com/synergyx/trading/service/stockService/candle/StockCandleQueryService.java b/src/main/java/com/synergyx/trading/service/stockService/candle/StockCandleQueryService.java
@@ -2,10 +2,18 @@
 
 import com.synergyx.trading.dto.stockDetail.StockCandleResponseDTO;
 
+import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.util.List;
 
 public interface StockCandleQueryService {
 
     // 캔들 데이터 조회
     List<StockCandleResponseDTO> getCandles(Long stockId, String interval);
+
+    // 백테스팅 결과 전용 캔들 데이터 조회
+    // 일봉
+    List<StockCandleResponseDTO> getBacktestDailyCandles(Long stockId, LocalDate startDate, LocalDate endDate);
+    // 시간봉
+    List<StockCandleResponseDTO> getBacktestHourlyCandles(Long stockId, LocalDateTime startDate, LocalDateTime endDate);
 }
diff --git a/src/main/java/com/synergyx/trading/service/stockService/candle/StockCandleQueryServiceImpl.java b/src/main/java/com/synergyx/trading/service/stockService/candle/StockCandleQueryServiceImpl.java

Original file line number	Diff line number	Diff line change
`@@ -32,4 +32,7 @@ Optional<Backtest> findTop1ByPatternIdAndStockIdAndUserIdOrderByExecutedAtDesc(`
`32`	`32`
`33`	`33`	`// 특정 패턴에 대한 최근 3개 백테스트 조회 (패턴 목록 조회용)`
`34`	`34`	`List<Backtest> findTop3ByPatternIdAndUserIdOrderByExecutedAtDescIdDesc(Long patternId, Long userId);`
	`35`	`+`
	`36`	`+ // 사용자의 백테스팅 정보 조회`
	`37`	`+ Optional<Backtest> findByIdAndUserId(Long backtestId, Long userId);`
`35`	`38`	`}`