From fead7279a6c0d922d398f6695ccbeb3e7b1c633a Mon Sep 17 00:00:00 2001 From: Valentin Zickner Date: Sun, 1 Aug 2021 11:51:28 +0200 Subject: [PATCH] fix investment values for portfolio.service.ts --- apps/api/src/app/portfolio/portfolio.service.ts | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/apps/api/src/app/portfolio/portfolio.service.ts b/apps/api/src/app/portfolio/portfolio.service.ts index bb6f403cb..47c69bda0 100644 --- a/apps/api/src/app/portfolio/portfolio.service.ts +++ b/apps/api/src/app/portfolio/portfolio.service.ts @@ -641,6 +641,7 @@ export class PortfolioService { return { transactionPoints: [], orders: [] }; } + const userCurrency = this.request.user.Settings.currency; const portfolioOrders: PortfolioOrder[] = orders.map((order) => ({ currency: order.currency, date: format(order.date, DATE_FORMAT), @@ -648,12 +649,18 @@ export class PortfolioService { quantity: new Big(order.quantity), symbol: order.symbol, type: order.type, - unitPrice: new Big(order.unitPrice) + unitPrice: new Big( + this.exchangeRateDataService.toCurrency( + order.unitPrice, + order.currency, + userCurrency + ) + ) })); const portfolioCalculator = new PortfolioCalculator( this.currentRateService, - this.request.user.Settings.currency + userCurrency ); portfolioCalculator.computeTransactionPoints(portfolioOrders); return {