From 48ca184c7207b64ec17957dcfb14c22115c858ad Mon Sep 17 00:00:00 2001
From: Thomas Kaul <4159106+dtslvr@users.noreply.github.com>
Date: Wed, 6 Mar 2024 20:48:57 +0100
Subject: [PATCH] Fix exception in value of account calculation caused by
 liabilities

---
 apps/api/src/app/portfolio/portfolio.service.ts | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

diff --git a/apps/api/src/app/portfolio/portfolio.service.ts b/apps/api/src/app/portfolio/portfolio.service.ts
index d07389049..51ea43af9 100644
--- a/apps/api/src/app/portfolio/portfolio.service.ts
+++ b/apps/api/src/app/portfolio/portfolio.service.ts
@@ -1941,7 +1941,7 @@ export class PortfolioService {
   private async getTransactionPoints({
     filters,
     includeDrafts = false,
-    types = ['BUY', 'ITEM', 'SELL'],
+    types = ['BUY', 'ITEM', 'LIABILITY', 'SELL'],
     userId,
     withExcludedAccounts = false
   }: {
@@ -2076,19 +2076,10 @@ export class PortfolioService {
     });
 
     for (const account of currentAccounts) {
-      let ordersByAccount = orders.filter(({ accountId }) => {
+      const ordersByAccount = orders.filter(({ accountId }) => {
         return accountId === account.id;
       });
 
-      const ordersOfTypeItemOrLiabilityByAccount =
-        ordersOfTypeItemOrLiability.filter(({ accountId }) => {
-          return accountId === account.id;
-        });
-
-      ordersByAccount = ordersByAccount.concat(
-        ordersOfTypeItemOrLiabilityByAccount
-      );
-
       accounts[account.id] = {
         balance: account.balance,
         currency: account.currency,
@@ -2128,8 +2119,8 @@ export class PortfolioService {
       } of ordersByAccount) {
         let currentValueOfSymbolInBaseCurrency =
           quantity *
-            portfolioItemsNow[SymbolProfile.symbol]
-              ?.marketPriceInBaseCurrency ?? 0;
+          (portfolioItemsNow[SymbolProfile.symbol]?.marketPriceInBaseCurrency ??
+            0);
 
         if (['LIABILITY', 'SELL'].includes(type)) {
           currentValueOfSymbolInBaseCurrency *= getFactor(type);