From 7ce4788fd525b8fe145d8da2a8dda2a479c4c052 Mon Sep 17 00:00:00 2001
From: Thomas <4159106+dtslvr@users.noreply.github.com>
Date: Sun, 14 Nov 2021 18:03:01 +0100
Subject: [PATCH] Fix transactions count (exclude drafts)

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

diff --git a/apps/api/src/app/account/account.service.ts b/apps/api/src/app/account/account.service.ts
index 58d98e5cf..159499dbb 100644
--- a/apps/api/src/app/account/account.service.ts
+++ b/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;
 
diff --git a/apps/api/src/app/portfolio/portfolio.service.ts b/apps/api/src/app/portfolio/portfolio.service.ts
index a1b752e31..4f182b4c2 100644
--- a/apps/api/src/app/portfolio/portfolio.service.ts
+++ b/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
       };