Open Source Wealth Management Software. Angular + NestJS + Prisma + Nx + TypeScript 🤍
TypeScript angularetffinancefintechghostfoliohacktoberfestinvestingnestjsosspersonal-financeportfolioprismasoftwarestocktrackertradingtypescriptwealth-managementweb
Feature/optimize portfolio calculations with smarter date interval selection (#3829)
ceroma2ad91e579658
diff --git a/CHANGELOG.md b/CHANGELOG.mdindex 78862da6da..92f82935a9 100644--- a/CHANGELOG.md+++ b/CHANGELOG.md@@ -13,6 +13,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0### Changed+- Optimized the portfolio calculations with smarter date interval selection- Improved the language localization for German (`de`)## 2.111.0 - 2024-09-28diff --git a/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator.ts b/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator.tsindex 3b64cd185c..f5e301cba9 100644--- a/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator.ts+++ b/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator.ts@@ -16,13 +16,14 @@ import {addDays,addMilliseconds,differenceInDays,- eachDayOfInterval,format,isBefore} from 'date-fns';import { cloneDeep, first, last, sortBy } from 'lodash';export class TWRPortfolioCalculator extends PortfolioCalculator {+ private chartDatesDescending: string[];+protected calculateOverallPerformance(positions: TimelinePosition[]): PortfolioSnapshot {@@ -820,31 +821,35 @@ export class TWRPortfolioCalculator extends PortfolioCalculator {startDate = start;}+ const endDateString = format(endDate, DATE_FORMAT);+ const startDateString = format(startDate, DATE_FORMAT);+const currentValuesAtDateRangeStartWithCurrencyEffect =- currentValuesWithCurrencyEffect[format(startDate, DATE_FORMAT)] ??- new Big(0);+ currentValuesWithCurrencyEffect[startDateString] ?? new Big(0);const investmentValuesAccumulatedAtStartDateWithCurrencyEffect =- investmentValuesAccumulatedWithCurrencyEffect[- format(startDate, DATE_FORMAT)- ] ?? new Big(0);+ investmentValuesAccumulatedWithCurrencyEffect[startDateString] ??+ new Big(0);const grossPerformanceAtDateRangeStartWithCurrencyEffect =currentValuesAtDateRangeStartWithCurrencyEffect.minus(investmentValuesAccumulatedAtStartDateWithCurrencyEffect);- const dates = eachDayOfInterval({- end: endDate,- start: startDate- }).map((date) => {- return format(date, DATE_FORMAT);- });-let average = new Big(0);let dayCount = 0;- for (const date of dates) {+ if (!this.chartDatesDescending) {+ this.chartDatesDescending = Object.keys(chartDateMap).sort().reverse();+ }++ for (const date of this.chartDatesDescending) {+ if (date > endDateString) {+ continue;+ } else if (date < startDateString) {+ break;+ }+if (investmentValuesAccumulatedWithCurrencyEffect[date] instanceof Big &&investmentValuesAccumulatedWithCurrencyEffect[date].gt(0)@@ -864,17 +869,14 @@ export class TWRPortfolioCalculator extends PortfolioCalculator {}netPerformanceWithCurrencyEffectMap[dateRange] =- netPerformanceValuesWithCurrencyEffect[- format(endDate, DATE_FORMAT)- ]?.minus(+ netPerformanceValuesWithCurrencyEffect[endDateString]?.minus(// If the date range is 'max', take 0 as a start value. Otherwise,// the value of the end of the day of the start date is taken which// differs from the buying price.dateRange === 'max'? new Big(0)- : (netPerformanceValuesWithCurrencyEffect[- format(startDate, DATE_FORMAT)- ] ?? new Big(0))+ : (netPerformanceValuesWithCurrencyEffect[startDateString] ??+ new Big(0))) ?? new Big(0);netPerformancePercentageWithCurrencyEffectMap[dateRange] = average.gt(0)