Feature/respect with excluded accounts flag in get account balances (#2697)
* Respect withExcludedAccounts in getAccountBalances() * Update changelog
This commit is contained in:
parent
8e3a144a37
commit
6f4fd0826c
@ -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/),
|
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).
|
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
|
## 2.27.1 - 2023-11-28
|
||||||
|
|
||||||
### Changed
|
### Changed
|
||||||
|
@ -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(
|
||||||
|
@ -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…
x
Reference in New Issue
Block a user