Open Source Wealth Management Software. Angular + NestJS + Prisma + Nx + TypeScript 🤍
TypeScript angularetffinancefintechghostfoliohacktoberfestinvestingnestjsosspersonal-financeportfolioprismasoftwarestocktrackertradingtypescriptwealth-managementweb
Feature/extend get data sources in data provider service (#4473)
Thomas Kaula6952a0e37c3
diff --git a/apps/api/src/app/import/import.service.ts b/apps/api/src/app/import/import.service.tsindex 698d13e2b6..4d9613ee71 100644--- a/apps/api/src/app/import/import.service.ts+++ b/apps/api/src/app/import/import.service.ts@@ -586,7 +586,7 @@ export class ImportService {const assetProfiles: {[assetProfileIdentifier: string]: Partial<SymbolProfile>;} = {};- const dataSources = await this.dataProviderService.getDataSources();+ const dataSources = await this.dataProviderService.getDataSources({ user });for (const [index,diff --git a/apps/api/src/services/configuration/configuration.service.ts b/apps/api/src/services/configuration/configuration.service.tsindex 473d909ee2..602ad5e9c2 100644--- a/apps/api/src/services/configuration/configuration.service.ts+++ b/apps/api/src/services/configuration/configuration.service.ts@@ -40,6 +40,9 @@ export class ConfigurationService {DATA_SOURCES_GHOSTFOLIO_DATA_PROVIDER: json({default: []}),+ DATA_SOURCES_LEGACY: json({+ default: []+ }),ENABLE_FEATURE_FEAR_AND_GREED_INDEX: bool({ default: false }),ENABLE_FEATURE_READ_ONLY_MODE: bool({ default: false }),ENABLE_FEATURE_SOCIAL_LOGIN: bool({ default: false }),diff --git a/apps/api/src/services/data-provider/data-provider.service.ts b/apps/api/src/services/data-provider/data-provider.service.tsindex 7c0df7a9f2..88ae136aed 100644--- a/apps/api/src/services/data-provider/data-provider.service.ts+++ b/apps/api/src/services/data-provider/data-provider.service.ts@@ -30,7 +30,7 @@ import type { Granularity, UserWithSettings } from '@ghostfolio/common/types';import { Inject, Injectable, Logger } from '@nestjs/common';import { DataSource, MarketData, SymbolProfile } from '@prisma/client';import { Big } from 'big.js';-import { eachDayOfInterval, format, isValid } from 'date-fns';+import { eachDayOfInterval, format, isBefore, isValid } from 'date-fns';import { groupBy, isEmpty, isNumber, uniqWith } from 'lodash';import ms from 'ms';@@ -154,9 +154,22 @@ export class DataProviderService {return DataSource[this.configurationService.get('DATA_SOURCE_IMPORT')];}- public async getDataSources(): Promise<DataSource[]> {+ public async getDataSources({+ user+ }: {+ user: UserWithSettings;+ }): Promise<DataSource[]> {+ let dataSourcesKey: 'DATA_SOURCES' | 'DATA_SOURCES_LEGACY' = 'DATA_SOURCES';++ if (+ isBefore(user.createdAt, new Date('2025-03-23')) &&+ this.configurationService.get('DATA_SOURCES_LEGACY')?.length > 0+ ) {+ dataSourcesKey = 'DATA_SOURCES_LEGACY';+ }+const dataSources: DataSource[] = this.configurationService- .get('DATA_SOURCES')+ .get(dataSourcesKey).map((dataSource) => {return DataSource[dataSource];});@@ -608,7 +621,7 @@ export class DataProviderService {return { items: lookupItems };}- const dataSources = await this.getDataSources();+ const dataSources = await this.getDataSources({ user });const dataProviderServices = dataSources.map((dataSource) => {return this.getDataProvider(DataSource[dataSource]);diff --git a/apps/api/src/services/interfaces/environment.interface.ts b/apps/api/src/services/interfaces/environment.interface.tsindex 2f94739fb4..c0e228429a 100644--- a/apps/api/src/services/interfaces/environment.interface.ts+++ b/apps/api/src/services/interfaces/environment.interface.ts@@ -16,6 +16,7 @@ export interface Environment extends CleanedEnvAccessors {DATA_SOURCE_IMPORT: string;DATA_SOURCES: string[];DATA_SOURCES_GHOSTFOLIO_DATA_PROVIDER: string[];+ DATA_SOURCES_LEGACY: string[];ENABLE_FEATURE_FEAR_AND_GREED_INDEX: boolean;ENABLE_FEATURE_READ_ONLY_MODE: boolean;ENABLE_FEATURE_SOCIAL_LOGIN: boolean;