Merge pull request #57 from dandevaud/bugfix/fix-asset-allocation-in-dockerpush

Refactoring for readability & debuging

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

@@ -1609,40 +1609,87 @@ export class PortfolioCalculator {
           .div(previousOrder.unitPrice)
           .minus(1);
       } else if (
-        order.type === 'STAKE' &&
+        this.needsStakeHandling(order, marketSymbolMap, previousOrder)
-        marketSymbolMap[order.date] &&
+      ) {
-        ((marketSymbolMap[previousOrder.date][
+        this.stakeHandling(
-          previousOrder.symbol
+          previousOrder,
-        ]?.toNumber() &&
+          marketSymbolMap,
-          previousOrder.type === 'STAKE') ||
+          netPerformanceValuesPercentage,
-          (previousOrder.type !== 'STAKE' &&
+          order
-            previousOrder.unitPrice.toNumber()))
+        );
+      } else if (previousOrder.unitPrice.toNumber()) {
+        netPerformanceValuesPercentage[order.date] = new Big(-1);
+      } else if (
+        this.ispreviousOrderStakeAndHasInformation(
+          previousOrder,
+          marketSymbolMap
+        )
+      ) {
+        this.handleIfPreviousOrderIsStake(
+          netPerformanceValuesPercentage,
+          order,
+          marketSymbolMap,
+          previousOrder
+        );
+      } else {
+        netPerformanceValuesPercentage[order.date] = new Big(0);
+      }
+    }
+  }
+
+  private handleIfPreviousOrderIsStake(
+    netPerformanceValuesPercentage: { [date: string]: Big },
+    order: PortfolioOrderItem,
+    marketSymbolMap: { [date: string]: { [symbol: string]: Big } },
+    previousOrder: PortfolioOrderItem
+  ) {
+    netPerformanceValuesPercentage[order.date] = order.unitPrice
+      .div(marketSymbolMap[previousOrder.date][previousOrder.symbol])
+      .minus(1);
+  }
+
+  private stakeHandling(
+    previousOrder: PortfolioOrderItem,
+    marketSymbolMap: { [date: string]: { [symbol: string]: Big } },
+    netPerformanceValuesPercentage: { [date: string]: Big },
+    order: PortfolioOrderItem
   ) {
     let previousUnitPrice =
       previousOrder.type === 'STAKE'
         ? marketSymbolMap[previousOrder.date][previousOrder.symbol]
         : previousOrder.unitPrice;
-        netPerformanceValuesPercentage[order.date] = marketSymbolMap[
+    netPerformanceValuesPercentage[order.date] = marketSymbolMap[order.date][
-          order.date
+      order.symbol
-        ][order.symbol]
+    ]
       ? marketSymbolMap[order.date][order.symbol]
           .div(previousUnitPrice)
           .minus(1)
       : new Big(0);
-      } else if (previousOrder.unitPrice.toNumber()) {
+  }
-        netPerformanceValuesPercentage[order.date] = new Big(-1);
+
-      } else if (
+  private ispreviousOrderStakeAndHasInformation(
+    previousOrder: PortfolioOrderItem,
+    marketSymbolMap: { [date: string]: { [symbol: string]: Big } }
+  ) {
+    return (
       previousOrder.type === 'STAKE' &&
       marketSymbolMap[previousOrder.date] &&
       marketSymbolMap[previousOrder.date][previousOrder.symbol]?.toNumber()
-      ) {
+    );
-        netPerformanceValuesPercentage[order.date] = order.unitPrice
-          .div(marketSymbolMap[previousOrder.date][previousOrder.symbol])
-          .minus(1);
-      } else {
-        netPerformanceValuesPercentage[order.date] = new Big(0);
-      }
   }
+
+  private needsStakeHandling(
+    order: PortfolioOrderItem,
+    marketSymbolMap: { [date: string]: { [symbol: string]: Big } },
+    previousOrder: PortfolioOrderItem
+  ) {
+    return (
+      order.type === 'STAKE' &&
+      marketSymbolMap[order.date] &&
+      ((marketSymbolMap[previousOrder.date][previousOrder.symbol]?.toNumber() &&
+        previousOrder.type === 'STAKE') ||
+        (previousOrder.type !== 'STAKE' && previousOrder.unitPrice.toNumber()))
+    );
   }
 
   private handleLoggingOfInvestmentMetrics(