Expose data source for Fear & Greed Index

apps/api/src/app/endpoints/market-data/market-data.controller.ts

@@ -1,11 +1,11 @@
 import { SymbolService } from '@ghostfolio/api/app/symbol/symbol.service';
 import { HasPermission } from '@ghostfolio/api/decorators/has-permission.decorator';
 import { HasPermissionGuard } from '@ghostfolio/api/guards/has-permission.guard';
+import { DataProviderService } from '@ghostfolio/api/services/data-provider/data-provider.service';
 import { MarketDataService } from '@ghostfolio/api/services/market-data/market-data.service';
 import { SymbolProfileService } from '@ghostfolio/api/services/symbol-profile/symbol-profile.service';
 import {
   ghostfolioFearAndGreedIndexDataSourceCryptocurrencies,
-  ghostfolioFearAndGreedIndexDataSourceStocks,
   ghostfolioFearAndGreedIndexSymbolCryptocurrencies,
   ghostfolioFearAndGreedIndexSymbolStocks
 } from '@ghostfolio/common/config';
@@ -36,6 +36,7 @@ import { getReasonPhrase, StatusCodes } from 'http-status-codes';
 @Controller('market-data')
 export class MarketDataController {
   public constructor(
+    private readonly dataProviderService: DataProviderService,
     private readonly marketDataService: MarketDataService,
     @Inject(REQUEST) private readonly request: RequestWithUser,
     private readonly symbolProfileService: SymbolProfileService,
@@ -64,7 +65,8 @@ export class MarketDataController {
       this.symbolService.get({
         includeHistoricalData,
         dataGatheringItem: {
-          dataSource: ghostfolioFearAndGreedIndexDataSourceStocks,
+          dataSource:
+            this.dataProviderService.getDataSourceForFearAndGreedIndexStocks(),
           symbol: ghostfolioFearAndGreedIndexSymbolStocks
         },
         useIntradayData: true

apps/api/src/app/endpoints/market-data/market-data.module.ts

@@ -1,4 +1,5 @@
 import { SymbolModule } from '@ghostfolio/api/app/symbol/symbol.module';
+import { DataProviderModule } from '@ghostfolio/api/services/data-provider/data-provider.module';
 import { MarketDataModule as MarketDataServiceModule } from '@ghostfolio/api/services/market-data/market-data.module';
 import { SymbolProfileModule } from '@ghostfolio/api/services/symbol-profile/symbol-profile.module';
 
@@ -8,6 +9,11 @@ import { MarketDataController } from './market-data.controller';
 
 @Module({
   controllers: [MarketDataController],
-  imports: [MarketDataServiceModule, SymbolModule, SymbolProfileModule]
+  imports: [
+    DataProviderModule,
+    MarketDataServiceModule,
+    SymbolModule,
+    SymbolProfileModule
+  ]
 })
 export class MarketDataModule {}

apps/api/src/app/info/info.service.ts

@@ -4,6 +4,7 @@ import { UserService } from '@ghostfolio/api/app/user/user.service';
 import { encodeDataSource } from '@ghostfolio/api/helper/data-source.helper';
 import { BenchmarkService } from '@ghostfolio/api/services/benchmark/benchmark.service';
 import { ConfigurationService } from '@ghostfolio/api/services/configuration/configuration.service';
+import { DataProviderService } from '@ghostfolio/api/services/data-provider/data-provider.service';
 import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.service';
 import { PropertyService } from '@ghostfolio/api/services/property/property.service';
 import {
@@ -15,8 +16,7 @@ import {
   PROPERTY_GITHUB_STARGAZERS,
   PROPERTY_IS_READ_ONLY_MODE,
   PROPERTY_SLACK_COMMUNITY_USERS,
-  PROPERTY_UPTIME,
+  PROPERTY_UPTIME
-  ghostfolioFearAndGreedIndexDataSourceStocks
 } from '@ghostfolio/common/config';
 import { InfoItem, Statistics } from '@ghostfolio/common/interfaces';
 import { permissions } from '@ghostfolio/common/permissions';
@@ -33,6 +33,7 @@ export class InfoService {
   public constructor(
     private readonly benchmarkService: BenchmarkService,
     private readonly configurationService: ConfigurationService,
+    private readonly dataProviderService: DataProviderService,
     private readonly exchangeRateDataService: ExchangeRateDataService,
     private readonly jwtService: JwtService,
     private readonly propertyService: PropertyService,
@@ -60,13 +61,15 @@ export class InfoService {
     }
 
     if (this.configurationService.get('ENABLE_FEATURE_FEAR_AND_GREED_INDEX')) {
+      const fearAndGreedIndexDataSource =
+        this.dataProviderService.getDataSourceForFearAndGreedIndexStocks();
+
       if (this.configurationService.get('ENABLE_FEATURE_SUBSCRIPTION')) {
         info.fearAndGreedDataSource = encodeDataSource(
-          ghostfolioFearAndGreedIndexDataSourceStocks
+          fearAndGreedIndexDataSource
         );
       } else {
-        info.fearAndGreedDataSource =
+        info.fearAndGreedDataSource = fearAndGreedIndexDataSource;
-          ghostfolioFearAndGreedIndexDataSourceStocks;
       }
 
       globalPermissions.push(permissions.enableFearAndGreedIndex);

apps/api/src/services/configuration/configuration.service.ts

@@ -34,6 +34,9 @@ export class ConfigurationService {
       CACHE_QUOTES_TTL: num({ default: ms('1 minute') }),
       CACHE_TTL: num({ default: CACHE_TTL_NO_CACHE }),
       DATA_SOURCE_EXCHANGE_RATES: str({ default: DataSource.YAHOO }),
+      DATA_SOURCE_FEAR_AND_GREED_INDEX_STOCKS: str({
+        default: DataSource.RAPID_API
+      }),
       DATA_SOURCE_IMPORT: str({ default: DataSource.YAHOO }),
       DATA_SOURCES: json({
         default: [DataSource.COINGECKO, DataSource.MANUAL, DataSource.YAHOO]

apps/api/src/services/data-provider/data-provider.service.ts

@@ -177,6 +177,12 @@ export class DataProviderService implements OnModuleInit {
     ];
   }
 
+  public getDataSourceForFearAndGreedIndexStocks(): DataSource {
+    return DataSource[
+      this.configurationService.get('DATA_SOURCE_FEAR_AND_GREED_INDEX_STOCKS')
+    ];
+  }
+
   public getDataSourceForImport(): DataSource {
     return DataSource[this.configurationService.get('DATA_SOURCE_IMPORT')];
   }

apps/api/src/services/data-provider/rapid-api/rapid-api.service.ts

@@ -64,6 +64,7 @@ export class RapidApiService implements DataProviderInterface {
       if (symbol === ghostfolioFearAndGreedIndexSymbolStocks) {
         const fgi = await this.getFearAndGreedIndex();
 
+        if (fgi) {
           return {
             [symbol]: {
               [format(getYesterday(), DATE_FORMAT)]: {
@@ -72,6 +73,7 @@ export class RapidApiService implements DataProviderInterface {
             }
           };
         }
+      }
     } catch (error) {
       throw new Error(
         `Could not get historical market data for ${symbol} (${this.getName()}) from ${format(
@@ -101,6 +103,7 @@ export class RapidApiService implements DataProviderInterface {
       if (symbol === ghostfolioFearAndGreedIndexSymbolStocks) {
         const fgi = await this.getFearAndGreedIndex();
 
+        if (fgi) {
           return {
             [symbol]: {
               currency: undefined,
@@ -110,6 +113,7 @@ export class RapidApiService implements DataProviderInterface {
             }
           };
         }
+      }
     } catch (error) {
       this.logger.error(error);
     }

apps/api/src/services/interfaces/environment.interface.ts

@@ -13,6 +13,7 @@ export interface Environment extends CleanedEnvAccessors {
   CACHE_QUOTES_TTL: number;
   CACHE_TTL: number;
   DATA_SOURCE_EXCHANGE_RATES: string;
+  DATA_SOURCE_FEAR_AND_GREED_INDEX_STOCKS: string;
   DATA_SOURCE_IMPORT: string;
   DATA_SOURCES: string[];
   DATA_SOURCES_GHOSTFOLIO_DATA_PROVIDER: string[];

apps/api/src/services/twitter-bot/twitter-bot.module.ts

@@ -1,13 +1,19 @@
 import { SymbolModule } from '@ghostfolio/api/app/symbol/symbol.module';
 import { BenchmarkModule } from '@ghostfolio/api/services/benchmark/benchmark.module';
 import { ConfigurationModule } from '@ghostfolio/api/services/configuration/configuration.module';
+import { DataProviderModule } from '@ghostfolio/api/services/data-provider/data-provider.module';
 import { TwitterBotService } from '@ghostfolio/api/services/twitter-bot/twitter-bot.service';
 
 import { Module } from '@nestjs/common';
 
 @Module({
   exports: [TwitterBotService],
-  imports: [BenchmarkModule, ConfigurationModule, SymbolModule],
+  imports: [
+    BenchmarkModule,
+    ConfigurationModule,
+    DataProviderModule,
+    SymbolModule
+  ],
   providers: [TwitterBotService]
 })
 export class TwitterBotModule {}

apps/api/src/services/twitter-bot/twitter-bot.service.ts

@@ -1,10 +1,8 @@
 import { SymbolService } from '@ghostfolio/api/app/symbol/symbol.service';
 import { BenchmarkService } from '@ghostfolio/api/services/benchmark/benchmark.service';
 import { ConfigurationService } from '@ghostfolio/api/services/configuration/configuration.service';
-import {
+import { DataProviderService } from '@ghostfolio/api/services/data-provider/data-provider.service';
-  ghostfolioFearAndGreedIndexDataSourceStocks,
+import { ghostfolioFearAndGreedIndexSymbolStocks } from '@ghostfolio/common/config';
-  ghostfolioFearAndGreedIndexSymbolStocks
-} from '@ghostfolio/common/config';
 import {
   resolveFearAndGreedIndex,
   resolveMarketCondition
@@ -24,6 +22,7 @@ export class TwitterBotService implements OnModuleInit {
   public constructor(
     private readonly benchmarkService: BenchmarkService,
     private readonly configurationService: ConfigurationService,
+    private readonly dataProviderService: DataProviderService,
     private readonly symbolService: SymbolService
   ) {}
 
@@ -49,7 +48,8 @@ export class TwitterBotService implements OnModuleInit {
     try {
       const symbolItem = await this.symbolService.get({
         dataGatheringItem: {
-          dataSource: ghostfolioFearAndGreedIndexDataSourceStocks,
+          dataSource:
+            this.dataProviderService.getDataSourceForFearAndGreedIndexStocks(),
           symbol: ghostfolioFearAndGreedIndexSymbolStocks
         }
       });

libs/common/src/lib/config.ts

@@ -11,7 +11,6 @@ export const ghostfolioScraperApiSymbolPrefix = `_${ghostfolioPrefix}_`;
 
 export const ghostfolioFearAndGreedIndexDataSourceCryptocurrencies =
   DataSource.MANUAL;
-export const ghostfolioFearAndGreedIndexDataSourceStocks = DataSource.RAPID_API;
 export const ghostfolioFearAndGreedIndexSymbolCryptocurrencies = `${ghostfolioPrefix}_FEAR_AND_GREED_INDEX_CRYPTOCURRENCIES`;
 export const ghostfolioFearAndGreedIndexSymbolStocks = `${ghostfolioPrefix}_FEAR_AND_GREED_INDEX_STOCKS`;