Open Source Wealth Management Software. Angular + NestJS + Prisma + Nx + TypeScript 🤍
TypeScript angularetffinancefintechghostfoliohacktoberfestinvestingnestjsosspersonal-financeportfolioprismasoftwarestocktrackertradingtypescriptwealth-managementweb
Task/remove deprecated first buy date in portfolio calculator (#6244)
Thomas Kaul418e8bc843f1
diff --git a/CHANGELOG.md b/CHANGELOG.mdindex f65bbd458c..d1092b049c 100644--- a/CHANGELOG.md+++ b/CHANGELOG.md@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).+## Unreleased++### Changed++- Removed the deprecated `firstBuyDate` in the portfolio calculator+## 2.234.0 - 2026-01-30### Changeddiff --git a/apps/api/src/app/portfolio/calculator/portfolio-calculator.ts b/apps/api/src/app/portfolio/calculator/portfolio-calculator.tsindex b3b1d3410c..9612ad1c42 100644--- a/apps/api/src/app/portfolio/calculator/portfolio-calculator.ts+++ b/apps/api/src/app/portfolio/calculator/portfolio-calculator.ts@@ -416,7 +416,6 @@ export abstract class PortfolioCalculator {dividendInBaseCurrency: totalDividendInBaseCurrency,fee: item.fee,feeInBaseCurrency: item.feeInBaseCurrency,- firstBuyDate: item.firstBuyDate,grossPerformance: !hasErrors ? (grossPerformance ?? null) : null,grossPerformancePercentage: !hasErrors? (grossPerformancePercentage ?? null)@@ -1004,7 +1003,6 @@ export abstract class PortfolioCalculator {fee: oldAccumulatedSymbol.fee.plus(fee),feeInBaseCurrency:oldAccumulatedSymbol.feeInBaseCurrency.plus(feeInBaseCurrency),- firstBuyDate: oldAccumulatedSymbol.firstBuyDate,includeInHoldings: oldAccumulatedSymbol.includeInHoldings,quantity: newQuantity,tags: oldAccumulatedSymbol.tags.concat(tags),@@ -1024,7 +1022,6 @@ export abstract class PortfolioCalculator {averagePrice: unitPrice,dateOfFirstActivity: date,dividend: new Big(0),- firstBuyDate: date,includeInHoldings: INVESTMENT_ACTIVITY_TYPES.includes(type),investment: unitPrice.mul(quantity).mul(factor),quantity: quantity.mul(factor),diff --git a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-baln-buy-and-buy.spec.ts b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-baln-buy-and-buy.spec.tsindex a1021a57b6..7858d75464 100644--- a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-baln-buy-and-buy.spec.ts+++ b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-baln-buy-and-buy.spec.ts@@ -153,7 +153,6 @@ describe('PortfolioCalculator', () => {dividendInBaseCurrency: new Big('0'),fee: new Big('3.2'),feeInBaseCurrency: new Big('3.2'),- firstBuyDate: '2021-11-22',grossPerformance: new Big('36.6'),grossPerformancePercentage: new Big('0.07706261539956593567'),grossPerformancePercentageWithCurrencyEffect: new Big(diff --git a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-baln-buy-and-sell-in-two-activities.spec.ts b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-baln-buy-and-sell-in-two-activities.spec.tsindex 002730e32e..8b40c7b70a 100644--- a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-baln-buy-and-sell-in-two-activities.spec.ts+++ b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-baln-buy-and-sell-in-two-activities.spec.ts@@ -169,7 +169,6 @@ describe('PortfolioCalculator', () => {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'),grossPerformancePercentageWithCurrencyEffect: new Big(diff --git a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-baln-buy-and-sell.spec.ts b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-baln-buy-and-sell.spec.tsindex e4ba701585..fc372f68f2 100644--- a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-baln-buy-and-sell.spec.ts+++ b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-baln-buy-and-sell.spec.ts@@ -153,7 +153,6 @@ describe('PortfolioCalculator', () => {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'),grossPerformancePercentageWithCurrencyEffect: new Big(diff --git a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-baln-buy.spec.ts b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-baln-buy.spec.tsindex e6cae78651..926fae6dcc 100644--- a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-baln-buy.spec.ts+++ b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-baln-buy.spec.ts@@ -143,7 +143,6 @@ describe('PortfolioCalculator', () => {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'),grossPerformancePercentageWithCurrencyEffect: new Big(diff --git a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-btceur.spec.ts b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-btceur.spec.tsindex 6cc58a70f6..b216438b8a 100644--- a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-btceur.spec.ts+++ b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-btceur.spec.ts@@ -204,7 +204,6 @@ describe('PortfolioCalculator', () => {dividendInBaseCurrency: new Big('0'),fee: new Big('4.46'),feeInBaseCurrency: new Big('4.46'),- firstBuyDate: '2021-12-12',grossPerformance: new Big('-1458.72'),grossPerformancePercentage: new Big('-0.03273724696701543726'),grossPerformancePercentageWithCurrencyEffect: new Big(diff --git a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-btcusd-buy-and-sell-partially.spec.ts b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-btcusd-buy-and-sell-partially.spec.tsindex 41f1d80a88..14cd4f2175 100644--- a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-btcusd-buy-and-sell-partially.spec.ts+++ b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-btcusd-buy-and-sell-partially.spec.ts@@ -167,7 +167,6 @@ describe('PortfolioCalculator', () => {dividendInBaseCurrency: new Big('0'),fee: new Big('0'),feeInBaseCurrency: new Big('0'),- firstBuyDate: '2015-01-01',grossPerformance: new Big('27172.74').mul(0.97373),grossPerformancePercentage: new Big('0.4241983590271396608571'),grossPerformancePercentageWithCurrencyEffect: new Big(diff --git a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-btcusd.spec.ts b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-btcusd.spec.tsindex b8cecb3502..066f33ea38 100644--- a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-btcusd.spec.ts+++ b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-btcusd.spec.ts@@ -204,7 +204,6 @@ describe('PortfolioCalculator', () => {dividendInBaseCurrency: new Big('0'),fee: new Big('4.46'),feeInBaseCurrency: new Big('4.46'),- firstBuyDate: '2021-12-12',grossPerformance: new Big('-1458.72'),grossPerformancePercentage: new Big('-0.03273724696701543726'),grossPerformancePercentageWithCurrencyEffect: new Big(diff --git a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-cash.spec.ts b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-cash.spec.tsindex bbcaba2942..bd8afddd74 100644--- a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-cash.spec.ts+++ b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-cash.spec.ts@@ -239,7 +239,6 @@ describe('PortfolioCalculator', () => {dividendInBaseCurrency: new Big(0),fee: new Big(0),feeInBaseCurrency: new Big(0),- firstBuyDate: '2023-12-31',grossPerformance: new Big(0),grossPerformancePercentage: new Big(0),grossPerformancePercentageWithCurrencyEffect: new Big(diff --git a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-googl-buy.spec.ts b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-googl-buy.spec.tsindex e438d9c6d6..28b44e1590 100644--- a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-googl-buy.spec.ts+++ b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-googl-buy.spec.ts@@ -149,7 +149,6 @@ describe('PortfolioCalculator', () => {dividendInBaseCurrency: new Big('0'),fee: new Big('1'),feeInBaseCurrency: new Big('0.9238'),- firstBuyDate: '2023-01-03',grossPerformance: new Big('27.33').mul(0.8854),grossPerformancePercentage: new Big('0.3066651705565529623'),grossPerformancePercentageWithCurrencyEffect: new Big(diff --git a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-msft-buy-with-dividend.spec.ts b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-msft-buy-with-dividend.spec.tsindex 88895b8c67..87ef9ed8b8 100644--- a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-msft-buy-with-dividend.spec.ts+++ b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-msft-buy-with-dividend.spec.ts@@ -139,7 +139,6 @@ describe('PortfolioCalculator', () => {dividend: new Big('0.62'),dividendInBaseCurrency: new Big('0.62'),fee: new Big('19'),- firstBuyDate: '2021-09-16',grossPerformance: new Big('33.25'),grossPerformancePercentage: new Big('0.11136043941322258691'),grossPerformancePercentageWithCurrencyEffect: new Big(diff --git a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-novn-buy-and-sell-partially.spec.ts b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-novn-buy-and-sell-partially.spec.tsindex 8c0b1af6a3..7a8dc010a8 100644--- a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-novn-buy-and-sell-partially.spec.ts+++ b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-novn-buy-and-sell-partially.spec.ts@@ -149,7 +149,6 @@ describe('PortfolioCalculator', () => {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'),grossPerformancePercentageWithCurrencyEffect: new Big(diff --git a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-novn-buy-and-sell.spec.ts b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-novn-buy-and-sell.spec.tsindex c4850db662..02a4e80d8d 100644--- a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-novn-buy-and-sell.spec.ts+++ b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-novn-buy-and-sell.spec.ts@@ -202,7 +202,6 @@ describe('PortfolioCalculator', () => {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'),grossPerformancePercentageWithCurrencyEffect: new Big(diff --git a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-valuable.spec.ts b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-valuable.spec.tsindex 5e73841ce0..610a52c069 100644--- a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-valuable.spec.ts+++ b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-valuable.spec.ts@@ -125,7 +125,6 @@ describe('PortfolioCalculator', () => {dividendInBaseCurrency: new Big('0'),fee: new Big('0'),feeInBaseCurrency: new Big('0'),- firstBuyDate: '2022-01-01',grossPerformance: new Big('0'),grossPerformancePercentage: new Big('0'),grossPerformancePercentageWithCurrencyEffect: new Big('0'),diff --git a/apps/api/src/app/portfolio/interfaces/transaction-point-symbol.interface.ts b/apps/api/src/app/portfolio/interfaces/transaction-point-symbol.interface.tsindex ab2351f115..7e7d741ea3 100644--- a/apps/api/src/app/portfolio/interfaces/transaction-point-symbol.interface.ts+++ b/apps/api/src/app/portfolio/interfaces/transaction-point-symbol.interface.ts@@ -11,10 +11,6 @@ export interface TransactionPointSymbol {dividend: Big;fee: Big;feeInBaseCurrency: Big;-- /** @deprecated use dateOfFirstActivity instead */- firstBuyDate: string;-includeInHoldings: boolean;investment: Big;quantity: Big;diff --git a/apps/api/src/app/portfolio/portfolio.service.ts b/apps/api/src/app/portfolio/portfolio.service.tsindex 7db743a43d..05df6a8fcf 100644--- a/apps/api/src/app/portfolio/portfolio.service.ts+++ b/apps/api/src/app/portfolio/portfolio.service.ts@@ -576,8 +576,8 @@ export class PortfolioService {for (const {activitiesCount,currency,+ dateOfFirstActivity,dividend,- firstBuyDate,grossPerformance,grossPerformanceWithCurrencyEffect,grossPerformancePercentage,@@ -633,7 +633,7 @@ export class PortfolioService {assetSubClass: assetProfile.assetSubClass,countries: assetProfile.countries,dataSource: assetProfile.dataSource,- dateOfFirstActivity: parseDate(firstBuyDate),+ dateOfFirstActivity: parseDate(dateOfFirstActivity),dividend: dividend?.toNumber() ?? 0,grossPerformance: grossPerformance?.toNumber() ?? 0,grossPerformancePercent: grossPerformancePercentage?.toNumber() ?? 0,@@ -801,9 +801,9 @@ export class PortfolioService {activitiesCount,averagePrice,currency,+ dateOfFirstActivity,dividendInBaseCurrency,feeInBaseCurrency,- firstBuyDate,grossPerformance,grossPerformancePercentage,grossPerformancePercentageWithCurrencyEffect,@@ -828,7 +828,10 @@ export class PortfolioService {});const dividendYieldPercent = getAnnualizedPerformancePercent({- daysInMarket: differenceInDays(new Date(), parseDate(firstBuyDate)),+ daysInMarket: differenceInDays(+ new Date(),+ parseDate(dateOfFirstActivity)+ ),netPerformancePercentage: timeWeightedInvestment.eq(0)? new Big(0): dividendInBaseCurrency.div(timeWeightedInvestment)@@ -836,7 +839,10 @@ export class PortfolioService {const dividendYieldPercentWithCurrencyEffect =getAnnualizedPerformancePercent({- daysInMarket: differenceInDays(new Date(), parseDate(firstBuyDate)),+ daysInMarket: differenceInDays(+ new Date(),+ parseDate(dateOfFirstActivity)+ ),netPerformancePercentage: timeWeightedInvestmentWithCurrencyEffect.eq(0)? new Big(0): dividendInBaseCurrency.div(timeWeightedInvestmentWithCurrencyEffect)@@ -845,7 +851,7 @@ export class PortfolioService {const historicalData = await this.dataProviderService.getHistorical([{ dataSource, symbol }],'day',- parseISO(firstBuyDate),+ parseISO(dateOfFirstActivity),new Date());@@ -910,7 +916,7 @@ export class PortfolioService {// Add historical entry for buy date, if no historical data availablehistoricalDataArray.push({averagePrice: activitiesOfHolding[0].unitPriceInAssetProfileCurrency,- date: firstBuyDate,+ date: dateOfFirstActivity,marketPrice: activitiesOfHolding[0].unitPriceInAssetProfileCurrency,quantity: activitiesOfHolding[0].quantity});@@ -924,6 +930,7 @@ export class PortfolioService {return {activitiesCount,+ dateOfFirstActivity,marketPrice,marketPriceMax,marketPriceMin,@@ -931,7 +938,6 @@ export class PortfolioService {tags,averagePrice: averagePrice.toNumber(),dataProviderInfo: portfolioCalculator.getDataProviderInfos()?.[0],- dateOfFirstActivity: firstBuyDate,dividendInBaseCurrency: dividendInBaseCurrency.toNumber(),dividendYieldPercent: dividendYieldPercent.toNumber(),dividendYieldPercentWithCurrencyEffect:diff --git a/libs/common/src/lib/models/timeline-position.ts b/libs/common/src/lib/models/timeline-position.tsindex 244d6595e5..9cfb2df04d 100644--- a/libs/common/src/lib/models/timeline-position.ts+++ b/libs/common/src/lib/models/timeline-position.ts@@ -35,9 +35,6 @@ export class TimelinePosition {@Type(() => Big)feeInBaseCurrency: Big;- /** @deprecated use dateOfFirstActivity instead */- firstBuyDate: string;-@Transform(transformToBig, { toClassOnly: true })@Type(() => Big)grossPerformance: Big;