Browse Source

Respect withExcludedAccounts in getAccountBalances()

pull/2697/head
Thomas 2 years ago
parent
commit
67226defb1
  1. 2
      apps/api/src/app/portfolio/portfolio.service.ts
  2. 8
      apps/api/src/services/account-balance/account-balance.service.ts

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

@ -1075,7 +1075,7 @@ export class PortfolioService {
const userCurrency = this.getUserCurrency(user); const userCurrency = this.getUserCurrency(user);
const accountBalances = await this.accountBalanceService.getAccountBalances( const accountBalances = await this.accountBalanceService.getAccountBalances(
{ filters, user } { filters, user, withExcludedAccounts }
); );
let accountBalanceItems: HistoricalDataItem[] = Object.values( let accountBalanceItems: HistoricalDataItem[] = Object.values(

8
apps/api/src/services/account-balance/account-balance.service.ts

@ -22,10 +22,12 @@ export class AccountBalanceService {
public async getAccountBalances({ public async getAccountBalances({
filters, filters,
user user,
withExcludedAccounts
}: { }: {
filters?: Filter[]; filters?: Filter[];
user: UserWithSettings; user: UserWithSettings;
withExcludedAccounts?: boolean;
}): Promise<AccountBalancesResponse> { }): Promise<AccountBalancesResponse> {
const where: Prisma.AccountBalanceWhereInput = { userId: user.id }; const where: Prisma.AccountBalanceWhereInput = { userId: user.id };
@ -37,6 +39,10 @@ export class AccountBalanceService {
where.accountId = accountFilter.id; where.accountId = accountFilter.id;
} }
if (withExcludedAccounts === false) {
where.Account = { isExcluded: false };
}
const balances = await this.prismaService.accountBalance.findMany({ const balances = await this.prismaService.accountBalance.findMany({
where, where,
orderBy: { orderBy: {

Loading…
Cancel
Save