Open Source Wealth Management Software. Angular + NestJS + Prisma + Nx + TypeScript 🤍
TypeScript angularetffinancefintechghostfoliohacktoberfestinvestingnestjsosspersonal-financeportfolioprismasoftwarestocktrackertradingtypescriptwealth-managementweb
Move getChart() to portfolio calculator (#3255)
Thomas Kaul2b97bbd05daa
diff --git a/apps/api/src/app/portfolio/calculator/portfolio-calculator.ts b/apps/api/src/app/portfolio/calculator/portfolio-calculator.tsindex 488f9ce992..a9dbff442b 100644--- a/apps/api/src/app/portfolio/calculator/portfolio-calculator.ts+++ b/apps/api/src/app/portfolio/calculator/portfolio-calculator.ts@@ -4,9 +4,13 @@ import { CurrentPositions } from '@ghostfolio/api/app/portfolio/interfaces/curreimport { PortfolioOrder } from '@ghostfolio/api/app/portfolio/interfaces/portfolio-order.interface';import { TransactionPointSymbol } from '@ghostfolio/api/app/portfolio/interfaces/transaction-point-symbol.interface';import { TransactionPoint } from '@ghostfolio/api/app/portfolio/interfaces/transaction-point.interface';-import { getFactor } from '@ghostfolio/api/helper/portfolio.helper';+import {+ getFactor,+ getInterval+} from '@ghostfolio/api/helper/portfolio.helper';import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.service';import { IDataGatheringItem } from '@ghostfolio/api/services/interfaces/interfaces';+import { MAX_CHART_ITEMS } from '@ghostfolio/common/config';import { DATE_FORMAT, parseDate, resetHours } from '@ghostfolio/common/helper';import {DataProviderInfo,@@ -17,10 +21,11 @@ import {TimelinePosition,UniqueAsset} from '@ghostfolio/common/interfaces';-import { GroupBy } from '@ghostfolio/common/types';+import { DateRange, GroupBy } from '@ghostfolio/common/types';import { Big } from 'big.js';import {+ differenceInDays,eachDayOfInterval,endOfDay,format,@@ -81,6 +86,31 @@ export abstract class PortfolioCalculator {positions: TimelinePosition[]): CurrentPositions;+ public async getChart({+ dateRange = 'max',+ withDataDecimation = true+ }: {+ dateRange?: DateRange;+ withDataDecimation?: boolean;+ }): Promise<HistoricalDataItem[]> {+ if (this.getTransactionPoints().length === 0) {+ return [];+ }++ const { endDate, startDate } = getInterval(dateRange, this.getStartDate());++ const daysInMarket = differenceInDays(endDate, startDate) + 1;+ const step = withDataDecimation+ ? Math.round(daysInMarket / Math.min(daysInMarket, MAX_CHART_ITEMS))+ : 1;++ return this.getChartData({+ step,+ end: endDate,+ start: startDate+ });+ }+public async getChartData({end = new Date(Date.now()),start,diff --git a/apps/api/src/app/portfolio/interfaces/portfolio-position-detail.interface.ts b/apps/api/src/app/portfolio/interfaces/portfolio-position-detail.interface.tsindex c058a02493..a32d47e211 100644--- a/apps/api/src/app/portfolio/interfaces/portfolio-position-detail.interface.ts+++ b/apps/api/src/app/portfolio/interfaces/portfolio-position-detail.interface.ts@@ -36,9 +36,3 @@ export interface PortfolioPositionDetail {transactionCount: number;value: number;}--export interface HistoricalDataContainer {- isAllTimeHigh: boolean;- isAllTimeLow: boolean;- items: HistoricalDataItem[];-}diff --git a/apps/api/src/app/portfolio/portfolio.service.ts b/apps/api/src/app/portfolio/portfolio.service.tsindex 99fb47e2cd..198395e51b 100644--- a/apps/api/src/app/portfolio/portfolio.service.ts+++ b/apps/api/src/app/portfolio/portfolio.service.ts@@ -21,7 +21,6 @@ import { SymbolProfileService } from '@ghostfolio/api/services/symbol-profile/syimport {DEFAULT_CURRENCY,EMERGENCY_FUND_TAG_ID,- MAX_CHART_ITEMS,UNKNOWN_KEY} from '@ghostfolio/common/config';import {@@ -63,8 +62,7 @@ import {DataSource,Order,Platform,- Prisma,- SymbolProfile+ Prisma} from '@prisma/client';import { Big } from 'big.js';import { isUUID } from 'class-validator';@@ -80,15 +78,11 @@ import {} from 'date-fns';import { isEmpty, isNumber, last, uniq, uniqBy } from 'lodash';-import { PortfolioCalculator } from './calculator/portfolio-calculator';import {PerformanceCalculationType,PortfolioCalculatorFactory} from './calculator/portfolio-calculator.factory';-import {- HistoricalDataContainer,- PortfolioPositionDetail-} from './interfaces/portfolio-position-detail.interface';+import { PortfolioPositionDetail } from './interfaces/portfolio-position-detail.interface';import { RulesService } from './rules.service';const asiaPacificMarkets = require('../../assets/countries/asia-pacific-markets.json');@@ -292,11 +286,8 @@ export class PortfolioService {currency: this.request.user.Settings.settings.baseCurrency});- const { items } = await this.getChart({+ const items = await portfolioCalculator.getChart({dateRange,- impersonationId,- portfolioCalculator,- userId,withDataDecimation: false});@@ -1161,11 +1152,8 @@ export class PortfolioService {let currentNetPerformanceWithCurrencyEffect =netPerformanceWithCurrencyEffect;- const { items } = await this.getChart({- dateRange,- impersonationId,- portfolioCalculator,- userId+ const items = await portfolioCalculator.getChart({+ dateRange});const itemOfToday = items.find(({ date }) => {@@ -1381,52 +1369,6 @@ export class PortfolioService {return cashPositions;}- private async getChart({- dateRange = 'max',- impersonationId,- portfolioCalculator,- userId,- withDataDecimation = true- }: {- dateRange?: DateRange;- impersonationId: string;- portfolioCalculator: PortfolioCalculator;- userId: string;- withDataDecimation?: boolean;- }): Promise<HistoricalDataContainer> {- if (portfolioCalculator.getTransactionPoints().length === 0) {- return {- isAllTimeHigh: false,- isAllTimeLow: false,- items: []- };- }-- userId = await this.getUserId(impersonationId, userId);-- const { endDate, startDate } = getInterval(- dateRange,- portfolioCalculator.getStartDate()- );-- const daysInMarket = differenceInDays(endDate, startDate) + 1;- const step = withDataDecimation- ? Math.round(daysInMarket / Math.min(daysInMarket, MAX_CHART_ITEMS))- : 1;-- const items = await portfolioCalculator.getChartData({- step,- end: endDate,- start: startDate- });-- return {- items,- isAllTimeHigh: false,- isAllTimeLow: false- };- }-private getDividendsByGroup({dividends,groupBy