Merge branch 'main' into feature/extend-support-for-impersonation-mode

CHANGELOG.md

@@ -11,6 +11,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Extended the support of the impersonation mode for local development
 
+### Fixed
+
+- Improved the holdings table by showing the cash position also when the filter contains the accounts, so that we can see the total allocation for that account
+
 ## 1.261.0 - 2023-04-25
 
 ### Added

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

@@ -462,10 +462,17 @@ export class PortfolioService {
     });
 
     const holdings: PortfolioDetails['holdings'] = {};
-    const totalInvestmentInBaseCurrency = currentPositions.totalInvestment.plus(
+    const totalValueInBaseCurrency = currentPositions.currentValue.plus(
       cashDetails.balanceInBaseCurrency
     );
-    let filteredValueInBaseCurrency = currentPositions.currentValue;
+
+    const isFilteredByAccount = filters.some((filter) => {
+      return filter.type === 'ACCOUNT';
+    });
+
+    let filteredValueInBaseCurrency = isFilteredByAccount
+      ? totalValueInBaseCurrency
+      : currentPositions.currentValue;
 
     if (
       filters?.length === 0 ||
@@ -564,12 +571,11 @@ export class PortfolioService {
       };
     }
 
-    if (
+    const isFilteredByCash = filters.some((filter) => {
-      filters?.length === 0 ||
+      return filter.type === 'ASSET_CLASS' && filter.id === 'CASH';
-      (filters?.length === 1 &&
+    });
-        filters[0].type === 'ASSET_CLASS' &&
+
-        filters[0].id === 'CASH')
+    if (filters.length === 0 || isFilteredByCash || isFilteredByAccount) {
-    ) {
       const cashPositions = await this.getCashPositions({
         cashDetails,
         userCurrency,
@@ -595,7 +601,7 @@ export class PortfolioService {
       filters[0].id === EMERGENCY_FUND_TAG_ID &&
       filters[0].type === 'TAG'
     ) {
-      const cashPositions = await this.getCashPositions({
+      const emergencyFundCashPositions = await this.getCashPositions({
         cashDetails,
         userCurrency,
         value: filteredValueInBaseCurrency
@@ -620,7 +626,7 @@ export class PortfolioService {
       };
 
       holdings[userCurrency] = {
-        ...cashPositions[userCurrency],
+        ...emergencyFundCashPositions[userCurrency],
         investment: emergencyFundInCash,
         value: emergencyFundInCash
       };