Open Source Wealth Management Software. Angular + NestJS + Prisma + Nx + TypeScript 🤍
TypeScript angularetffinancefintechghostfoliohacktoberfestinvestingnestjsosspersonal-financeportfolioprismasoftwarestocktrackertradingtypescriptwealth-managementweb
Task/deprecate firstBuyDate in portfolio calculator (#6239)
Thomas Kaul13031aaad372
diff --git a/CHANGELOG.md b/CHANGELOG.mdindex 4421d1a216..2b504ddca5 100644--- a/CHANGELOG.md+++ b/CHANGELOG.md@@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0### Changed+- Deprecated `firstBuyDate` in favor of `dateOfFirstActivity` in the portfolio calculator- Deprecated `transactionCount` in favor of `activitiesCount` in the portfolio calculator and service- Removed the deprecated `firstBuyDate` from the endpoint `GET api/v1/portfolio/holding/:dataSource/:symbol`- Upgraded `prettier` from version `3.7.4` to `3.8.0`diff --git a/apps/api/src/app/portfolio/calculator/portfolio-calculator.ts b/apps/api/src/app/portfolio/calculator/portfolio-calculator.tsindex 22d9e09aee..b3b1d3410c 100644--- a/apps/api/src/app/portfolio/calculator/portfolio-calculator.ts+++ b/apps/api/src/app/portfolio/calculator/portfolio-calculator.ts@@ -411,6 +411,7 @@ export abstract class PortfolioCalculator {averagePrice: item.averagePrice,currency: item.currency,dataSource: item.dataSource,+ dateOfFirstActivity: item.dateOfFirstActivity,dividend: totalDividend,dividendInBaseCurrency: totalDividendInBaseCurrency,fee: item.fee,@@ -998,6 +999,7 @@ export abstract class PortfolioCalculator {averagePrice: newQuantity.eq(0)? new Big(0): investment.div(newQuantity).abs(),+ dateOfFirstActivity: oldAccumulatedSymbol.dateOfFirstActivity,dividend: new Big(0),fee: oldAccumulatedSymbol.fee.plus(fee),feeInBaseCurrency:@@ -1020,6 +1022,7 @@ export abstract class PortfolioCalculator {tags,activitiesCount: 1,averagePrice: unitPrice,+ dateOfFirstActivity: date,dividend: new Big(0),firstBuyDate: date,includeInHoldings: INVESTMENT_ACTIVITY_TYPES.includes(type),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 b715d04376..5368640af4 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@@ -143,6 +143,7 @@ describe('PortfolioCalculator', () => {averagePrice: new Big('139.75'),currency: 'CHF',dataSource: 'YAHOO',+ dateOfFirstActivity: '2021-11-22',dividend: new Big('0'),dividendInBaseCurrency: new Big('0'),fee: new Big('3.2'),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 5e1593fbb2..aad4a91d3d 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@@ -159,6 +159,7 @@ describe('PortfolioCalculator', () => {averagePrice: new Big('0'),currency: 'CHF',dataSource: 'YAHOO',+ dateOfFirstActivity: '2021-11-22',dividend: new Big('0'),dividendInBaseCurrency: new Big('0'),fee: new Big('3.2'),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 65d2a93a66..e75053d6bf 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@@ -143,6 +143,7 @@ describe('PortfolioCalculator', () => {averagePrice: new Big('0'),currency: 'CHF',dataSource: 'YAHOO',+ dateOfFirstActivity: '2021-11-22',dividend: new Big('0'),dividendInBaseCurrency: new Big('0'),fee: new Big('3.2'),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 ed002317bd..71fc36fd42 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@@ -133,6 +133,7 @@ describe('PortfolioCalculator', () => {averagePrice: new Big('136.6'),currency: 'CHF',dataSource: 'YAHOO',+ dateOfFirstActivity: '2021-11-30',dividend: new Big('0'),dividendInBaseCurrency: new Big('0'),fee: new Big('1.55'),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 af4f176116..89eedb78f4 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@@ -194,6 +194,7 @@ describe('PortfolioCalculator', () => {averagePrice: new Big('44558.42'),currency: 'USD',dataSource: 'YAHOO',+ dateOfFirstActivity: '2021-12-12',dividend: new Big('0'),dividendInBaseCurrency: new Big('0'),fee: new Big('4.46'),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 5dd99dbf45..4cce2d8cc7 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@@ -157,6 +157,7 @@ describe('PortfolioCalculator', () => {averagePrice: new Big('320.43'),currency: 'USD',dataSource: 'YAHOO',+ dateOfFirstActivity: '2015-01-01',dividend: new Big('0'),dividendInBaseCurrency: new Big('0'),fee: new Big('0'),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 929ebc76d3..cb80c2c294 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@@ -194,6 +194,7 @@ describe('PortfolioCalculator', () => {averagePrice: new Big('44558.42'),currency: 'USD',dataSource: 'YAHOO',+ dateOfFirstActivity: '2021-12-12',dividend: new Big('0'),dividendInBaseCurrency: new Big('0'),fee: new Big('4.46'),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 ba22c565d3..bbcaba2942 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@@ -234,6 +234,7 @@ describe('PortfolioCalculator', () => {averagePrice: new Big(1),currency: 'USD',dataSource: DataSource.YAHOO,+ dateOfFirstActivity: '2023-12-31',dividend: new Big(0),dividendInBaseCurrency: new Big(0),fee: new Big(0),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 a14e28dff4..1e9aa0c7c1 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@@ -139,6 +139,7 @@ describe('PortfolioCalculator', () => {averagePrice: new Big('89.12'),currency: 'USD',dataSource: 'YAHOO',+ dateOfFirstActivity: '2023-01-03',dividend: new Big('0'),dividendInBaseCurrency: new Big('0'),fee: new Big('1'),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 4b2698ccb2..88895b8c67 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@@ -135,6 +135,7 @@ describe('PortfolioCalculator', () => {averagePrice: new Big('298.58'),currency: 'USD',dataSource: 'YAHOO',+ dateOfFirstActivity: '2021-09-16',dividend: new Big('0.62'),dividendInBaseCurrency: new Big('0.62'),fee: new Big('19'),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 852c3c13a2..2c8384ad0e 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@@ -139,6 +139,7 @@ describe('PortfolioCalculator', () => {averagePrice: new Big('75.80'),currency: 'CHF',dataSource: 'YAHOO',+ dateOfFirstActivity: '2022-03-07',dividend: new Big('0'),dividendInBaseCurrency: new Big('0'),fee: new Big('4.25'),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 8764da3eeb..09b3b45457 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@@ -192,6 +192,7 @@ describe('PortfolioCalculator', () => {averagePrice: new Big('0'),currency: 'CHF',dataSource: 'YAHOO',+ dateOfFirstActivity: '2022-03-07',dividend: new Big('0'),dividendInBaseCurrency: new Big('0'),fee: new Big('0'),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 554f74046f..5e73841ce0 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@@ -120,6 +120,7 @@ describe('PortfolioCalculator', () => {averagePrice: new Big('500000'),currency: 'USD',dataSource: 'MANUAL',+ dateOfFirstActivity: '2022-01-01',dividend: new Big('0'),dividendInBaseCurrency: new Big('0'),fee: 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 6e0bb4ac3f..ab2351f115 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@@ -7,10 +7,14 @@ export interface TransactionPointSymbol {averagePrice: Big;currency: string;dataSource: DataSource;+ dateOfFirstActivity: string;dividend: Big;fee: Big;feeInBaseCurrency: Big;++ /** @deprecated use dateOfFirstActivity instead */firstBuyDate: string;+includeInHoldings: boolean;investment: Big;quantity: Big;diff --git a/libs/common/src/lib/models/timeline-position.ts b/libs/common/src/lib/models/timeline-position.tsindex 4144f349d3..244d6595e5 100644--- a/libs/common/src/lib/models/timeline-position.ts+++ b/libs/common/src/lib/models/timeline-position.ts@@ -17,6 +17,7 @@ export class TimelinePosition {currency: string;dataSource: DataSource;+ dateOfFirstActivity: string;@Transform(transformToBig, { toClassOnly: true })@Type(() => Big)@@ -34,6 +35,7 @@ export class TimelinePosition {@Type(() => Big)feeInBaseCurrency: Big;+ /** @deprecated use dateOfFirstActivity instead */firstBuyDate: string;@Transform(transformToBig, { toClassOnly: true })