Improve calculation

apps/api/src/app/portfolio/calculator/portfolio-calculator.ts

@@ -1118,9 +1118,24 @@ export abstract class PortfolioCalculator {
             historicalDataItem.netPerformanceInPercentageWithCurrencyEffect;
         }
 
-        totalInvestmentValuesWithCurrencyEffect.push(
+        const netPerformanceWithCurrencyEffectSinceStartDate =
-          historicalDataItem.totalInvestmentValueWithCurrencyEffect
+          historicalDataItem.netPerformanceWithCurrencyEffect -
-        );
+          netPerformanceWithCurrencyEffectAtStartDate;
+
+        if (historicalDataItem.totalInvestmentValueWithCurrencyEffect > 0) {
+          totalInvestmentValuesWithCurrencyEffect.push(
+            historicalDataItem.totalInvestmentValueWithCurrencyEffect
+          );
+        }
+
+        const timeWeightedInvestmentValue =
+          totalInvestmentValuesWithCurrencyEffect.length > 0
+            ? sum(totalInvestmentValuesWithCurrencyEffect) /
+              totalInvestmentValuesWithCurrencyEffect.length
+            : 0;
+
+        // TODO: Not sure if this is correct
+        console.log(historicalDataItem.totalInvestmentValueWithCurrencyEffect);
 
         // TODO: Normalize remaining metrics
         newChartData.push({
@@ -1128,14 +1143,10 @@ export abstract class PortfolioCalculator {
           netPerformance:
             historicalDataItem.netPerformance - netPerformanceAtStartDate,
           netPerformanceWithCurrencyEffect:
-            historicalDataItem.netPerformanceWithCurrencyEffect -
+            netPerformanceWithCurrencyEffectSinceStartDate,
-            netPerformanceWithCurrencyEffectAtStartDate,
           netPerformanceInPercentageWithCurrencyEffect:
-            ((historicalDataItem.netPerformanceWithCurrencyEffect -
+            (netPerformanceWithCurrencyEffectSinceStartDate /
-              netPerformanceWithCurrencyEffectAtStartDate) /
+              timeWeightedInvestmentValue) *
-              // TODO: Not sure if this is correct
-              (sum(totalInvestmentValuesWithCurrencyEffect) /
-                totalInvestmentValuesWithCurrencyEffect.length)) *
             100
         });
       }