|
21 | 21 | import org.springframework.data.domain.Pageable; |
22 | 22 | import org.springframework.transaction.annotation.Transactional; |
23 | 23 | import com.synergyx.trading.service.backtestService.client.BacktestClientService; |
24 | | - |
| 24 | +import static com.synergyx.trading.util.NumberUtil.round; |
25 | 25 | import java.time.LocalDate; |
26 | 26 | import java.time.LocalDateTime; |
27 | 27 | import java.util.List; |
@@ -97,15 +97,15 @@ public BacktestResponseDTO.BacktestExecutionDTO runBacktest(Long userId, Long pa |
97 | 97 | .matchedCount(saved.getMatchedCount()) |
98 | 98 | .startDate(saved.getStartDate()) |
99 | 99 | .endDate(saved.getEndDate()) |
100 | | - .winRate(saved.getWinRate()) |
101 | | - .averageReturn(saved.getAverageReturn()) |
102 | | - .maxReturn(saved.getMaxReturn()) |
| 100 | + .winRate(round(saved.getWinRate())) |
| 101 | + .averageReturn(round(saved.getAverageReturn())) |
| 102 | + .maxReturn(round(saved.getMaxReturn())) |
103 | 103 | .maxReturnDate(saved.getMaxReturnDate()) |
104 | | - .minReturn(saved.getMinReturn()) |
| 104 | + .minReturn(round(saved.getMinReturn())) |
105 | 105 | .minReturnDate(saved.getMinReturnDate()) |
106 | | - .totalReturn(saved.getTotalReturn()) |
| 106 | + .totalReturn(round(saved.getTotalReturn())) |
107 | 107 | .lastMatchedDate(saved.getLastMatchedDate()) |
108 | | - .lastMatchedReturn(saved.getLastMatchedReturn()) |
| 108 | + .lastMatchedReturn(round(saved.getLastMatchedReturn())) |
109 | 109 | .highlightRange( |
110 | 110 | (saved.getHighlightFromDate() != null && saved.getHighlightToDate() != null) |
111 | 111 | ? BacktestResponseDTO.HighlightRangeDTO.builder() |
@@ -139,16 +139,16 @@ public BacktestResponseDTO.BacktestResultDetailDTO getBacktestResultDetail(Long |
139 | 139 | .executedAt(backtest.getExecutedAt()) |
140 | 140 | .startDate(backtest.getStartDate()) |
141 | 141 | .endDate(backtest.getEndDate()) |
142 | | - .winRate(backtest.getWinRate()) |
143 | | - .averageReturn(backtest.getAverageReturn()) |
| 142 | + .winRate(round(backtest.getWinRate())) |
| 143 | + .averageReturn(round(backtest.getAverageReturn())) |
144 | 144 | .matchedCount(backtest.getMatchedCount()) |
145 | 145 | .maxReturnDate(backtest.getMaxReturnDate()) |
146 | | - .maxReturn(backtest.getMaxReturn()) |
| 146 | + .maxReturn(round(backtest.getMaxReturn())) |
147 | 147 | .minReturnDate(backtest.getMinReturnDate()) |
148 | | - .minReturn(backtest.getMinReturn()) |
| 148 | + .minReturn(round(backtest.getMinReturn())) |
149 | 149 | .lastMatchedDate(backtest.getLastMatchedDate()) |
150 | | - .lastMatchedReturn(backtest.getLastMatchedReturn()) |
151 | | - .totalReturn(backtest.getTotalReturn()) |
| 150 | + .lastMatchedReturn(round(backtest.getLastMatchedReturn())) |
| 151 | + .totalReturn(round(backtest.getTotalReturn())) |
152 | 152 | .highlightRange( |
153 | 153 | (backtest.getHighlightFromDate() != null && backtest.getHighlightToDate() != null) |
154 | 154 | ? BacktestResponseDTO.HighlightRangeDTO.builder() |
@@ -178,8 +178,8 @@ public Page<BacktestResponseDTO.BacktestSummaryDTO> getBacktestResultList(Long u |
178 | 178 | .backtestId(bt.getId()) |
179 | 179 | .stockName(bt.getStock().getName()) |
180 | 180 | .executedAt(bt.getExecutedAt()) |
181 | | - .winRate(bt.getWinRate()) |
182 | | - .averageReturn(bt.getAverageReturn()) |
| 181 | + .winRate(round(bt.getWinRate())) |
| 182 | + .averageReturn(round(bt.getAverageReturn())) |
183 | 183 | .matchedCount(bt.getMatchedCount()) |
184 | 184 | .build()); |
185 | 185 | } |
|
0 commit comments