Browse Source

Fix transactions count (exclude drafts)

pull/473/head
Thomas 4 years ago
parent
commit
7ce4788fd5
  1. 10
      apps/api/src/app/account/account.service.ts
  2. 10
      apps/api/src/app/portfolio/portfolio.service.ts

10
apps/api/src/app/account/account.service.ts

@ -85,7 +85,15 @@ export class AccountService {
});
return accounts.map((account) => {
const result = { ...account, transactionCount: account.Order.length };
let transactionCount = 0;
for (const order of account.Order) {
if (!order.isDraft) {
transactionCount += 1;
}
}
const result = { ...account, transactionCount };
delete result.Order;

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

@ -94,14 +94,22 @@ export class PortfolioService {
const userCurrency = this.request.user.Settings.currency;
return accounts.map((account) => {
let transactionCount = 0;
for (const order of account.Order) {
if (!order.isDraft) {
transactionCount += 1;
}
}
const result = {
...account,
transactionCount,
convertedBalance: this.exchangeRateDataService.toCurrency(
account.balance,
account.currency,
userCurrency
),
transactionCount: account.Order.length,
value: details.accounts[account.name]?.current ?? 0
};

Loading…
Cancel
Save