Skip to content

Open Source Wealth Management Software. Angular + NestJS + Prisma + Nx + TypeScript 🤍

Bugfix/fix calculation of allocations by market (#3853)

Thomas Kaul413076141c65
diff --git a/CHANGELOG.md b/CHANGELOG.md
index bb824f43b0..9ba9ee7a19 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,6 +17,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Optimized the portfolio calculations with smarter date interval selection
- Improved the language localization for German (`de`)
+### Fixed
+
+- Fixed an issue in the calculation of allocations by market (_Unknown_)
+
## 2.111.0 - 2024-09-28
### Added
diff --git a/apps/api/src/app/portfolio/portfolio.service.ts b/apps/api/src/app/portfolio/portfolio.service.ts
index c2c867f616..fc06545a54 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 };
}