diff --git a/apps/api/src/app/activities/activities.controller.ts b/apps/api/src/app/activities/activities.controller.ts index 84f62395a7..d07651e6fb 100644 --- a/apps/api/src/app/activities/activities.controller.ts +++ b/apps/api/src/app/activities/activities.controller.ts @@ -6,6 +6,7 @@ import { isDataGatheringSupported } from '@ghostfolio/api/helper/data-source.hel import { RedactValuesInResponseInterceptor } from '@ghostfolio/api/interceptors/redact-values-in-response/redact-values-in-response.interceptor'; import { TransformDataSourceInRequestInterceptor } from '@ghostfolio/api/interceptors/transform-data-source-in-request/transform-data-source-in-request.interceptor'; import { TransformDataSourceInResponseInterceptor } from '@ghostfolio/api/interceptors/transform-data-source-in-response/transform-data-source-in-response.interceptor'; +import { ActivitiesService } from '@ghostfolio/api/services/activities/activities.service'; import { ApiService } from '@ghostfolio/api/services/api/api.service'; import { DataProviderService } from '@ghostfolio/api/services/data-provider/data-provider.service'; import { DataGatheringService } from '@ghostfolio/api/services/queues/data-gathering/data-gathering.service'; @@ -41,7 +42,6 @@ import { StatusCodes, getReasonPhrase } from 'http-status-codes'; import { omit } from 'lodash-es'; import { ActivitiesFilterDto } from './activities-filter.dto'; -import { ActivitiesService } from './activities.service'; import { GetActivitiesDto } from './get-activities.dto'; @Controller('activities') diff --git a/apps/api/src/app/activities/activities.module.ts b/apps/api/src/app/activities/activities.module.ts index 9890de08f0..da46e3517f 100644 --- a/apps/api/src/app/activities/activities.module.ts +++ b/apps/api/src/app/activities/activities.module.ts @@ -1,48 +1,29 @@ import { RedactValuesInResponseModule } from '@ghostfolio/api/interceptors/redact-values-in-response/redact-values-in-response.module'; import { TransformDataSourceInRequestModule } from '@ghostfolio/api/interceptors/transform-data-source-in-request/transform-data-source-in-request.module'; import { TransformDataSourceInResponseModule } from '@ghostfolio/api/interceptors/transform-data-source-in-response/transform-data-source-in-response.module'; -import { AccountBalanceModule } from '@ghostfolio/api/services/account-balance/account-balance.module'; -import { AccountModule } from '@ghostfolio/api/services/account/account.module'; +import { ActivitiesModule as ActivitiesServiceModule } from '@ghostfolio/api/services/activities/activities.module'; import { ApiModule } from '@ghostfolio/api/services/api/api.module'; -import { AssetProfileSplitModule } from '@ghostfolio/api/services/asset-profile-split/asset-profile-split.module'; -import { BenchmarkModule } from '@ghostfolio/api/services/benchmark/benchmark.module'; import { DataProviderModule } from '@ghostfolio/api/services/data-provider/data-provider.module'; -import { ExchangeRateDataModule } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.module'; import { ImpersonationModule } from '@ghostfolio/api/services/impersonation/impersonation.module'; -import { MarketDataModule } from '@ghostfolio/api/services/market-data/market-data.module'; -import { PrismaModule } from '@ghostfolio/api/services/prisma/prisma.module'; import { DataGatheringQueueModule } from '@ghostfolio/api/services/queues/data-gathering/data-gathering.module'; -import { RedisCacheModule } from '@ghostfolio/api/services/redis-cache/redis-cache.module'; import { SymbolProfileModule } from '@ghostfolio/api/services/symbol-profile/symbol-profile.module'; -import { TagModule } from '@ghostfolio/api/services/tag/tag.module'; import { Module } from '@nestjs/common'; import { ActivitiesController } from './activities.controller'; -import { ActivitiesService } from './activities.service'; @Module({ controllers: [ActivitiesController], - exports: [ActivitiesService], imports: [ - AccountBalanceModule, - AccountModule, + ActivitiesServiceModule, ApiModule, - AssetProfileSplitModule, - BenchmarkModule, DataGatheringQueueModule, DataProviderModule, - ExchangeRateDataModule, ImpersonationModule, - MarketDataModule, - PrismaModule, RedactValuesInResponseModule, - RedisCacheModule, SymbolProfileModule, - TagModule, TransformDataSourceInRequestModule, TransformDataSourceInResponseModule - ], - providers: [ActivitiesService] + ] }) export class ActivitiesModule {} diff --git a/apps/api/src/app/endpoints/asset-profiles/asset-profiles.module.ts b/apps/api/src/app/endpoints/asset-profiles/asset-profiles.module.ts index d065b9ab4b..6b7e694b60 100644 --- a/apps/api/src/app/endpoints/asset-profiles/asset-profiles.module.ts +++ b/apps/api/src/app/endpoints/asset-profiles/asset-profiles.module.ts @@ -1,6 +1,6 @@ -import { ActivitiesModule } from '@ghostfolio/api/app/activities/activities.module'; import { TransformDataSourceInRequestModule } from '@ghostfolio/api/interceptors/transform-data-source-in-request/transform-data-source-in-request.module'; import { TransformDataSourceInResponseModule } from '@ghostfolio/api/interceptors/transform-data-source-in-response/transform-data-source-in-response.module'; +import { ActivitiesModule } from '@ghostfolio/api/services/activities/activities.module'; import { ApiModule } from '@ghostfolio/api/services/api/api.module'; import { AssetProfileSplitModule } from '@ghostfolio/api/services/asset-profile-split/asset-profile-split.module'; import { BenchmarkModule } from '@ghostfolio/api/services/benchmark/benchmark.module'; diff --git a/apps/api/src/app/endpoints/asset-profiles/asset-profiles.service.spec.ts b/apps/api/src/app/endpoints/asset-profiles/asset-profiles.service.spec.ts index b76cca57cc..b191f940ac 100644 --- a/apps/api/src/app/endpoints/asset-profiles/asset-profiles.service.spec.ts +++ b/apps/api/src/app/endpoints/asset-profiles/asset-profiles.service.spec.ts @@ -1,5 +1,5 @@ -import { ActivitiesService } from '@ghostfolio/api/app/activities/activities.service'; import { PortfolioChangedEvent } from '@ghostfolio/api/events/portfolio-changed.event'; +import { ActivitiesService } from '@ghostfolio/api/services/activities/activities.service'; import { AssetProfileSplitService } from '@ghostfolio/api/services/asset-profile-split/asset-profile-split.service'; import { DataProviderService } from '@ghostfolio/api/services/data-provider/data-provider.service'; import { MarketDataService } from '@ghostfolio/api/services/market-data/market-data.service'; diff --git a/apps/api/src/app/endpoints/asset-profiles/asset-profiles.service.ts b/apps/api/src/app/endpoints/asset-profiles/asset-profiles.service.ts index b0174e9258..130be8cb5d 100644 --- a/apps/api/src/app/endpoints/asset-profiles/asset-profiles.service.ts +++ b/apps/api/src/app/endpoints/asset-profiles/asset-profiles.service.ts @@ -1,5 +1,5 @@ -import { ActivitiesService } from '@ghostfolio/api/app/activities/activities.service'; import { PortfolioChangedEvent } from '@ghostfolio/api/events/portfolio-changed.event'; +import { ActivitiesService } from '@ghostfolio/api/services/activities/activities.service'; import { AssetProfileSplitService } from '@ghostfolio/api/services/asset-profile-split/asset-profile-split.service'; import { BenchmarkService } from '@ghostfolio/api/services/benchmark/benchmark.service'; import { DataProviderService } from '@ghostfolio/api/services/data-provider/data-provider.service'; diff --git a/apps/api/src/app/endpoints/export/export.module.ts b/apps/api/src/app/endpoints/export/export.module.ts index b95476e77d..38e874f55e 100644 --- a/apps/api/src/app/endpoints/export/export.module.ts +++ b/apps/api/src/app/endpoints/export/export.module.ts @@ -1,6 +1,6 @@ -import { ActivitiesModule } from '@ghostfolio/api/app/activities/activities.module'; import { TransformDataSourceInRequestModule } from '@ghostfolio/api/interceptors/transform-data-source-in-request/transform-data-source-in-request.module'; import { AccountModule } from '@ghostfolio/api/services/account/account.module'; +import { ActivitiesModule } from '@ghostfolio/api/services/activities/activities.module'; import { ApiModule } from '@ghostfolio/api/services/api/api.module'; import { MarketDataModule } from '@ghostfolio/api/services/market-data/market-data.module'; import { TagModule } from '@ghostfolio/api/services/tag/tag.module'; diff --git a/apps/api/src/app/endpoints/export/export.service.ts b/apps/api/src/app/endpoints/export/export.service.ts index 415d7be589..d1a9029c44 100644 --- a/apps/api/src/app/endpoints/export/export.service.ts +++ b/apps/api/src/app/endpoints/export/export.service.ts @@ -1,6 +1,6 @@ -import { ActivitiesService } from '@ghostfolio/api/app/activities/activities.service'; import { environment } from '@ghostfolio/api/environments/environment'; import { AccountService } from '@ghostfolio/api/services/account/account.service'; +import { ActivitiesService } from '@ghostfolio/api/services/activities/activities.service'; import { MarketDataService } from '@ghostfolio/api/services/market-data/market-data.service'; import { TagService } from '@ghostfolio/api/services/tag/tag.service'; import { diff --git a/apps/api/src/app/endpoints/public/public.module.ts b/apps/api/src/app/endpoints/public/public.module.ts index 732e03bf46..d015192b0e 100644 --- a/apps/api/src/app/endpoints/public/public.module.ts +++ b/apps/api/src/app/endpoints/public/public.module.ts @@ -1,8 +1,8 @@ -import { ActivitiesModule } from '@ghostfolio/api/app/activities/activities.module'; import { PortfolioModule } from '@ghostfolio/api/app/portfolio/portfolio.module'; import { UserModule } from '@ghostfolio/api/app/user/user.module'; import { TransformDataSourceInRequestModule } from '@ghostfolio/api/interceptors/transform-data-source-in-request/transform-data-source-in-request.module'; import { AccessModule } from '@ghostfolio/api/services/access/access.module'; +import { ActivitiesModule } from '@ghostfolio/api/services/activities/activities.module'; import { ExchangeRateDataModule } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.module'; import { Module } from '@nestjs/common'; diff --git a/apps/api/src/app/endpoints/public/public.service.ts b/apps/api/src/app/endpoints/public/public.service.ts index 051d380b26..6dfb0a75f9 100644 --- a/apps/api/src/app/endpoints/public/public.service.ts +++ b/apps/api/src/app/endpoints/public/public.service.ts @@ -1,7 +1,7 @@ -import { ActivitiesService } from '@ghostfolio/api/app/activities/activities.service'; import { PortfolioService } from '@ghostfolio/api/app/portfolio/portfolio.service'; import { UserService } from '@ghostfolio/api/app/user/user.service'; import { AccessService } from '@ghostfolio/api/services/access/access.service'; +import { ActivitiesService } from '@ghostfolio/api/services/activities/activities.service'; import { ConfigurationService } from '@ghostfolio/api/services/configuration/configuration.service'; import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.service'; import { DEFAULT_CURRENCY } from '@ghostfolio/common/config'; diff --git a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-cash.spec.ts b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-cash.spec.ts index 720c1c196c..8f1be9abdf 100644 --- a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-cash.spec.ts +++ b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-cash.spec.ts @@ -1,4 +1,3 @@ -import { ActivitiesService } from '@ghostfolio/api/app/activities/activities.service'; import { activityDummyData, assetProfileDummyData, @@ -9,6 +8,7 @@ import { CurrentRateService } from '@ghostfolio/api/app/portfolio/current-rate.s import { CurrentRateServiceMock } from '@ghostfolio/api/app/portfolio/current-rate.service.mock'; import { AccountBalanceService } from '@ghostfolio/api/services/account-balance/account-balance.service'; import { AccountService } from '@ghostfolio/api/services/account/account.service'; +import { ActivitiesService } from '@ghostfolio/api/services/activities/activities.service'; import { AssetProfileSplitService } from '@ghostfolio/api/services/asset-profile-split/asset-profile-split.service'; import { ConfigurationService } from '@ghostfolio/api/services/configuration/configuration.service'; import { DataProviderService } from '@ghostfolio/api/services/data-provider/data-provider.service'; diff --git a/apps/api/src/app/portfolio/calculator/roi/portfolio-calculator-cash.spec.ts b/apps/api/src/app/portfolio/calculator/roi/portfolio-calculator-cash.spec.ts index b02f87751c..96626390a9 100644 --- a/apps/api/src/app/portfolio/calculator/roi/portfolio-calculator-cash.spec.ts +++ b/apps/api/src/app/portfolio/calculator/roi/portfolio-calculator-cash.spec.ts @@ -1,4 +1,3 @@ -import { ActivitiesService } from '@ghostfolio/api/app/activities/activities.service'; import { activityDummyData, assetProfileDummyData, @@ -10,6 +9,7 @@ import { CurrentRateService } from '@ghostfolio/api/app/portfolio/current-rate.s import { CurrentRateServiceMock } from '@ghostfolio/api/app/portfolio/current-rate.service.mock'; import { AccountBalanceService } from '@ghostfolio/api/services/account-balance/account-balance.service'; import { AccountService } from '@ghostfolio/api/services/account/account.service'; +import { ActivitiesService } from '@ghostfolio/api/services/activities/activities.service'; import { AssetProfileSplitService } from '@ghostfolio/api/services/asset-profile-split/asset-profile-split.service'; import { ConfigurationService } from '@ghostfolio/api/services/configuration/configuration.service'; import { DataProviderService } from '@ghostfolio/api/services/data-provider/data-provider.service'; diff --git a/apps/api/src/app/portfolio/current-rate.service.spec.ts b/apps/api/src/app/portfolio/current-rate.service.spec.ts index 4a7c1f10cb..c743fe4d42 100644 --- a/apps/api/src/app/portfolio/current-rate.service.spec.ts +++ b/apps/api/src/app/portfolio/current-rate.service.spec.ts @@ -1,4 +1,4 @@ -import { ActivitiesService } from '@ghostfolio/api/app/activities/activities.service'; +import { ActivitiesService } from '@ghostfolio/api/services/activities/activities.service'; import { DataProviderService } from '@ghostfolio/api/services/data-provider/data-provider.service'; import { MarketDataService } from '@ghostfolio/api/services/market-data/market-data.service'; import { PropertyService } from '@ghostfolio/api/services/property/property.service'; diff --git a/apps/api/src/app/portfolio/current-rate.service.ts b/apps/api/src/app/portfolio/current-rate.service.ts index df1ca987d0..d770bfd7b7 100644 --- a/apps/api/src/app/portfolio/current-rate.service.ts +++ b/apps/api/src/app/portfolio/current-rate.service.ts @@ -1,5 +1,5 @@ -import { ActivitiesService } from '@ghostfolio/api/app/activities/activities.service'; import { LogPerformance } from '@ghostfolio/api/interceptors/performance-logging/performance-logging.interceptor'; +import { ActivitiesService } from '@ghostfolio/api/services/activities/activities.service'; import { DataProviderService } from '@ghostfolio/api/services/data-provider/data-provider.service'; import { MarketDataService } from '@ghostfolio/api/services/market-data/market-data.service'; import { diff --git a/apps/api/src/app/portfolio/portfolio.controller.ts b/apps/api/src/app/portfolio/portfolio.controller.ts index 72468f1d6e..a04ca55fff 100644 --- a/apps/api/src/app/portfolio/portfolio.controller.ts +++ b/apps/api/src/app/portfolio/portfolio.controller.ts @@ -1,4 +1,3 @@ -import { ActivitiesService } from '@ghostfolio/api/app/activities/activities.service'; import { HasPermission } from '@ghostfolio/api/decorators/has-permission.decorator'; import { Impersonation } from '@ghostfolio/api/decorators/impersonation.decorator'; import { RequiresScope } from '@ghostfolio/api/decorators/requires-scope.decorator'; @@ -12,6 +11,7 @@ import { PerformanceLoggingInterceptor } from '@ghostfolio/api/interceptors/perf import { RedactValuesInResponseInterceptor } from '@ghostfolio/api/interceptors/redact-values-in-response/redact-values-in-response.interceptor'; import { TransformDataSourceInRequestInterceptor } from '@ghostfolio/api/interceptors/transform-data-source-in-request/transform-data-source-in-request.interceptor'; import { TransformDataSourceInResponseInterceptor } from '@ghostfolio/api/interceptors/transform-data-source-in-response/transform-data-source-in-response.interceptor'; +import { ActivitiesService } from '@ghostfolio/api/services/activities/activities.service'; import { ApiService } from '@ghostfolio/api/services/api/api.service'; import { ConfigurationService } from '@ghostfolio/api/services/configuration/configuration.service'; import { getIntervalFromDateRange } from '@ghostfolio/common/calculation-helper'; diff --git a/apps/api/src/app/portfolio/portfolio.module.ts b/apps/api/src/app/portfolio/portfolio.module.ts index c8b3236709..a1307ac8fd 100644 --- a/apps/api/src/app/portfolio/portfolio.module.ts +++ b/apps/api/src/app/portfolio/portfolio.module.ts @@ -1,4 +1,3 @@ -import { ActivitiesModule } from '@ghostfolio/api/app/activities/activities.module'; import { UserModule } from '@ghostfolio/api/app/user/user.module'; import { PerformanceLoggingModule } from '@ghostfolio/api/interceptors/performance-logging/performance-logging.module'; import { RedactValuesInResponseModule } from '@ghostfolio/api/interceptors/redact-values-in-response/redact-values-in-response.module'; @@ -7,6 +6,7 @@ import { TransformDataSourceInResponseModule } from '@ghostfolio/api/interceptor import { AccessModule } from '@ghostfolio/api/services/access/access.module'; import { AccountBalanceModule } from '@ghostfolio/api/services/account-balance/account-balance.module'; import { AccountModule } from '@ghostfolio/api/services/account/account.module'; +import { ActivitiesModule } from '@ghostfolio/api/services/activities/activities.module'; import { ApiModule } from '@ghostfolio/api/services/api/api.module'; import { BenchmarkModule } from '@ghostfolio/api/services/benchmark/benchmark.module'; import { ConfigurationModule } from '@ghostfolio/api/services/configuration/configuration.module'; diff --git a/apps/api/src/app/portfolio/portfolio.service.spec.ts b/apps/api/src/app/portfolio/portfolio.service.spec.ts index 7e74e5a287..0a255cffe8 100644 --- a/apps/api/src/app/portfolio/portfolio.service.spec.ts +++ b/apps/api/src/app/portfolio/portfolio.service.spec.ts @@ -1,4 +1,3 @@ -import { ActivitiesService } from '@ghostfolio/api/app/activities/activities.service'; import { PortfolioCalculator } from '@ghostfolio/api/app/portfolio/calculator/portfolio-calculator'; import { userDummyData } from '@ghostfolio/api/app/portfolio/calculator/portfolio-calculator-test-utils'; import { PortfolioCalculatorFactory } from '@ghostfolio/api/app/portfolio/calculator/portfolio-calculator.factory'; @@ -7,6 +6,7 @@ import { UserService } from '@ghostfolio/api/app/user/user.service'; import { AccountBalanceService } from '@ghostfolio/api/services/account-balance/account-balance.service'; import { AccountService } from '@ghostfolio/api/services/account/account.service'; import { CashDetails } from '@ghostfolio/api/services/account/interfaces/cash-details.interface'; +import { ActivitiesService } from '@ghostfolio/api/services/activities/activities.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'; diff --git a/apps/api/src/app/portfolio/portfolio.service.ts b/apps/api/src/app/portfolio/portfolio.service.ts index cba3e644ed..c95635c93d 100644 --- a/apps/api/src/app/portfolio/portfolio.service.ts +++ b/apps/api/src/app/portfolio/portfolio.service.ts @@ -1,4 +1,3 @@ -import { ActivitiesService } from '@ghostfolio/api/app/activities/activities.service'; import { UserService } from '@ghostfolio/api/app/user/user.service'; import { getFactor } from '@ghostfolio/api/helper/portfolio.helper'; import { AccountClusterRiskCurrentInvestment } from '@ghostfolio/api/models/rules/account-cluster-risk/current-investment'; @@ -21,6 +20,7 @@ import { RegionalMarketClusterRiskNorthAmerica } from '@ghostfolio/api/models/ru import { AccountBalanceService } from '@ghostfolio/api/services/account-balance/account-balance.service'; import { AccountService } from '@ghostfolio/api/services/account/account.service'; import { CashDetails } from '@ghostfolio/api/services/account/interfaces/cash-details.interface'; +import { ActivitiesService } from '@ghostfolio/api/services/activities/activities.service'; import { BenchmarkService } from '@ghostfolio/api/services/benchmark/benchmark.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'; diff --git a/apps/api/src/app/user/user.module.ts b/apps/api/src/app/user/user.module.ts index cb105a9a3c..32c9ff86e2 100644 --- a/apps/api/src/app/user/user.module.ts +++ b/apps/api/src/app/user/user.module.ts @@ -1,6 +1,6 @@ -import { ActivitiesModule } from '@ghostfolio/api/app/activities/activities.module'; import { RedactValuesInResponseModule } from '@ghostfolio/api/interceptors/redact-values-in-response/redact-values-in-response.module'; import { TransformDataSourceInResponseModule } from '@ghostfolio/api/interceptors/transform-data-source-in-response/transform-data-source-in-response.module'; +import { ActivitiesModule } from '@ghostfolio/api/services/activities/activities.module'; import { ConfigurationModule } from '@ghostfolio/api/services/configuration/configuration.module'; import { I18nModule } from '@ghostfolio/api/services/i18n/i18n.module'; import { ImpersonationModule } from '@ghostfolio/api/services/impersonation/impersonation.module'; diff --git a/apps/api/src/app/user/user.service.ts b/apps/api/src/app/user/user.service.ts index 92a1a77f6e..9aeff9ceb9 100644 --- a/apps/api/src/app/user/user.service.ts +++ b/apps/api/src/app/user/user.service.ts @@ -1,9 +1,9 @@ -import { ActivitiesService } from '@ghostfolio/api/app/activities/activities.service'; import { environment } from '@ghostfolio/api/environments/environment'; import { PortfolioChangedEvent } from '@ghostfolio/api/events/portfolio-changed.event'; import { getSupportedLanguageCode } from '@ghostfolio/api/helper/language.helper'; import { getRandomString } from '@ghostfolio/api/helper/string.helper'; import { getXRayRulesSettings } from '@ghostfolio/api/models/rules/rule-settings'; +import { ActivitiesService } from '@ghostfolio/api/services/activities/activities.service'; import { ConfigurationService } from '@ghostfolio/api/services/configuration/configuration.service'; import { I18nService } from '@ghostfolio/api/services/i18n/i18n.service'; import { PrismaService } from '@ghostfolio/api/services/prisma/prisma.service'; diff --git a/apps/api/src/events/asset-profile-changed.listener.spec.ts b/apps/api/src/events/asset-profile-changed.listener.spec.ts index e1e24c6f79..64f613cc02 100644 --- a/apps/api/src/events/asset-profile-changed.listener.spec.ts +++ b/apps/api/src/events/asset-profile-changed.listener.spec.ts @@ -1,4 +1,4 @@ -import { ActivitiesService } from '@ghostfolio/api/app/activities/activities.service'; +import { ActivitiesService } from '@ghostfolio/api/services/activities/activities.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'; diff --git a/apps/api/src/events/asset-profile-changed.listener.ts b/apps/api/src/events/asset-profile-changed.listener.ts index ffc4014c68..df68914c10 100644 --- a/apps/api/src/events/asset-profile-changed.listener.ts +++ b/apps/api/src/events/asset-profile-changed.listener.ts @@ -1,4 +1,4 @@ -import { ActivitiesService } from '@ghostfolio/api/app/activities/activities.service'; +import { ActivitiesService } from '@ghostfolio/api/services/activities/activities.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'; diff --git a/apps/api/src/events/events.module.ts b/apps/api/src/events/events.module.ts index b04a59a00e..b5a1c38444 100644 --- a/apps/api/src/events/events.module.ts +++ b/apps/api/src/events/events.module.ts @@ -1,5 +1,5 @@ -import { ActivitiesModule } from '@ghostfolio/api/app/activities/activities.module'; import { UserModule } from '@ghostfolio/api/app/user/user.module'; +import { ActivitiesModule } from '@ghostfolio/api/services/activities/activities.module'; import { ApiModule } from '@ghostfolio/api/services/api/api.module'; import { ConfigurationModule } from '@ghostfolio/api/services/configuration/configuration.module'; import { DataProviderModule } from '@ghostfolio/api/services/data-provider/data-provider.module'; diff --git a/apps/api/src/services/activities/activities.module.ts b/apps/api/src/services/activities/activities.module.ts new file mode 100644 index 0000000000..bd6f6ce0bc --- /dev/null +++ b/apps/api/src/services/activities/activities.module.ts @@ -0,0 +1,34 @@ +import { AccountBalanceModule } from '@ghostfolio/api/services/account-balance/account-balance.module'; +import { AccountModule } from '@ghostfolio/api/services/account/account.module'; +import { AssetProfileSplitModule } from '@ghostfolio/api/services/asset-profile-split/asset-profile-split.module'; +import { BenchmarkModule } from '@ghostfolio/api/services/benchmark/benchmark.module'; +import { DataProviderModule } from '@ghostfolio/api/services/data-provider/data-provider.module'; +import { ExchangeRateDataModule } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.module'; +import { MarketDataModule } from '@ghostfolio/api/services/market-data/market-data.module'; +import { PrismaModule } from '@ghostfolio/api/services/prisma/prisma.module'; +import { DataGatheringQueueModule } from '@ghostfolio/api/services/queues/data-gathering/data-gathering.module'; +import { SymbolProfileModule } from '@ghostfolio/api/services/symbol-profile/symbol-profile.module'; +import { TagModule } from '@ghostfolio/api/services/tag/tag.module'; + +import { Module } from '@nestjs/common'; + +import { ActivitiesService } from './activities.service'; + +@Module({ + exports: [ActivitiesService], + imports: [ + AccountBalanceModule, + AccountModule, + AssetProfileSplitModule, + BenchmarkModule, + DataGatheringQueueModule, + DataProviderModule, + ExchangeRateDataModule, + MarketDataModule, + PrismaModule, + SymbolProfileModule, + TagModule + ], + providers: [ActivitiesService] +}) +export class ActivitiesModule {} diff --git a/apps/api/src/app/activities/activities.service.spec.ts b/apps/api/src/services/activities/activities.service.spec.ts similarity index 100% rename from apps/api/src/app/activities/activities.service.spec.ts rename to apps/api/src/services/activities/activities.service.spec.ts diff --git a/apps/api/src/app/activities/activities.service.ts b/apps/api/src/services/activities/activities.service.ts similarity index 100% rename from apps/api/src/app/activities/activities.service.ts rename to apps/api/src/services/activities/activities.service.ts diff --git a/apps/api/src/services/import/import.module.ts b/apps/api/src/services/import/import.module.ts index 1faca48b3d..8ccf27dfd9 100644 --- a/apps/api/src/services/import/import.module.ts +++ b/apps/api/src/services/import/import.module.ts @@ -1,6 +1,6 @@ -import { ActivitiesModule } from '@ghostfolio/api/app/activities/activities.module'; import { PortfolioModule } from '@ghostfolio/api/app/portfolio/portfolio.module'; import { AccountModule } from '@ghostfolio/api/services/account/account.module'; +import { ActivitiesModule } from '@ghostfolio/api/services/activities/activities.module'; import { ApiModule } from '@ghostfolio/api/services/api/api.module'; import { ConfigurationModule } from '@ghostfolio/api/services/configuration/configuration.module'; import { DataProviderModule } from '@ghostfolio/api/services/data-provider/data-provider.module'; diff --git a/apps/api/src/services/import/import.service.spec.ts b/apps/api/src/services/import/import.service.spec.ts index 4e0bea8629..146e25dbab 100644 --- a/apps/api/src/services/import/import.service.spec.ts +++ b/apps/api/src/services/import/import.service.spec.ts @@ -1,6 +1,6 @@ -import { ActivitiesService } from '@ghostfolio/api/app/activities/activities.service'; import { PortfolioService } from '@ghostfolio/api/app/portfolio/portfolio.service'; import { AccountService } from '@ghostfolio/api/services/account/account.service'; +import { ActivitiesService } from '@ghostfolio/api/services/activities/activities.service'; import { ApiService } from '@ghostfolio/api/services/api/api.service'; import { ConfigurationService } from '@ghostfolio/api/services/configuration/configuration.service'; import { DataProviderService } from '@ghostfolio/api/services/data-provider/data-provider.service'; diff --git a/apps/api/src/services/import/import.service.ts b/apps/api/src/services/import/import.service.ts index 720c4b74ef..c0366b3485 100644 --- a/apps/api/src/services/import/import.service.ts +++ b/apps/api/src/services/import/import.service.ts @@ -1,8 +1,8 @@ -import { ActivitiesService } from '@ghostfolio/api/app/activities/activities.service'; import { PortfolioService } from '@ghostfolio/api/app/portfolio/portfolio.service'; import { getTagsWithDraftTag } from '@ghostfolio/api/helper/activity.helper'; import { getMaskedGhostfolioDataSource } from '@ghostfolio/api/helper/data-source.helper'; import { AccountService } from '@ghostfolio/api/services/account/account.service'; +import { ActivitiesService } from '@ghostfolio/api/services/activities/activities.service'; import { ApiService } from '@ghostfolio/api/services/api/api.service'; import { ConfigurationService } from '@ghostfolio/api/services/configuration/configuration.service'; import { DataProviderService } from '@ghostfolio/api/services/data-provider/data-provider.service'; diff --git a/apps/api/src/services/portfolio-table/portfolio-table.module.ts b/apps/api/src/services/portfolio-table/portfolio-table.module.ts index 01d0ebc64d..b2131acd5b 100644 --- a/apps/api/src/services/portfolio-table/portfolio-table.module.ts +++ b/apps/api/src/services/portfolio-table/portfolio-table.module.ts @@ -1,6 +1,6 @@ -import { ActivitiesModule } from '@ghostfolio/api/app/activities/activities.module'; import { WatchlistModule } from '@ghostfolio/api/app/endpoints/watchlist/watchlist.module'; import { PortfolioModule } from '@ghostfolio/api/app/portfolio/portfolio.module'; +import { ActivitiesModule } from '@ghostfolio/api/services/activities/activities.module'; import { ConfigurationModule } from '@ghostfolio/api/services/configuration/configuration.module'; import { I18nModule } from '@ghostfolio/api/services/i18n/i18n.module'; diff --git a/apps/api/src/services/portfolio-table/portfolio-table.service.spec.ts b/apps/api/src/services/portfolio-table/portfolio-table.service.spec.ts index 1f76479584..4a213684b8 100644 --- a/apps/api/src/services/portfolio-table/portfolio-table.service.spec.ts +++ b/apps/api/src/services/portfolio-table/portfolio-table.service.spec.ts @@ -1,8 +1,8 @@ -import type { ActivitiesService } from '@ghostfolio/api/app/activities/activities.service'; import type { WatchlistService } from '@ghostfolio/api/app/endpoints/watchlist/watchlist.service'; import type { PortfolioService } from '@ghostfolio/api/app/portfolio/portfolio.service'; import { encodeDataSource } from '@ghostfolio/api/helper/data-source.helper'; import type { TableParameters } from '@ghostfolio/api/helper/interfaces/table-parameters.interface'; +import type { ActivitiesService } from '@ghostfolio/api/services/activities/activities.service'; import type { ConfigurationService } from '@ghostfolio/api/services/configuration/configuration.service'; import type { I18nService } from '@ghostfolio/api/services/i18n/i18n.service'; import { diff --git a/apps/api/src/services/portfolio-table/portfolio-table.service.ts b/apps/api/src/services/portfolio-table/portfolio-table.service.ts index d2c0b925e9..bcf2839fba 100644 --- a/apps/api/src/services/portfolio-table/portfolio-table.service.ts +++ b/apps/api/src/services/portfolio-table/portfolio-table.service.ts @@ -1,9 +1,9 @@ -import { ActivitiesService } from '@ghostfolio/api/app/activities/activities.service'; import { WatchlistService } from '@ghostfolio/api/app/endpoints/watchlist/watchlist.service'; import { PortfolioService } from '@ghostfolio/api/app/portfolio/portfolio.service'; import { transformDataSourceInResponse } from '@ghostfolio/api/helper/data-source.helper'; import { TableColumnDefinition } from '@ghostfolio/api/helper/interfaces/table-column-definition.interface'; import { getMarkdownTable } from '@ghostfolio/api/helper/markdown-table.helper'; +import { ActivitiesService } from '@ghostfolio/api/services/activities/activities.service'; import { ConfigurationService } from '@ghostfolio/api/services/configuration/configuration.service'; import { I18nService } from '@ghostfolio/api/services/i18n/i18n.service'; import { diff --git a/apps/api/src/services/queues/portfolio-snapshot/portfolio-snapshot.module.ts b/apps/api/src/services/queues/portfolio-snapshot/portfolio-snapshot.module.ts index b4c2ab40bf..566f916538 100644 --- a/apps/api/src/services/queues/portfolio-snapshot/portfolio-snapshot.module.ts +++ b/apps/api/src/services/queues/portfolio-snapshot/portfolio-snapshot.module.ts @@ -1,7 +1,7 @@ -import { ActivitiesModule } from '@ghostfolio/api/app/activities/activities.module'; import { PortfolioCalculatorFactory } from '@ghostfolio/api/app/portfolio/calculator/portfolio-calculator.factory'; import { CurrentRateService } from '@ghostfolio/api/app/portfolio/current-rate.service'; import { AccountBalanceModule } from '@ghostfolio/api/services/account-balance/account-balance.module'; +import { ActivitiesModule } from '@ghostfolio/api/services/activities/activities.module'; import { ConfigurationModule } from '@ghostfolio/api/services/configuration/configuration.module'; import { DataProviderModule } from '@ghostfolio/api/services/data-provider/data-provider.module'; import { ExchangeRateDataModule } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.module'; diff --git a/apps/api/src/services/queues/portfolio-snapshot/portfolio-snapshot.processor.ts b/apps/api/src/services/queues/portfolio-snapshot/portfolio-snapshot.processor.ts index c82fc6ac9d..ae07fc2d31 100644 --- a/apps/api/src/services/queues/portfolio-snapshot/portfolio-snapshot.processor.ts +++ b/apps/api/src/services/queues/portfolio-snapshot/portfolio-snapshot.processor.ts @@ -1,7 +1,7 @@ -import { ActivitiesService } from '@ghostfolio/api/app/activities/activities.service'; import { PortfolioCalculatorFactory } from '@ghostfolio/api/app/portfolio/calculator/portfolio-calculator.factory'; import { PortfolioSnapshotValue } from '@ghostfolio/api/app/portfolio/interfaces/snapshot-value.interface'; import { AccountBalanceService } from '@ghostfolio/api/services/account-balance/account-balance.service'; +import { ActivitiesService } from '@ghostfolio/api/services/activities/activities.service'; import { ConfigurationService } from '@ghostfolio/api/services/configuration/configuration.service'; import { RedisCacheService } from '@ghostfolio/api/services/redis-cache/redis-cache.service'; import {