Skip to content

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

Task/refactor firstOrderDate to dateOfFirstActivity in portfolio service (#6161)

Thomas Kaul09e7e6182d97
diff --git a/apps/api/src/app/portfolio/portfolio.service.ts b/apps/api/src/app/portfolio/portfolio.service.ts
index 5613af9e71..4bc10bd495 100644
--- a/apps/api/src/app/portfolio/portfolio.service.ts
+++ b/apps/api/src/app/portfolio/portfolio.service.ts
@@ -1872,18 +1872,17 @@ export class PortfolioService {
netPerformanceWithCurrencyEffect
} = performance;
- const dividendInBaseCurrency =
- await portfolioCalculator.getDividendInBaseCurrency();
-
const totalEmergencyFund = this.getTotalEmergencyFund({
emergencyFundHoldingsValueInBaseCurrency,
userSettings: user.settings?.settings as UserSettings
});
- const fees = await portfolioCalculator.getFeesInBaseCurrency();
+ const dateOfFirstActivity = portfolioCalculator.getStartDate();
- const firstOrderDate = portfolioCalculator.getStartDate();
+ const dividendInBaseCurrency =
+ await portfolioCalculator.getDividendInBaseCurrency();
+ const fees = await portfolioCalculator.getFeesInBaseCurrency();
const interest = await portfolioCalculator.getInterestInBaseCurrency();
const liabilities =
@@ -1941,7 +1940,7 @@ export class PortfolioService {
.minus(liabilities)
.toNumber();
- const daysInMarket = differenceInDays(new Date(), firstOrderDate);
+ const daysInMarket = differenceInDays(new Date(), dateOfFirstActivity);
const annualizedPerformancePercent = getAnnualizedPerformancePercent({
daysInMarket,
@@ -1960,6 +1959,7 @@ export class PortfolioService {
annualizedPerformancePercent,
annualizedPerformancePercentWithCurrencyEffect,
cash,
+ dateOfFirstActivity,
excludedAccountsAndActivities,
netPerformance,
netPerformancePercentage,
@@ -1972,7 +1972,6 @@ export class PortfolioService {
}).length,
committedFunds: committedFunds.toNumber(),
currentValueInBaseCurrency: currentValueInBaseCurrency.toNumber(),
- dateOfFirstActivity: firstOrderDate,
dividendInBaseCurrency: dividendInBaseCurrency.toNumber(),
emergencyFund: {
assets: emergencyFundHoldingsValueInBaseCurrency,