Open Source Wealth Management Software. Angular + NestJS + Prisma + Nx + TypeScript 🤍
TypeScript angularetffinancefintechghostfoliohacktoberfestinvestingnestjsosspersonal-financeportfolioprismasoftwarestocktrackertradingtypescriptwealth-managementweb
Bugfix/fix fees calculation in portfolio summary (#3567)
Thomas Kaul9d6214e93ac4
diff --git a/CHANGELOG.md b/CHANGELOG.mdindex d3694f5804..1f7dfd026f 100644--- a/CHANGELOG.md+++ b/CHANGELOG.md@@ -12,6 +12,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0- Improved the chart of the holdings tab on the home page (experimental)- Separated the icon purposes in the `site.webmanifest`+### Fixed++- Fixed an issue in the portfolio summary with the currency conversion of fees+## 2.95.0 - 2024-07-12### Addeddiff --git a/apps/api/src/app/portfolio/calculator/portfolio-calculator.ts b/apps/api/src/app/portfolio/calculator/portfolio-calculator.tsindex e021eb2d48..ec56a247c0 100644--- a/apps/api/src/app/portfolio/calculator/portfolio-calculator.ts+++ b/apps/api/src/app/portfolio/calculator/portfolio-calculator.ts@@ -300,6 +300,12 @@ export abstract class PortfolioCalculator {const errors: ResponseError['errors'] = [];for (const item of lastTransactionPoint.items) {+ const feeInBaseCurrency = item.fee.mul(+ exchangeRatesByCurrency[`${item.currency}${this.currency}`]?.[+ lastTransactionPoint.date+ ]+ );+const marketPriceInBaseCurrency = (marketSymbolMap[endDateString]?.[item.symbol] ?? item.averagePrice).mul(@@ -340,10 +346,11 @@ export abstract class PortfolioCalculator {hasAnySymbolMetricsErrors = hasAnySymbolMetricsErrors || hasErrors;positions.push({- dividend: totalDividend,- dividendInBaseCurrency: totalDividendInBaseCurrency,+ feeInBaseCurrency,timeWeightedInvestment,timeWeightedInvestmentWithCurrencyEffect,+ dividend: totalDividend,+ dividendInBaseCurrency: totalDividendInBaseCurrency,averagePrice: item.averagePrice,currency: item.currency,dataSource: item.dataSource,diff --git a/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-baln-buy-and-sell-in-two-activities.spec.ts b/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-baln-buy-and-sell-in-two-activities.spec.tsindex 340f16b879..3eb166d2eb 100644--- a/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-baln-buy-and-sell-in-two-activities.spec.ts+++ b/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-baln-buy-and-sell-in-two-activities.spec.ts@@ -168,6 +168,7 @@ describe('PortfolioCalculator', () => {dividend: new Big('0'),dividendInBaseCurrency: new Big('0'),fee: new Big('3.2'),+ feeInBaseCurrency: new Big('3.2'),firstBuyDate: '2021-11-22',grossPerformance: new Big('-12.6'),grossPerformancePercentage: new Big('-0.04408677396780965649'),diff --git a/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-baln-buy-and-sell.spec.ts b/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-baln-buy-and-sell.spec.tsindex 53ebdf19fc..a3adde84b9 100644--- a/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-baln-buy-and-sell.spec.ts+++ b/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-baln-buy-and-sell.spec.ts@@ -153,6 +153,7 @@ describe('PortfolioCalculator', () => {dividend: new Big('0'),dividendInBaseCurrency: new Big('0'),fee: new Big('3.2'),+ feeInBaseCurrency: new Big('3.2'),firstBuyDate: '2021-11-22',grossPerformance: new Big('-12.6'),grossPerformancePercentage: new Big('-0.0440867739678096571'),diff --git a/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-baln-buy.spec.ts b/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-baln-buy.spec.tsindex bab265887c..6221e6240c 100644--- a/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-baln-buy.spec.ts+++ b/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-baln-buy.spec.ts@@ -138,6 +138,7 @@ describe('PortfolioCalculator', () => {dividend: new Big('0'),dividendInBaseCurrency: new Big('0'),fee: new Big('1.55'),+ feeInBaseCurrency: new Big('1.55'),firstBuyDate: '2021-11-30',grossPerformance: new Big('24.6'),grossPerformancePercentage: new Big('0.09004392386530014641'),diff --git a/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-btcusd-buy-and-sell-partially.spec.ts b/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-btcusd-buy-and-sell-partially.spec.tsindex eba5d46748..85d39220a3 100644--- a/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-btcusd-buy-and-sell-partially.spec.ts+++ b/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-btcusd-buy-and-sell-partially.spec.ts@@ -166,6 +166,7 @@ describe('PortfolioCalculator', () => {dividend: new Big('0'),dividendInBaseCurrency: new Big('0'),fee: new Big('0'),+ feeInBaseCurrency: new Big('0'),firstBuyDate: '2015-01-01',grossPerformance: new Big('27172.74'),grossPerformancePercentage: new Big('42.41978276196153750666'),diff --git a/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-fee.spec.ts b/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-fee.spec.tsindex 88d7adb71e..7e9bbc26de 100644--- a/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-fee.spec.ts+++ b/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-fee.spec.ts@@ -123,6 +123,7 @@ describe('PortfolioCalculator', () => {dividend: new Big('0'),dividendInBaseCurrency: new Big('0'),fee: new Big('49'),+ feeInBaseCurrency: new Big('49'),firstBuyDate: '2021-09-01',grossPerformance: null,grossPerformancePercentage: null,diff --git a/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-googl-buy.spec.ts b/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-googl-buy.spec.tsindex 690f1eb51b..31182c8cb8 100644--- a/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-googl-buy.spec.ts+++ b/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-googl-buy.spec.ts@@ -151,6 +151,7 @@ describe('PortfolioCalculator', () => {dividend: new Big('0'),dividendInBaseCurrency: new Big('0'),fee: new Big('1'),+ feeInBaseCurrency: new Big('0.9238'),firstBuyDate: '2023-01-03',grossPerformance: new Big('27.33'),grossPerformancePercentage: new Big('0.3066651705565529623'),@@ -177,7 +178,7 @@ describe('PortfolioCalculator', () => {valueInBaseCurrency: new Big('103.10483')}],- totalFeesWithCurrencyEffect: new Big('1'),+ totalFeesWithCurrencyEffect: new Big('0.9238'),totalInterestWithCurrencyEffect: new Big('0'),totalInvestment: new Big('89.12'),totalInvestmentWithCurrencyEffect: new Big('82.329056'),diff --git a/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-item.spec.ts b/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-item.spec.tsindex 422d119b2e..985dc5feb7 100644--- a/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-item.spec.ts+++ b/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-item.spec.ts@@ -123,6 +123,7 @@ describe('PortfolioCalculator', () => {dividend: new Big('0'),dividendInBaseCurrency: new Big('0'),fee: new Big('0'),+ feeInBaseCurrency: new Big('0'),firstBuyDate: '2022-01-01',grossPerformance: null,grossPerformancePercentage: null,diff --git a/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-novn-buy-and-sell-partially.spec.ts b/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-novn-buy-and-sell-partially.spec.tsindex f65d2ba61e..72cb16a5ff 100644--- a/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-novn-buy-and-sell-partially.spec.ts+++ b/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-novn-buy-and-sell-partially.spec.ts@@ -153,6 +153,7 @@ describe('PortfolioCalculator', () => {dividend: new Big('0'),dividendInBaseCurrency: new Big('0'),fee: new Big('4.25'),+ feeInBaseCurrency: new Big('4.25'),firstBuyDate: '2022-03-07',grossPerformance: new Big('21.93'),grossPerformancePercentage: new Big('0.15113417083448194384'),diff --git a/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-novn-buy-and-sell.spec.ts b/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-novn-buy-and-sell.spec.tsindex 902f710ee7..59cc13f0e8 100644--- a/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-novn-buy-and-sell.spec.ts+++ b/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-novn-buy-and-sell.spec.ts@@ -183,6 +183,7 @@ describe('PortfolioCalculator', () => {dividend: new Big('0'),dividendInBaseCurrency: new Big('0'),fee: new Big('0'),+ feeInBaseCurrency: new Big('0'),firstBuyDate: '2022-03-07',grossPerformance: new Big('19.86'),grossPerformancePercentage: new Big('0.13100263852242744063'),diff --git a/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator.ts b/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator.tsindex f8b62a9405..e9f1f3fda2 100644--- a/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator.ts+++ b/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator.ts@@ -34,9 +34,9 @@ export class TWRPortfolioCalculator extends PortfolioCalculator {let totalTimeWeightedInvestmentWithCurrencyEffect = new Big(0);for (const currentPosition of positions) {- if (currentPosition.fee) {+ if (currentPosition.feeInBaseCurrency) {totalFeesWithCurrencyEffect = totalFeesWithCurrencyEffect.plus(- currentPosition.fee+ currentPosition.feeInBaseCurrency);}diff --git a/libs/common/src/lib/models/timeline-position.ts b/libs/common/src/lib/models/timeline-position.tsindex 412449590d..5458914641 100644--- a/libs/common/src/lib/models/timeline-position.ts+++ b/libs/common/src/lib/models/timeline-position.ts@@ -24,6 +24,10 @@ export class TimelinePosition {@Type(() => Big)fee: Big;+ @Transform(transformToBig, { toClassOnly: true })+ @Type(() => Big)+ feeInBaseCurrency: Big;+firstBuyDate: string;@Transform(transformToBig, { toClassOnly: true })