Browse Source
Feature/respect with excluded accounts flag in get account balances (#2697)
* Respect withExcludedAccounts in getAccountBalances()
* Update changelog
pull/2705/head
Thomas Kaul
1 year ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with
14 additions and
2 deletions
-
CHANGELOG.md
-
apps/api/src/app/portfolio/portfolio.service.ts
-
apps/api/src/services/account-balance/account-balance.service.ts
|
|
@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file. |
|
|
|
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), |
|
|
|
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). |
|
|
|
|
|
|
|
## Unreleased |
|
|
|
|
|
|
|
### Added |
|
|
|
|
|
|
|
- Respected the `withExcludedAccounts` flag in the account balance time series |
|
|
|
|
|
|
|
## 2.27.1 - 2023-11-28 |
|
|
|
|
|
|
|
### Changed |
|
|
|
|
|
@ -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( |
|
|
|
|
|
@ -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: { |
|
|
|