Browse Source

Fix calculation of allocations by market (unknown)

pull/3853/head
Thomas Kaul 11 months ago
parent
commit
5d3ccfda1b
  1. 26
      apps/api/src/app/portfolio/portfolio.service.ts

26
apps/api/src/app/portfolio/portfolio.service.ts

@ -470,8 +470,7 @@ export class PortfolioService {
if (withMarkets) { if (withMarkets) {
({ markets, marketsAdvanced } = this.getMarkets({ ({ markets, marketsAdvanced } = this.getMarkets({
assetProfile, assetProfile
valueInBaseCurrency
})); }));
} }
@ -1433,11 +1432,9 @@ export class PortfolioService {
} }
private getMarkets({ private getMarkets({
assetProfile, assetProfile
valueInBaseCurrency
}: { }: {
assetProfile: EnhancedSymbolProfile; assetProfile: EnhancedSymbolProfile;
valueInBaseCurrency: Big;
}) { }) {
const markets = { const markets = {
[UNKNOWN_KEY]: 0, [UNKNOWN_KEY]: 0,
@ -1499,15 +1496,22 @@ export class PortfolioService {
.toNumber(); .toNumber();
} }
} }
} else { }
markets[UNKNOWN_KEY] = new Big(markets[UNKNOWN_KEY])
.plus(valueInBaseCurrency) markets[UNKNOWN_KEY] = new Big(1)
.minus(markets.developedMarkets)
.minus(markets.emergingMarkets)
.minus(markets.otherMarkets)
.toNumber(); .toNumber();
marketsAdvanced[UNKNOWN_KEY] = new Big(marketsAdvanced[UNKNOWN_KEY]) marketsAdvanced[UNKNOWN_KEY] = new Big(1)
.plus(valueInBaseCurrency) .minus(marketsAdvanced.asiaPacific)
.minus(marketsAdvanced.emergingMarkets)
.minus(marketsAdvanced.europe)
.minus(marketsAdvanced.japan)
.minus(marketsAdvanced.northAmerica)
.minus(marketsAdvanced.otherMarkets)
.toNumber(); .toNumber();
}
return { markets, marketsAdvanced }; return { markets, marketsAdvanced };
} }

Loading…
Cancel
Save