diff --git a/back/spring/src/main/java/com/robotrader/spring/model/log/PortfolioHistoryLog.java b/back/spring/src/main/java/com/robotrader/spring/model/log/PortfolioHistoryLog.java index ca87c86a..d1cb73ad 100644 --- a/back/spring/src/main/java/com/robotrader/spring/model/log/PortfolioHistoryLog.java +++ b/back/spring/src/main/java/com/robotrader/spring/model/log/PortfolioHistoryLog.java @@ -36,4 +36,6 @@ public class PortfolioHistoryLog { @NotNull @Column(nullable = false) private LocalDateTime timestamp; + + private String logType; } diff --git a/back/spring/src/main/java/com/robotrader/spring/service/ChartService.java b/back/spring/src/main/java/com/robotrader/spring/service/ChartService.java index 89bef7ab..b6d3051d 100644 --- a/back/spring/src/main/java/com/robotrader/spring/service/ChartService.java +++ b/back/spring/src/main/java/com/robotrader/spring/service/ChartService.java @@ -75,12 +75,10 @@ public ChartDataDTO transformBackTestDTOtoChartDataDTO(BackTestResultDTO backTes .collect(Collectors.toList()); List sortedLabels = new ArrayList<>(); -// List sortedCapitalAbsoluteData = new ArrayList<>(); List sortedPercentChangeList = new ArrayList<>(); for (int index : indices) { sortedLabels.add(labels.get(index)); -// sortedCapitalAbsoluteData.add(capitalAbsoluteData.get(index)); sortedPercentChangeList.add(percentChangeList.get(index)); } @@ -93,7 +91,7 @@ public ChartDataDTO transformBackTestDTOtoChartDataDTO(BackTestResultDTO backTes } ChartDatasetDTO capitalDataset = new ChartDatasetDTO("Capital", capitalAbsoluteData, "y-axis-1"); - ChartDatasetDTO percentChangeDataset = new ChartDatasetDTO("Percent Change", capitalPercentChangeData, "y-axis-2"); + ChartDatasetDTO percentChangeDataset = new ChartDatasetDTO("Performance", capitalPercentChangeData, "y-axis-2"); return new ChartDataDTO(sortedLabels, Arrays.asList(capitalDataset, percentChangeDataset)); } @@ -114,19 +112,25 @@ public ChartDataDTO transformPortfolioHistoryLogtoChartDataDTO(List 0) { portfolio.setCurrentValue(newUnitPrice.multiply(portfolio.getAllocatedUnitQty())); save(portfolio); - portfolioHistoryLogService.log(portfolio); + portfolioHistoryLogService.log(portfolio, "Trade"); } }); } diff --git a/back/spring/src/main/java/com/robotrader/spring/service/interfaces/IPortfolioHistoryLogService.java b/back/spring/src/main/java/com/robotrader/spring/service/interfaces/IPortfolioHistoryLogService.java index 4e441149..be2736c0 100644 --- a/back/spring/src/main/java/com/robotrader/spring/service/interfaces/IPortfolioHistoryLogService.java +++ b/back/spring/src/main/java/com/robotrader/spring/service/interfaces/IPortfolioHistoryLogService.java @@ -8,11 +8,9 @@ import java.util.List; public interface IPortfolioHistoryLogService { - @Transactional void save(PortfolioHistoryLog portfolioHistoryLog); - @Transactional - void log(Portfolio portfolio); + void log(Portfolio portfolio, String logType); List getPortfolioHistoryLog(String username, PortfolioTypeEnum portfolioType); } diff --git a/back/spring/src/main/java/com/robotrader/spring/service/log/PortfolioHistoryLogService.java b/back/spring/src/main/java/com/robotrader/spring/service/log/PortfolioHistoryLogService.java index 9e71fe94..1b5d77b9 100644 --- a/back/spring/src/main/java/com/robotrader/spring/service/log/PortfolioHistoryLogService.java +++ b/back/spring/src/main/java/com/robotrader/spring/service/log/PortfolioHistoryLogService.java @@ -32,12 +32,13 @@ public void save(PortfolioHistoryLog portfolioHistoryLog) { @Override @Transactional - public void log(Portfolio portfolio) { + public void log(Portfolio portfolio, String logType) { PortfolioHistoryLog logEntry = new PortfolioHistoryLog(); logEntry.setPortfolio(portfolio); logEntry.setTimestamp(LocalDateTime.now()); logEntry.setCurrentValue(portfolio.getCurrentValue()); + logEntry.setLogType(logType); save(logEntry); } diff --git a/front/react/public/index.html b/front/react/public/index.html index aa069f27..40ef5cdc 100644 --- a/front/react/public/index.html +++ b/front/react/public/index.html @@ -24,7 +24,7 @@ work correctly both with client-side routing and a non-root public URL. Learn how to configure a non-root public URL by running `npm run build`. --> - React App + FourQuant.ai