From 8d9d2bdfeb0a1e71d02b4e3187a6a3d1b5f740d7 Mon Sep 17 00:00:00 2001
From: Thomas <4159106+dtslvr@users.noreply.github.com>
Date: Sat, 25 Mar 2023 09:49:53 +0100
Subject: [PATCH] Refactor portfolio calculator

---
 .../src/app/portfolio/portfolio-calculator.ts | 95 ++++++++++---------
 1 file changed, 48 insertions(+), 47 deletions(-)

diff --git a/apps/api/src/app/portfolio/portfolio-calculator.ts b/apps/api/src/app/portfolio/portfolio-calculator.ts
index c4804894b..57835298c 100644
--- a/apps/api/src/app/portfolio/portfolio-calculator.ts
+++ b/apps/api/src/app/portfolio/portfolio-calculator.ts
@@ -235,6 +235,15 @@ export class PortfolioCalculator {
       }
     }
 
+    const valuesByDate: {
+      [date: string]: {
+        maxTotalInvestmentValue: Big;
+        totalCurrentValue: Big;
+        totalInvestmentValue: Big;
+        totalNetPerformanceValue: Big;
+      };
+    } = {};
+
     const valuesBySymbol: {
       [symbol: string]: {
         currentValues: { [date: string]: Big };
@@ -244,11 +253,6 @@ export class PortfolioCalculator {
       };
     } = {};
 
-    const totalCurrentValues: { [date: string]: Big } = {};
-    const totalNetPerformanceValues: { [date: string]: Big } = {};
-    const totalInvestmentValues: { [date: string]: Big } = {};
-    const maxTotalInvestmentValues: { [date: string]: Big } = {};
-
     for (const symbol of Object.keys(symbols)) {
       const {
         currentValues,
@@ -276,58 +280,55 @@ export class PortfolioCalculator {
       const dateString = format(currentDate, DATE_FORMAT);
 
       for (const symbol of Object.keys(valuesBySymbol)) {
-        totalCurrentValues[dateString] =
-          totalCurrentValues[dateString] ?? new Big(0);
-
-        if (valuesBySymbol[symbol]?.currentValues?.[dateString]) {
-          totalCurrentValues[dateString] = totalCurrentValues[dateString].add(
-            valuesBySymbol[symbol].currentValues[dateString]
-          );
-        }
-
-        totalNetPerformanceValues[dateString] =
-          totalNetPerformanceValues[dateString] ?? new Big(0);
-
-        if (valuesBySymbol[symbol]?.netPerformanceValues?.[dateString]) {
-          totalNetPerformanceValues[dateString] = totalNetPerformanceValues[
-            dateString
-          ].add(valuesBySymbol[symbol].netPerformanceValues[dateString]);
-        }
-
-        totalInvestmentValues[dateString] =
-          totalInvestmentValues[dateString] ?? new Big(0);
-
-        if (valuesBySymbol[symbol]?.investmentValues?.[dateString]) {
-          totalInvestmentValues[dateString] = totalInvestmentValues[
-            dateString
-          ].add(valuesBySymbol[symbol].investmentValues[dateString]);
-        }
-
-        maxTotalInvestmentValues[dateString] =
-          maxTotalInvestmentValues[dateString] ?? new Big(0);
-
-        if (valuesBySymbol[symbol]?.maxInvestmentValues?.[dateString]) {
-          maxTotalInvestmentValues[dateString] = maxTotalInvestmentValues[
-            dateString
-          ].add(valuesBySymbol[symbol].maxInvestmentValues[dateString]);
-        }
+        const symbolValues = valuesBySymbol[symbol];
+
+        const currentValue =
+          symbolValues.currentValues?.[dateString] ?? new Big(0);
+        const investmentValue =
+          symbolValues.investmentValues?.[dateString] ?? new Big(0);
+        const maxInvestmentValue =
+          symbolValues.maxInvestmentValues?.[dateString] ?? new Big(0);
+        const netPerformanceValue =
+          symbolValues.netPerformanceValues?.[dateString] ?? new Big(0);
+
+        valuesByDate[dateString] = {
+          totalCurrentValue: (
+            valuesByDate[dateString]?.totalCurrentValue ?? new Big(0)
+          ).add(currentValue),
+          totalInvestmentValue: (
+            valuesByDate[dateString]?.totalInvestmentValue ?? new Big(0)
+          ).add(investmentValue),
+          maxTotalInvestmentValue: (
+            valuesByDate[dateString]?.maxTotalInvestmentValue ?? new Big(0)
+          ).add(maxInvestmentValue),
+          totalNetPerformanceValue: (
+            valuesByDate[dateString]?.totalNetPerformanceValue ?? new Big(0)
+          ).add(netPerformanceValue)
+        };
       }
     }
 
-    return Object.keys(totalNetPerformanceValues).map((date) => {
-      const netPerformanceInPercentage = maxTotalInvestmentValues[date].eq(0)
+    return Object.entries(valuesByDate).map(([date, values]) => {
+      const {
+        maxTotalInvestmentValue,
+        totalCurrentValue,
+        totalInvestmentValue,
+        totalNetPerformanceValue
+      } = values;
+
+      const netPerformanceInPercentage = maxTotalInvestmentValue.eq(0)
         ? 0
-        : totalNetPerformanceValues[date]
-            .div(maxTotalInvestmentValues[date])
+        : totalNetPerformanceValue
+            .div(maxTotalInvestmentValue)
             .mul(100)
             .toNumber();
 
       return {
         date,
         netPerformanceInPercentage,
-        netPerformance: totalNetPerformanceValues[date].toNumber(),
-        totalInvestment: totalInvestmentValues[date].toNumber(),
-        value: totalCurrentValues[date].toNumber()
+        netPerformance: totalNetPerformanceValue.toNumber(),
+        totalInvestment: totalInvestmentValue.toNumber(),
+        value: totalCurrentValue.toNumber()
       };
     });
   }