Fix value of accounts filtered by asset class

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

@@ -83,7 +83,6 @@ export class ActivitiesService {
 
   public areCashActivitiesExcludedByFilters(filters: Filter[] = []) {
     const {
-      ASSET_CLASS: filtersByAssetClass = [],
       DATA_SOURCE: [filterByDataSource] = [],
       SYMBOL: [filterBySymbol] = [],
       TAG: filtersByTag = []
@@ -92,10 +91,7 @@ export class ActivitiesService {
     });
 
     const isFilteredByAssetClassOtherThanLiquidity =
-      filtersByAssetClass.length > 0 &&
+      this.isFilteredByAssetClassOtherThanLiquidity(filters);
-      !filtersByAssetClass.some(({ id }) => {
-        return id === AssetClass.LIQUIDITY;
-      });
 
     const isFilteredByAssetProfile = !!(filterByDataSource || filterBySymbol);
     const isFilteredByTag = filtersByTag.length > 0;
@@ -875,6 +871,22 @@ export class ActivitiesService {
     });
   }
 
+  public isFilteredByAssetClassOtherThanLiquidity(filters: Filter[] = []) {
+    const { ASSET_CLASS: filtersByAssetClass = [] } = groupBy(
+      filters,
+      ({ type }) => {
+        return type;
+      }
+    );
+
+    return (
+      filtersByAssetClass.length > 0 &&
+      !filtersByAssetClass.some(({ id }) => {
+        return id === AssetClass.LIQUIDITY;
+      })
+    );
+  }
+
   public async order(
     orderWhereUniqueInput: Prisma.OrderWhereUniqueInput
   ): Promise<Order | null> {

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

@@ -2434,18 +2434,12 @@ export class PortfolioService {
     const accounts: PortfolioDetails['accounts'] = {};
     const platforms: PortfolioDetails['platforms'] = {};
 
-    const {
+    const { SYMBOL: [filterBySymbol] = [] } = groupBy(filters, ({ type }) => {
-      ASSET_CLASS: filtersByAssetClass = [],
-      SYMBOL: [filterBySymbol] = []
-    } = groupBy(filters, ({ type }) => {
       return type;
     });
 
     const isFilteredByAssetClassOtherThanLiquidity =
-      filtersByAssetClass.length > 0 &&
+      this.activitiesService.isFilteredByAssetClassOtherThanLiquidity(filters);
-      !filtersByAssetClass.some(({ id }) => {
-        return id === AssetClass.LIQUIDITY;
-      });
 
     let currentAccounts: (AccountWithBalance & {
       Order?: Order[];