From 1a2243cfb7af30c3b0a439afebc7e34d8faeaf04 Mon Sep 17 00:00:00 2001 From: Thomas <4159106+dtslvr@users.noreply.github.com> Date: Tue, 18 Oct 2022 20:04:37 +0200 Subject: [PATCH] Improve transaction investment --- apps/api/src/app/portfolio/portfolio-calculator.ts | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/apps/api/src/app/portfolio/portfolio-calculator.ts b/apps/api/src/app/portfolio/portfolio-calculator.ts index 7ca87994c..b429d8097 100644 --- a/apps/api/src/app/portfolio/portfolio-calculator.ts +++ b/apps/api/src/app/portfolio/portfolio-calculator.ts @@ -1027,9 +1027,12 @@ export class PortfolioCalculator { valueAtStartDate = valueOfInvestmentBeforeTransaction; } - const transactionInvestment = order.quantity - .mul(order.unitPrice) - .mul(this.getFactor(order.type)); + const transactionInvestment = + order.type === 'BUY' + ? order.quantity.mul(order.unitPrice).mul(this.getFactor(order.type)) + : order.quantity + .mul(totalInvestment.div(totalUnits)) + .mul(this.getFactor(order.type)); totalInvestment = totalInvestment.plus(transactionInvestment);