Include cash in portfolio performance

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

@@ -193,6 +193,7 @@ export abstract class PortfolioCalculator {
         hasErrors: false,
         historicalData: [],
         positions: [],
+        totalCashInBaseCurrency: new Big(0),
         totalFeesWithCurrencyEffect: new Big(0),
         totalInterestWithCurrencyEffect: new Big(0),
         totalInvestment: new Big(0),
@@ -205,6 +206,7 @@ export abstract class PortfolioCalculator {
     const dataGatheringItems: DataGatheringItem[] = [];
     let firstIndex = transactionPoints.length;
     let firstTransactionPoint: TransactionPoint = null;
+    let totalCashInBaseCurrency = new Big(0);
     let totalInterestWithCurrencyEffect = new Big(0);
     let totalLiabilitiesWithCurrencyEffect = new Big(0);
 
@@ -447,6 +449,12 @@ export abstract class PortfolioCalculator {
         )
       });
 
+      if (item.assetSubClass === 'CASH') {
+        totalCashInBaseCurrency = totalCashInBaseCurrency.plus(
+          marketPriceInBaseCurrency.mul(item.quantity)
+        );
+      }
+
       totalInterestWithCurrencyEffect = totalInterestWithCurrencyEffect.plus(
         totalInterestInBaseCurrency
       );
@@ -661,6 +669,7 @@ export abstract class PortfolioCalculator {
       ...overall,
       errors,
       historicalData,
+      totalCashInBaseCurrency,
       totalInterestWithCurrencyEffect,
       totalLiabilitiesWithCurrencyEffect,
       hasErrors: hasAnySymbolMetricsErrors || overall.hasErrors,

apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-cash.spec.ts

@@ -286,6 +286,7 @@ describe('PortfolioCalculator', () => {
       expect(portfolioSnapshot).toMatchObject({
         currentValueInBaseCurrency: new Big(1820),
         hasErrors: false,
+        totalCashInBaseCurrency: new Big(1820),
         totalFeesWithCurrencyEffect: new Big(0),
         totalInterestWithCurrencyEffect: new Big(0),
         totalInvestment: new Big(1820),

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

@@ -113,6 +113,7 @@ export class RoaiPortfolioCalculator extends PortfolioCalculator {
       createdAt: new Date(),
       errors: [],
       historicalData: [],
+      totalCashInBaseCurrency: new Big(0),
       totalLiabilitiesWithCurrencyEffect: new Big(0)
     };
   }

apps/api/src/app/portfolio/portfolio.service.ts

@@ -1887,6 +1887,7 @@ export class PortfolioService {
 
     const {
       currentValueInBaseCurrency,
+      totalCashInBaseCurrency,
       totalInvestment,
       totalInvestmentWithCurrencyEffect
     } = await portfolioCalculator.getSnapshot();
@@ -2015,6 +2016,7 @@ export class PortfolioService {
       fireWealth: {
         today: {
           valueInBaseCurrency: new Big(currentValueInBaseCurrency)
+            .minus(totalCashInBaseCurrency ?? 0)
             .minus(emergencyFundHoldingsValueInBaseCurrency)
             .toNumber()
         }

libs/common/src/lib/models/portfolio-snapshot.ts

@@ -26,6 +26,10 @@ export class PortfolioSnapshot {
   @Type(() => TimelinePosition)
   positions: TimelinePosition[];
 
+  @Transform(transformToBig, { toClassOnly: true })
+  @Type(() => Big)
+  totalCashInBaseCurrency: Big;
+
   @Transform(transformToBig, { toClassOnly: true })
   @Type(() => Big)
   totalFeesWithCurrencyEffect: Big;