Skip to content

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

Feature/improve premium data provider handling in getQuotes() (#4590)

Thomas Kaul56fcafaa12cb
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 3f02cf109d..a4edd5bfac 100644
--- a/apps/api/src/services/data-provider/data-provider.service.ts
+++ b/apps/api/src/services/data-provider/data-provider.service.ts
@@ -18,6 +18,7 @@ import {
DATE_FORMAT,
getCurrencyFromSymbol,
getStartOfUtcDate,
+ isCurrency,
isDerivedCurrency
} from '@ghostfolio/common/helper';
import {
@@ -468,17 +469,21 @@ export class DataProviderService {
)) {
const dataProvider = this.getDataProvider(DataSource[dataSource]);
- if (
- dataProvider.getDataProviderInfo().isPremium &&
- this.configurationService.get('ENABLE_FEATURE_SUBSCRIPTION') &&
- user?.subscription.type === 'Basic'
- ) {
- continue;
- }
-
const symbols = assetProfileIdentifiers
.filter(({ symbol }) => {
- return !isDerivedCurrency(getCurrencyFromSymbol(symbol));
+ if (isCurrency(getCurrencyFromSymbol(symbol))) {
+ // Keep non-derived currencies
+ return !isDerivedCurrency(getCurrencyFromSymbol(symbol));
+ } else if (
+ dataProvider.getDataProviderInfo().isPremium &&
+ this.configurationService.get('ENABLE_FEATURE_SUBSCRIPTION') &&
+ user?.subscription.type === 'Basic'
+ ) {
+ // Skip symbols of Premium data providers for users without subscription
+ return false;
+ }
+
+ return true;
})
.map(({ symbol }) => {
return symbol;