From 4d15bfe0ef6ee37ba4d485b0e07186d0799670a9 Mon Sep 17 00:00:00 2001 From: Thomas Kaul <4159106+dtslvr@users.noreply.github.com> Date: Sat, 5 Sep 2026 18:35:48 +0200 Subject: [PATCH] Refactoring --- .../calculator/portfolio-calculator.factory.ts | 7 +++++++ .../portfolio/calculator/portfolio-calculator.ts | 8 +++++++- .../api/src/app/portfolio/current-rate.service.ts | 15 ++++++--------- .../interfaces/get-values-params.interface.ts | 2 ++ apps/api/src/app/portfolio/portfolio.service.ts | 12 ++++++++---- .../data-provider/data-provider.service.ts | 8 ++++---- 6 files changed, 34 insertions(+), 18 deletions(-) diff --git a/apps/api/src/app/portfolio/calculator/portfolio-calculator.factory.ts b/apps/api/src/app/portfolio/calculator/portfolio-calculator.factory.ts index 7d95988c1f..48ab8f3218 100644 --- a/apps/api/src/app/portfolio/calculator/portfolio-calculator.factory.ts +++ b/apps/api/src/app/portfolio/calculator/portfolio-calculator.factory.ts @@ -3,6 +3,7 @@ import { RedisCacheService } from '@ghostfolio/api/app/redis-cache/redis-cache.s import { ConfigurationService } from '@ghostfolio/api/services/configuration/configuration.service'; import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.service'; import { PortfolioSnapshotService } from '@ghostfolio/api/services/queues/portfolio-snapshot/portfolio-snapshot.service'; +import { SubscriptionType } from '@ghostfolio/common/enums'; import { Activity, Filter, @@ -35,6 +36,7 @@ export class PortfolioCalculatorFactory { currency, filters = [], usePortfolioSnapshotCache = true, + subscriptionType, userId }: { accountBalanceItems?: HistoricalDataItem[]; @@ -43,6 +45,7 @@ export class PortfolioCalculatorFactory { currency: string; filters?: Filter[]; usePortfolioSnapshotCache?: boolean; + subscriptionType?: SubscriptionType; userId: string; }): PortfolioCalculator { switch (calculationType) { @@ -53,6 +56,7 @@ export class PortfolioCalculatorFactory { currency, filters, usePortfolioSnapshotCache, + subscriptionType, userId, configurationService: this.configurationService, currentRateService: this.currentRateService, @@ -68,6 +72,7 @@ export class PortfolioCalculatorFactory { currency, filters, usePortfolioSnapshotCache, + subscriptionType, userId, configurationService: this.configurationService, currentRateService: this.currentRateService, @@ -83,6 +88,7 @@ export class PortfolioCalculatorFactory { currency, filters, usePortfolioSnapshotCache, + subscriptionType, userId, configurationService: this.configurationService, currentRateService: this.currentRateService, @@ -98,6 +104,7 @@ export class PortfolioCalculatorFactory { currency, filters, usePortfolioSnapshotCache, + subscriptionType, userId, configurationService: this.configurationService, currentRateService: this.currentRateService, diff --git a/apps/api/src/app/portfolio/calculator/portfolio-calculator.ts b/apps/api/src/app/portfolio/calculator/portfolio-calculator.ts index eb3d05a6ba..dfbe99c8de 100644 --- a/apps/api/src/app/portfolio/calculator/portfolio-calculator.ts +++ b/apps/api/src/app/portfolio/calculator/portfolio-calculator.ts @@ -20,6 +20,7 @@ import { PORTFOLIO_SNAPSHOT_COMPUTATION_QUEUE_PRIORITY_HIGH, PORTFOLIO_SNAPSHOT_COMPUTATION_QUEUE_PRIORITY_LOW } from '@ghostfolio/common/config'; +import { SubscriptionType } from '@ghostfolio/common/enums'; import { DATE_FORMAT, getAssetProfileIdentifier, @@ -89,6 +90,7 @@ export abstract class PortfolioCalculator { private snapshot: PortfolioSnapshot; private snapshotPromise: Promise; private startDate: Date; + private subscriptionType?: SubscriptionType; private transactionPoints: TransactionPoint[]; private usePortfolioSnapshotCache: boolean; private userId: string; @@ -104,6 +106,7 @@ export abstract class PortfolioCalculator { portfolioSnapshotService, redisCacheService, usePortfolioSnapshotCache = true, + subscriptionType, userId }: { accountBalanceItems: HistoricalDataItem[]; @@ -116,6 +119,7 @@ export abstract class PortfolioCalculator { portfolioSnapshotService: PortfolioSnapshotService; redisCacheService: RedisCacheService; usePortfolioSnapshotCache?: boolean; + subscriptionType?: SubscriptionType; userId: string; }) { this.accountBalanceItems = accountBalanceItems; @@ -179,6 +183,7 @@ export abstract class PortfolioCalculator { this.portfolioSnapshotService = portfolioSnapshotService; this.redisCacheService = redisCacheService; this.usePortfolioSnapshotCache = usePortfolioSnapshotCache; + this.subscriptionType = subscriptionType; this.userId = userId; const { endDate, startDate } = getIntervalFromDateRange({ @@ -286,7 +291,8 @@ export abstract class PortfolioCalculator { dateQuery: { gte: this.startDate, lt: this.endDate - } + }, + subscriptionType: this.subscriptionType }); this.dataProviderInfos = dataProviderInfos; diff --git a/apps/api/src/app/portfolio/current-rate.service.ts b/apps/api/src/app/portfolio/current-rate.service.ts index 9cfeda3bdc..66119a3c63 100644 --- a/apps/api/src/app/portfolio/current-rate.service.ts +++ b/apps/api/src/app/portfolio/current-rate.service.ts @@ -11,10 +11,8 @@ import { DataProviderInfo, ResponseError } from '@ghostfolio/common/interfaces'; -import type { RequestWithUser } from '@ghostfolio/common/types'; -import { Inject, Injectable } from '@nestjs/common'; -import { REQUEST } from '@nestjs/core'; +import { Injectable } from '@nestjs/common'; import { isBefore, isToday } from 'date-fns'; import { isEmpty, uniqBy } from 'lodash'; @@ -29,15 +27,14 @@ export class CurrentRateService { public constructor( private readonly activitiesService: ActivitiesService, private readonly dataProviderService: DataProviderService, - private readonly marketDataService: MarketDataService, - @Inject(REQUEST) private readonly request: RequestWithUser + private readonly marketDataService: MarketDataService ) {} @LogPerformance - // TODO: Pass user instead of using this.request.user public async getValues({ dataGatheringItems, - dateQuery + dateQuery, + subscriptionType }: GetValuesParams): Promise { const dataProviderInfos: DataProviderInfo[] = []; @@ -52,8 +49,8 @@ export class CurrentRateService { if (includesToday) { const quotes = await this.dataProviderService.getQuotes({ - items: dataGatheringItems, - user: this.request?.user + subscriptionType, + items: dataGatheringItems }); for (const { dataSource, symbol } of dataGatheringItems) { diff --git a/apps/api/src/app/portfolio/interfaces/get-values-params.interface.ts b/apps/api/src/app/portfolio/interfaces/get-values-params.interface.ts index ffb74ee9b2..e74c501be6 100644 --- a/apps/api/src/app/portfolio/interfaces/get-values-params.interface.ts +++ b/apps/api/src/app/portfolio/interfaces/get-values-params.interface.ts @@ -1,8 +1,10 @@ import { DataGatheringItem } from '@ghostfolio/api/services/interfaces/interfaces'; +import { SubscriptionType } from '@ghostfolio/common/enums'; import { DateQuery } from './date-query.interface'; export interface GetValuesParams { dataGatheringItems: DataGatheringItem[]; dateQuery: DateQuery; + subscriptionType?: SubscriptionType; } diff --git a/apps/api/src/app/portfolio/portfolio.service.ts b/apps/api/src/app/portfolio/portfolio.service.ts index 60dab50329..fd941286c2 100644 --- a/apps/api/src/app/portfolio/portfolio.service.ts +++ b/apps/api/src/app/portfolio/portfolio.service.ts @@ -546,7 +546,8 @@ export class PortfolioService { filters, userId, calculationType: this.getUserPerformanceCalculationType(user), - currency: userCurrency + currency: userCurrency, + subscriptionType: user.subscription?.type }); const { historicalData } = await portfolioCalculator.getSnapshot(); @@ -633,7 +634,8 @@ export class PortfolioService { userId, calculationType: this.getUserPerformanceCalculationType(user), currency: userCurrency, - filters: portfolioSnapshotFilters + filters: portfolioSnapshotFilters, + subscriptionType: user.subscription?.type }); const { createdAt, currentValueInBaseCurrency, hasErrors, positions } = @@ -963,7 +965,8 @@ export class PortfolioService { calculationType: this.getUserPerformanceCalculationType(user), currency: userCurrency, filters: isExcludedHolding ? holdingFilters : undefined, - usePortfolioSnapshotCache: !isExcludedHolding + usePortfolioSnapshotCache: !isExcludedHolding, + subscriptionType: user.subscription?.type }); const transactionPoints = portfolioCalculator.getTransactionPoints(); @@ -1218,7 +1221,8 @@ export class PortfolioService { filters, userId, calculationType: this.getUserPerformanceCalculationType(user), - currency: userCurrency + currency: userCurrency, + subscriptionType: user.subscription?.type }); const { errors, hasErrors, historicalData } = diff --git a/apps/api/src/services/data-provider/data-provider.service.ts b/apps/api/src/services/data-provider/data-provider.service.ts index 0417315d48..87c1e85c61 100644 --- a/apps/api/src/services/data-provider/data-provider.service.ts +++ b/apps/api/src/services/data-provider/data-provider.service.ts @@ -594,13 +594,13 @@ export class DataProviderService implements OnModuleInit { public async getQuotes({ items, requestTimeout, - useCache = true, - user + subscriptionType, + useCache = true }: { items: AssetProfileIdentifier[]; requestTimeout?: number; + subscriptionType?: SubscriptionType; useCache?: boolean; - user?: UserWithSettings; }): Promise<{ [assetProfileIdentifier: string]: DataProviderResponse; }> { @@ -687,7 +687,7 @@ export class DataProviderService implements OnModuleInit { } else if ( dataProvider.getDataProviderInfo().isPremium && this.configurationService.get('ENABLE_FEATURE_SUBSCRIPTION') && - user?.subscription?.type === SubscriptionType.Basic + subscriptionType === SubscriptionType.Basic ) { // Skip symbols of Premium data providers for users without subscription return false;