From 68712868d74c0e27274e5201b932b3afffd3082f Mon Sep 17 00:00:00 2001
From: Reto Kaul <gizmodus@gmail.com>
Date: Thu, 9 May 2024 10:44:29 +0200
Subject: [PATCH] Small fix

---
 .../calculator/portfolio-calculator.ts         | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/apps/api/src/app/portfolio/calculator/portfolio-calculator.ts b/apps/api/src/app/portfolio/calculator/portfolio-calculator.ts
index 1576e13cb..047adb063 100644
--- a/apps/api/src/app/portfolio/calculator/portfolio-calculator.ts
+++ b/apps/api/src/app/portfolio/calculator/portfolio-calculator.ts
@@ -1101,11 +1101,11 @@ export abstract class PortfolioCalculator {
     let netPerformanceAtStartDate;
     let netPerformanceWithCurrencyEffectAtStartDate;
     let netPerformanceInPercentageWithCurrencyEffectAtStartDate;
-    let investmentValuesWithCurrencyEffect = [];
+    let totalInvestmentValuesWithCurrencyEffect = [];
 
     for (let historicalDataItem of chartData) {
       if (
-        !isBefore(parseDate(historicalDataItem.date), start) &&
+        !isBefore(parseDate(historicalDataItem.date), subDays(start, 1)) &&
         !isAfter(parseDate(historicalDataItem.date), end)
       ) {
         if (!netPerformanceAtStartDate) {
@@ -1118,8 +1118,8 @@ export abstract class PortfolioCalculator {
             historicalDataItem.netPerformanceInPercentageWithCurrencyEffect;
         }
 
-        investmentValuesWithCurrencyEffect.push(
-          historicalDataItem.investmentValueWithCurrencyEffect
+        totalInvestmentValuesWithCurrencyEffect.push(
+          historicalDataItem.totalInvestmentValueWithCurrencyEffect
         );
 
         // TODO: Normalize remaining metrics
@@ -1131,10 +1131,12 @@ export abstract class PortfolioCalculator {
             historicalDataItem.netPerformanceWithCurrencyEffect -
             netPerformanceWithCurrencyEffectAtStartDate,
           netPerformanceInPercentageWithCurrencyEffect:
-            historicalDataItem.netPerformanceWithCurrencyEffect /
-            // TODO: This is not correct yet
-            (sum(investmentValuesWithCurrencyEffect) /
-              investmentValuesWithCurrencyEffect.length)
+            ((historicalDataItem.netPerformanceWithCurrencyEffect -
+              netPerformanceWithCurrencyEffectAtStartDate) /
+              // TODO: Not sure if this is correct
+              (sum(totalInvestmentValuesWithCurrencyEffect) /
+                totalInvestmentValuesWithCurrencyEffect.length)) *
+            100
         });
       }
     }