From 5d3ccfda1b8182869049a4c25c73880e245be8a3 Mon Sep 17 00:00:00 2001 From: Thomas Kaul <4159106+dtslvr@users.noreply.github.com> Date: Tue, 1 Oct 2024 19:08:29 +0200 Subject: [PATCH] Fix calculation of allocations by market (unknown) --- .../src/app/portfolio/portfolio.service.ts | 30 +++++++++++-------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/apps/api/src/app/portfolio/portfolio.service.ts b/apps/api/src/app/portfolio/portfolio.service.ts index c2c867f61..fc06545a5 100644 --- a/apps/api/src/app/portfolio/portfolio.service.ts +++ b/apps/api/src/app/portfolio/portfolio.service.ts @@ -470,8 +470,7 @@ export class PortfolioService { if (withMarkets) { ({ markets, marketsAdvanced } = this.getMarkets({ - assetProfile, - valueInBaseCurrency + assetProfile })); } @@ -1433,11 +1432,9 @@ export class PortfolioService { } private getMarkets({ - assetProfile, - valueInBaseCurrency + assetProfile }: { assetProfile: EnhancedSymbolProfile; - valueInBaseCurrency: Big; }) { const markets = { [UNKNOWN_KEY]: 0, @@ -1499,16 +1496,23 @@ export class PortfolioService { .toNumber(); } } - } else { - markets[UNKNOWN_KEY] = new Big(markets[UNKNOWN_KEY]) - .plus(valueInBaseCurrency) - .toNumber(); - - marketsAdvanced[UNKNOWN_KEY] = new Big(marketsAdvanced[UNKNOWN_KEY]) - .plus(valueInBaseCurrency) - .toNumber(); } + markets[UNKNOWN_KEY] = new Big(1) + .minus(markets.developedMarkets) + .minus(markets.emergingMarkets) + .minus(markets.otherMarkets) + .toNumber(); + + marketsAdvanced[UNKNOWN_KEY] = new Big(1) + .minus(marketsAdvanced.asiaPacific) + .minus(marketsAdvanced.emergingMarkets) + .minus(marketsAdvanced.europe) + .minus(marketsAdvanced.japan) + .minus(marketsAdvanced.northAmerica) + .minus(marketsAdvanced.otherMarkets) + .toNumber(); + return { markets, marketsAdvanced }; }