From cc6132e3bca3a6a98f485c375ad486f3c047098d Mon Sep 17 00:00:00 2001 From: Valentin Zickner Date: Sun, 8 Aug 2021 21:25:07 +0200 Subject: [PATCH] introduce ExchangeRateDataModule --- apps/api/src/app/account/account.module.ts | 9 +++++---- apps/api/src/app/admin/admin.module.ts | 5 +++-- apps/api/src/app/app.module.ts | 4 +++- apps/api/src/app/core/core.module.ts | 11 ++++++++--- apps/api/src/app/experimental/experimental.module.ts | 12 ++++-------- apps/api/src/app/portfolio/portfolio.module.ts | 4 ++-- apps/api/src/services/exchange-rate-data.module.ts | 10 ++++++++++ 7 files changed, 35 insertions(+), 20 deletions(-) create mode 100644 apps/api/src/services/exchange-rate-data.module.ts diff --git a/apps/api/src/app/account/account.module.ts b/apps/api/src/app/account/account.module.ts index c5947bc71..6a13031a4 100644 --- a/apps/api/src/app/account/account.module.ts +++ b/apps/api/src/app/account/account.module.ts @@ -1,6 +1,4 @@ import { DataProviderModule } from '@ghostfolio/api/services/data-provider/data-provider.module'; -import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data.service'; -import { ImpersonationService } from '@ghostfolio/api/services/impersonation.service'; import { Module } from '@nestjs/common'; import { RedisCacheModule } from '../redis-cache/redis-cache.module'; @@ -8,15 +6,18 @@ import { AccountController } from './account.controller'; import { AccountService } from './account.service'; import { ConfigurationModule } from '@ghostfolio/api/services/configuration.module'; import { PrismaModule } from '@ghostfolio/api/services/prisma.module'; +import { ExchangeRateDataModule } from '@ghostfolio/api/services/exchange-rate-data.module'; +import { ImpersonationService } from '@ghostfolio/api/services/impersonation.service'; @Module({ imports: [ ConfigurationModule, - RedisCacheModule, DataProviderModule, + ExchangeRateDataModule, + RedisCacheModule, PrismaModule ], controllers: [AccountController], - providers: [AccountService, ExchangeRateDataService, ImpersonationService] + providers: [AccountService, ImpersonationService] }) export class AccountModule {} diff --git a/apps/api/src/app/admin/admin.module.ts b/apps/api/src/app/admin/admin.module.ts index ef14722e8..1218d137d 100644 --- a/apps/api/src/app/admin/admin.module.ts +++ b/apps/api/src/app/admin/admin.module.ts @@ -1,4 +1,3 @@ -import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data.service'; import { Module } from '@nestjs/common'; import { AdminController } from './admin.controller'; @@ -7,15 +6,17 @@ import { DataProviderModule } from '@ghostfolio/api/services/data-provider/data- import { PrismaModule } from '@ghostfolio/api/services/prisma.module'; import { DataGatheringModule } from '@ghostfolio/api/services/data-gathering.module'; import { ConfigurationModule } from '@ghostfolio/api/services/configuration.module'; +import { ExchangeRateDataModule } from '@ghostfolio/api/services/exchange-rate-data.module'; @Module({ imports: [ ConfigurationModule, DataProviderModule, DataGatheringModule, + ExchangeRateDataModule, PrismaModule ], controllers: [AdminController], - providers: [AdminService, ExchangeRateDataService] + providers: [AdminService] }) export class AdminModule {} diff --git a/apps/api/src/app/app.module.ts b/apps/api/src/app/app.module.ts index 7e57df9d7..b32783412 100644 --- a/apps/api/src/app/app.module.ts +++ b/apps/api/src/app/app.module.ts @@ -32,6 +32,7 @@ import { DataProviderModule } from '@ghostfolio/api/services/data-provider/data- import { PrismaModule } from '@ghostfolio/api/services/prisma.module'; import { ConfigurationModule } from '@ghostfolio/api/services/configuration.module'; import { DataGatheringModule } from '@ghostfolio/api/services/data-gathering.module'; +import { ExchangeRateDataModule } from '@ghostfolio/api/services/exchange-rate-data.module'; @Module({ imports: [ @@ -70,10 +71,11 @@ import { DataGatheringModule } from '@ghostfolio/api/services/data-gathering.mod UserModule, DataProviderModule, DataGatheringModule, + ExchangeRateDataModule, PrismaModule, ConfigurationModule ], controllers: [AppController], - providers: [CronService, ExchangeRateDataService] + providers: [CronService] }) export class AppModule {} diff --git a/apps/api/src/app/core/core.module.ts b/apps/api/src/app/core/core.module.ts index ea3a5b440..5f07a4b99 100644 --- a/apps/api/src/app/core/core.module.ts +++ b/apps/api/src/app/core/core.module.ts @@ -1,4 +1,3 @@ -import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data.service'; import { Module } from '@nestjs/common'; import { CurrentRateService } from './current-rate.service'; @@ -6,10 +5,16 @@ import { MarketDataService } from './market-data.service'; import { DataProviderModule } from '@ghostfolio/api/services/data-provider/data-provider.module'; import { ConfigurationModule } from '@ghostfolio/api/services/configuration.module'; import { PrismaModule } from '@ghostfolio/api/services/prisma.module'; +import { ExchangeRateDataModule } from '@ghostfolio/api/services/exchange-rate-data.module'; @Module({ - imports: [ConfigurationModule, DataProviderModule, PrismaModule], + imports: [ + ConfigurationModule, + DataProviderModule, + ExchangeRateDataModule, + PrismaModule + ], controllers: [], - providers: [CurrentRateService, ExchangeRateDataService, MarketDataService] + providers: [CurrentRateService, MarketDataService] }) export class CoreModule {} diff --git a/apps/api/src/app/experimental/experimental.module.ts b/apps/api/src/app/experimental/experimental.module.ts index fc9cdac34..a7308a110 100644 --- a/apps/api/src/app/experimental/experimental.module.ts +++ b/apps/api/src/app/experimental/experimental.module.ts @@ -1,6 +1,5 @@ import { AccountService } from '@ghostfolio/api/app/account/account.service'; import { RedisCacheModule } from '@ghostfolio/api/app/redis-cache/redis-cache.module'; -import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data.service'; import { RulesService } from '@ghostfolio/api/services/rules.service'; import { Module } from '@nestjs/common'; @@ -9,20 +8,17 @@ import { ExperimentalService } from './experimental.service'; import { DataProviderModule } from '@ghostfolio/api/services/data-provider/data-provider.module'; import { ConfigurationModule } from '@ghostfolio/api/services/configuration.module'; import { PrismaModule } from '@ghostfolio/api/services/prisma.module'; +import { ExchangeRateDataModule } from '@ghostfolio/api/services/exchange-rate-data.module'; @Module({ imports: [ ConfigurationModule, - RedisCacheModule, DataProviderModule, + ExchangeRateDataModule, + RedisCacheModule, PrismaModule ], controllers: [ExperimentalController], - providers: [ - AccountService, - ExchangeRateDataService, - ExperimentalService, - RulesService - ] + providers: [AccountService, ExperimentalService, RulesService] }) export class ExperimentalModule {} diff --git a/apps/api/src/app/portfolio/portfolio.module.ts b/apps/api/src/app/portfolio/portfolio.module.ts index 2aeae3777..14f35e4e2 100644 --- a/apps/api/src/app/portfolio/portfolio.module.ts +++ b/apps/api/src/app/portfolio/portfolio.module.ts @@ -5,7 +5,6 @@ import { MarketDataService } from '@ghostfolio/api/app/core/market-data.service' import { OrderService } from '@ghostfolio/api/app/order/order.service'; import { RedisCacheModule } from '@ghostfolio/api/app/redis-cache/redis-cache.module'; import { UserService } from '@ghostfolio/api/app/user/user.service'; -import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data.service'; import { ImpersonationService } from '@ghostfolio/api/services/impersonation.service'; import { RulesService } from '@ghostfolio/api/services/rules.service'; import { SymbolProfileService } from '@ghostfolio/api/services/symbol-profile.service'; @@ -17,6 +16,7 @@ import { DataProviderModule } from '@ghostfolio/api/services/data-provider/data- import { ConfigurationModule } from '@ghostfolio/api/services/configuration.module'; import { PrismaModule } from '@ghostfolio/api/services/prisma.module'; import { DataGatheringModule } from '@ghostfolio/api/services/data-gathering.module'; +import { ExchangeRateDataModule } from '@ghostfolio/api/services/exchange-rate-data.module'; @Module({ imports: [ @@ -24,6 +24,7 @@ import { DataGatheringModule } from '@ghostfolio/api/services/data-gathering.mod RedisCacheModule, DataProviderModule, DataGatheringModule, + ExchangeRateDataModule, PrismaModule ], controllers: [PortfolioController], @@ -31,7 +32,6 @@ import { DataGatheringModule } from '@ghostfolio/api/services/data-gathering.mod AccountService, CacheService, CurrentRateService, - ExchangeRateDataService, ImpersonationService, MarketDataService, OrderService, diff --git a/apps/api/src/services/exchange-rate-data.module.ts b/apps/api/src/services/exchange-rate-data.module.ts new file mode 100644 index 000000000..cd5065e6e --- /dev/null +++ b/apps/api/src/services/exchange-rate-data.module.ts @@ -0,0 +1,10 @@ +import { Module } from '@nestjs/common'; +import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data.service'; +import { DataProviderModule } from '@ghostfolio/api/services/data-provider/data-provider.module'; + +@Module({ + imports: [DataProviderModule], + providers: [ExchangeRateDataService], + exports: [ExchangeRateDataService] +}) +export class ExchangeRateDataModule {}