From 67226defb1faa8454dd139fe9628aeb2c31b69cd Mon Sep 17 00:00:00 2001
From: Thomas <4159106+dtslvr@users.noreply.github.com>
Date: Mon, 27 Nov 2023 21:13:35 +0100
Subject: [PATCH] Respect withExcludedAccounts in getAccountBalances()

---
 apps/api/src/app/portfolio/portfolio.service.ts           | 2 +-
 .../services/account-balance/account-balance.service.ts   | 8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/apps/api/src/app/portfolio/portfolio.service.ts b/apps/api/src/app/portfolio/portfolio.service.ts
index b5bc589e6..76aef0db1 100644
--- a/apps/api/src/app/portfolio/portfolio.service.ts
+++ b/apps/api/src/app/portfolio/portfolio.service.ts
@@ -1075,7 +1075,7 @@ export class PortfolioService {
     const userCurrency = this.getUserCurrency(user);
 
     const accountBalances = await this.accountBalanceService.getAccountBalances(
-      { filters, user }
+      { filters, user, withExcludedAccounts }
     );
 
     let accountBalanceItems: HistoricalDataItem[] = Object.values(
diff --git a/apps/api/src/services/account-balance/account-balance.service.ts b/apps/api/src/services/account-balance/account-balance.service.ts
index 33b811ef5..e1d002428 100644
--- a/apps/api/src/services/account-balance/account-balance.service.ts
+++ b/apps/api/src/services/account-balance/account-balance.service.ts
@@ -22,10 +22,12 @@ export class AccountBalanceService {
 
   public async getAccountBalances({
     filters,
-    user
+    user,
+    withExcludedAccounts
   }: {
     filters?: Filter[];
     user: UserWithSettings;
+    withExcludedAccounts?: boolean;
   }): Promise<AccountBalancesResponse> {
     const where: Prisma.AccountBalanceWhereInput = { userId: user.id };
 
@@ -37,6 +39,10 @@ export class AccountBalanceService {
       where.accountId = accountFilter.id;
     }
 
+    if (withExcludedAccounts === false) {
+      where.Account = { isExcluded: false };
+    }
+
     const balances = await this.prismaService.accountBalance.findMany({
       where,
       orderBy: {