Open Source Wealth Management Software. Angular + NestJS + Prisma + Nx + TypeScript 🤍
TypeScript angularetffinancefintechghostfoliohacktoberfestinvestingnestjsosspersonal-financeportfolioprismasoftwarestocktrackertradingtypescriptwealth-managementweb
Restructure services (#1891)
Thomas Kaul513a564e2c27
diff --git a/apps/api/src/app/access/access.module.ts b/apps/api/src/app/access/access.module.tsindex d703880383..b9813d173f 100644--- a/apps/api/src/app/access/access.module.ts+++ b/apps/api/src/app/access/access.module.ts@@ -1,4 +1,4 @@-import { PrismaModule } from '@ghostfolio/api/services/prisma.module';+import { PrismaModule } from '@ghostfolio/api/services/prisma/prisma.module';import { Module } from '@nestjs/common';import { AccessController } from './access.controller';diff --git a/apps/api/src/app/access/access.service.ts b/apps/api/src/app/access/access.service.tsindex f1dc4c6ec5..bbaef5f730 100644--- a/apps/api/src/app/access/access.service.ts+++ b/apps/api/src/app/access/access.service.ts@@ -1,4 +1,4 @@-import { PrismaService } from '@ghostfolio/api/services/prisma.service';+import { PrismaService } from '@ghostfolio/api/services/prisma/prisma.service';import { AccessWithGranteeUser } from '@ghostfolio/common/types';import { Injectable } from '@nestjs/common';import { Access, Prisma } from '@prisma/client';diff --git a/apps/api/src/app/account/account.controller.ts b/apps/api/src/app/account/account.controller.tsindex 4f458bcfa6..3c4d3db5b1 100644--- a/apps/api/src/app/account/account.controller.ts+++ b/apps/api/src/app/account/account.controller.ts@@ -1,6 +1,6 @@import { PortfolioService } from '@ghostfolio/api/app/portfolio/portfolio.service';import { RedactValuesInResponseInterceptor } from '@ghostfolio/api/interceptors/redact-values-in-response.interceptor';-import { ImpersonationService } from '@ghostfolio/api/services/impersonation.service';+import { ImpersonationService } from '@ghostfolio/api/services/impersonation/impersonation.service';import { HEADER_KEY_IMPERSONATION } from '@ghostfolio/common/config';import { Accounts } from '@ghostfolio/common/interfaces';import { hasPermission, permissions } from '@ghostfolio/common/permissions';diff --git a/apps/api/src/app/account/account.module.ts b/apps/api/src/app/account/account.module.tsindex 90bf909fcd..f37ed34eef 100644--- a/apps/api/src/app/account/account.module.ts+++ b/apps/api/src/app/account/account.module.ts@@ -1,11 +1,11 @@import { PortfolioModule } from '@ghostfolio/api/app/portfolio/portfolio.module';import { RedisCacheModule } from '@ghostfolio/api/app/redis-cache/redis-cache.module';import { UserModule } from '@ghostfolio/api/app/user/user.module';-import { ConfigurationModule } from '@ghostfolio/api/services/configuration.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.module';-import { ImpersonationModule } from '@ghostfolio/api/services/impersonation.module';-import { PrismaModule } from '@ghostfolio/api/services/prisma.module';+import { ExchangeRateDataModule } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.module';+import { ImpersonationModule } from '@ghostfolio/api/services/impersonation/impersonation.module';+import { PrismaModule } from '@ghostfolio/api/services/prisma/prisma.module';import { Module } from '@nestjs/common';import { AccountController } from './account.controller';diff --git a/apps/api/src/app/account/account.service.ts b/apps/api/src/app/account/account.service.tsindex 7c10fc31ff..eb3ad81499 100644--- a/apps/api/src/app/account/account.service.ts+++ b/apps/api/src/app/account/account.service.ts@@ -1,5 +1,5 @@-import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data.service';-import { PrismaService } from '@ghostfolio/api/services/prisma.service';+import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.service';+import { PrismaService } from '@ghostfolio/api/services/prisma/prisma.service';import { Filter } from '@ghostfolio/common/interfaces';import { Injectable } from '@nestjs/common';import { Account, Order, Platform, Prisma } from '@prisma/client';diff --git a/apps/api/src/app/admin/admin.controller.ts b/apps/api/src/app/admin/admin.controller.tsindex 81fd25308a..fc9f779a44 100644--- a/apps/api/src/app/admin/admin.controller.ts+++ b/apps/api/src/app/admin/admin.controller.ts@@ -1,5 +1,5 @@-import { DataGatheringService } from '@ghostfolio/api/services/data-gathering.service';-import { MarketDataService } from '@ghostfolio/api/services/market-data.service';+import { DataGatheringService } from '@ghostfolio/api/services/data-gathering/data-gathering.service';+import { MarketDataService } from '@ghostfolio/api/services/market-data/market-data.service';import { PropertyDto } from '@ghostfolio/api/services/property/property.dto';import {GATHER_ASSET_PROFILE_PROCESS,diff --git a/apps/api/src/app/admin/admin.module.ts b/apps/api/src/app/admin/admin.module.tsindex 464ba70697..500af69dbc 100644--- a/apps/api/src/app/admin/admin.module.ts+++ b/apps/api/src/app/admin/admin.module.ts@@ -1,12 +1,12 @@import { SubscriptionModule } from '@ghostfolio/api/app/subscription/subscription.module';-import { ConfigurationModule } from '@ghostfolio/api/services/configuration.module';-import { DataGatheringModule } from '@ghostfolio/api/services/data-gathering.module';+import { ConfigurationModule } from '@ghostfolio/api/services/configuration/configuration.module';+import { DataGatheringModule } from '@ghostfolio/api/services/data-gathering/data-gathering.module';import { DataProviderModule } from '@ghostfolio/api/services/data-provider/data-provider.module';-import { ExchangeRateDataModule } from '@ghostfolio/api/services/exchange-rate-data.module';-import { MarketDataModule } from '@ghostfolio/api/services/market-data.module';-import { PrismaModule } from '@ghostfolio/api/services/prisma.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 { PropertyModule } from '@ghostfolio/api/services/property/property.module';-import { SymbolProfileModule } from '@ghostfolio/api/services/symbol-profile.module';+import { SymbolProfileModule } from '@ghostfolio/api/services/symbol-profile/symbol-profile.module';import { Module } from '@nestjs/common';import { AdminController } from './admin.controller';diff --git a/apps/api/src/app/admin/admin.service.ts b/apps/api/src/app/admin/admin.service.tsindex 5b5eea63fd..db334344d2 100644--- a/apps/api/src/app/admin/admin.service.ts+++ b/apps/api/src/app/admin/admin.service.ts@@ -1,10 +1,10 @@import { SubscriptionService } from '@ghostfolio/api/app/subscription/subscription.service';-import { ConfigurationService } from '@ghostfolio/api/services/configuration.service';-import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data.service';-import { MarketDataService } from '@ghostfolio/api/services/market-data.service';-import { PrismaService } from '@ghostfolio/api/services/prisma.service';+import { ConfigurationService } from '@ghostfolio/api/services/configuration/configuration.service';+import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.service';+import { MarketDataService } from '@ghostfolio/api/services/market-data/market-data.service';+import { PrismaService } from '@ghostfolio/api/services/prisma/prisma.service';import { PropertyService } from '@ghostfolio/api/services/property/property.service';-import { SymbolProfileService } from '@ghostfolio/api/services/symbol-profile.service';+import { SymbolProfileService } from '@ghostfolio/api/services/symbol-profile/symbol-profile.service';import { PROPERTY_CURRENCIES } from '@ghostfolio/common/config';import {AdminData,diff --git a/apps/api/src/app/admin/queue/queue.module.ts b/apps/api/src/app/admin/queue/queue.module.tsindex 62091f34b7..3c1be5128c 100644--- a/apps/api/src/app/admin/queue/queue.module.ts+++ b/apps/api/src/app/admin/queue/queue.module.ts@@ -1,4 +1,4 @@-import { DataGatheringModule } from '@ghostfolio/api/services/data-gathering.module';+import { DataGatheringModule } from '@ghostfolio/api/services/data-gathering/data-gathering.module';import { Module } from '@nestjs/common';import { QueueController } from './queue.controller';diff --git a/apps/api/src/app/app.controller.ts b/apps/api/src/app/app.controller.tsindex d92a7a3ce1..33e9ae56ad 100644--- a/apps/api/src/app/app.controller.ts+++ b/apps/api/src/app/app.controller.ts@@ -1,4 +1,4 @@-import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data.service';+import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.service';import { Controller } from '@nestjs/common';@Controller()diff --git a/apps/api/src/app/app.module.ts b/apps/api/src/app/app.module.tsindex 0db6d89491..83179a4020 100644--- a/apps/api/src/app/app.module.ts+++ b/apps/api/src/app/app.module.ts@@ -1,18 +1,18 @@import { join } from 'path';+import { ConfigurationModule } from '@ghostfolio/api/services/configuration/configuration.module';+import { CronService } from '@ghostfolio/api/services/cron.service';+import { DataGatheringModule } from '@ghostfolio/api/services/data-gathering/data-gathering.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 { PrismaModule } from '@ghostfolio/api/services/prisma/prisma.module';+import { TwitterBotModule } from '@ghostfolio/api/services/twitter-bot/twitter-bot.module';import { BullModule } from '@nestjs/bull';import { MiddlewareConsumer, Module, RequestMethod } from '@nestjs/common';import { ConfigModule } from '@nestjs/config';import { ScheduleModule } from '@nestjs/schedule';import { ServeStaticModule } from '@nestjs/serve-static';-import { ConfigurationModule } from '../services/configuration.module';-import { CronService } from '../services/cron.service';-import { DataGatheringModule } from '../services/data-gathering.module';-import { DataProviderModule } from '../services/data-provider/data-provider.module';-import { ExchangeRateDataModule } from '../services/exchange-rate-data.module';-import { PrismaModule } from '../services/prisma.module';-import { TwitterBotModule } from '../services/twitter-bot/twitter-bot.module';import { AccessModule } from './access/access.module';import { AccountModule } from './account/account.module';import { AdminModule } from './admin/admin.module';diff --git a/apps/api/src/app/auth-device/auth-device.module.ts b/apps/api/src/app/auth-device/auth-device.module.tsindex de6cd1cbca..11ddd58ec9 100644--- a/apps/api/src/app/auth-device/auth-device.module.ts+++ b/apps/api/src/app/auth-device/auth-device.module.ts@@ -1,7 +1,7 @@import { AuthDeviceController } from '@ghostfolio/api/app/auth-device/auth-device.controller';import { AuthDeviceService } from '@ghostfolio/api/app/auth-device/auth-device.service';-import { ConfigurationModule } from '@ghostfolio/api/services/configuration.module';-import { PrismaModule } from '@ghostfolio/api/services/prisma.module';+import { ConfigurationModule } from '@ghostfolio/api/services/configuration/configuration.module';+import { PrismaModule } from '@ghostfolio/api/services/prisma/prisma.module';import { Module } from '@nestjs/common';import { JwtModule } from '@nestjs/jwt';diff --git a/apps/api/src/app/auth-device/auth-device.service.ts b/apps/api/src/app/auth-device/auth-device.service.tsindex 048aca758d..19dad8876f 100644--- a/apps/api/src/app/auth-device/auth-device.service.ts+++ b/apps/api/src/app/auth-device/auth-device.service.ts@@ -1,5 +1,5 @@-import { ConfigurationService } from '@ghostfolio/api/services/configuration.service';-import { PrismaService } from '@ghostfolio/api/services/prisma.service';+import { ConfigurationService } from '@ghostfolio/api/services/configuration/configuration.service';+import { PrismaService } from '@ghostfolio/api/services/prisma/prisma.service';import { Injectable } from '@nestjs/common';import { AuthDevice, Prisma } from '@prisma/client';diff --git a/apps/api/src/app/auth/auth.controller.ts b/apps/api/src/app/auth/auth.controller.tsindex 1050fe5bf5..0c6b047bfd 100644--- a/apps/api/src/app/auth/auth.controller.ts+++ b/apps/api/src/app/auth/auth.controller.ts@@ -1,5 +1,5 @@import { WebAuthService } from '@ghostfolio/api/app/auth/web-auth.service';-import { ConfigurationService } from '@ghostfolio/api/services/configuration.service';+import { ConfigurationService } from '@ghostfolio/api/services/configuration/configuration.service';import { DEFAULT_LANGUAGE_CODE } from '@ghostfolio/common/config';import { OAuthResponse } from '@ghostfolio/common/interfaces';import {diff --git a/apps/api/src/app/auth/auth.module.ts b/apps/api/src/app/auth/auth.module.tsindex dfdec56557..458493051d 100644--- a/apps/api/src/app/auth/auth.module.ts+++ b/apps/api/src/app/auth/auth.module.ts@@ -2,8 +2,8 @@ import { AuthDeviceService } from '@ghostfolio/api/app/auth-device/auth-device.simport { WebAuthService } from '@ghostfolio/api/app/auth/web-auth.service';import { SubscriptionModule } from '@ghostfolio/api/app/subscription/subscription.module';import { UserModule } from '@ghostfolio/api/app/user/user.module';-import { ConfigurationModule } from '@ghostfolio/api/services/configuration.module';-import { PrismaModule } from '@ghostfolio/api/services/prisma.module';+import { ConfigurationModule } from '@ghostfolio/api/services/configuration/configuration.module';+import { PrismaModule } from '@ghostfolio/api/services/prisma/prisma.module';import { PropertyModule } from '@ghostfolio/api/services/property/property.module';import { Module } from '@nestjs/common';import { JwtModule } from '@nestjs/jwt';diff --git a/apps/api/src/app/auth/auth.service.ts b/apps/api/src/app/auth/auth.service.tsindex 2c2dc2fc7e..2f31e722be 100644--- a/apps/api/src/app/auth/auth.service.ts+++ b/apps/api/src/app/auth/auth.service.ts@@ -1,5 +1,5 @@import { UserService } from '@ghostfolio/api/app/user/user.service';-import { ConfigurationService } from '@ghostfolio/api/services/configuration.service';+import { ConfigurationService } from '@ghostfolio/api/services/configuration/configuration.service';import { PropertyService } from '@ghostfolio/api/services/property/property.service';import { Injectable, InternalServerErrorException } from '@nestjs/common';import { JwtService } from '@nestjs/jwt';diff --git a/apps/api/src/app/auth/google.strategy.ts b/apps/api/src/app/auth/google.strategy.tsindex c8fb260b73..7e43f5817c 100644--- a/apps/api/src/app/auth/google.strategy.ts+++ b/apps/api/src/app/auth/google.strategy.ts@@ -1,4 +1,4 @@-import { ConfigurationService } from '@ghostfolio/api/services/configuration.service';+import { ConfigurationService } from '@ghostfolio/api/services/configuration/configuration.service';import { Injectable, Logger } from '@nestjs/common';import { PassportStrategy } from '@nestjs/passport';import { Provider } from '@prisma/client';diff --git a/apps/api/src/app/auth/jwt.strategy.ts b/apps/api/src/app/auth/jwt.strategy.tsindex af21ecc0e5..6d7e2ecdc7 100644--- a/apps/api/src/app/auth/jwt.strategy.ts+++ b/apps/api/src/app/auth/jwt.strategy.ts@@ -1,6 +1,6 @@import { UserService } from '@ghostfolio/api/app/user/user.service';-import { ConfigurationService } from '@ghostfolio/api/services/configuration.service';-import { PrismaService } from '@ghostfolio/api/services/prisma.service';+import { ConfigurationService } from '@ghostfolio/api/services/configuration/configuration.service';+import { PrismaService } from '@ghostfolio/api/services/prisma/prisma.service';import { HEADER_KEY_TIMEZONE } from '@ghostfolio/common/config';import { Injectable, UnauthorizedException } from '@nestjs/common';import { PassportStrategy } from '@nestjs/passport';diff --git a/apps/api/src/app/auth/web-auth.service.ts b/apps/api/src/app/auth/web-auth.service.tsindex bbfddb673d..471b77709a 100644--- a/apps/api/src/app/auth/web-auth.service.ts+++ b/apps/api/src/app/auth/web-auth.service.ts@@ -1,7 +1,7 @@import { AuthDeviceDto } from '@ghostfolio/api/app/auth-device/auth-device.dto';import { AuthDeviceService } from '@ghostfolio/api/app/auth-device/auth-device.service';import { UserService } from '@ghostfolio/api/app/user/user.service';-import { ConfigurationService } from '@ghostfolio/api/services/configuration.service';+import { ConfigurationService } from '@ghostfolio/api/services/configuration/configuration.service';import type { RequestWithUser } from '@ghostfolio/common/types';import {Inject,diff --git a/apps/api/src/app/benchmark/benchmark.module.ts b/apps/api/src/app/benchmark/benchmark.module.tsindex 4c20e61aa2..71b08c1916 100644--- a/apps/api/src/app/benchmark/benchmark.module.ts+++ b/apps/api/src/app/benchmark/benchmark.module.ts@@ -1,10 +1,10 @@import { RedisCacheModule } from '@ghostfolio/api/app/redis-cache/redis-cache.module';import { SymbolModule } from '@ghostfolio/api/app/symbol/symbol.module';-import { ConfigurationModule } from '@ghostfolio/api/services/configuration.module';+import { ConfigurationModule } from '@ghostfolio/api/services/configuration/configuration.module';import { DataProviderModule } from '@ghostfolio/api/services/data-provider/data-provider.module';-import { MarketDataModule } from '@ghostfolio/api/services/market-data.module';+import { MarketDataModule } from '@ghostfolio/api/services/market-data/market-data.module';import { PropertyModule } from '@ghostfolio/api/services/property/property.module';-import { SymbolProfileModule } from '@ghostfolio/api/services/symbol-profile.module';+import { SymbolProfileModule } from '@ghostfolio/api/services/symbol-profile/symbol-profile.module';import { Module } from '@nestjs/common';import { BenchmarkController } from './benchmark.controller';diff --git a/apps/api/src/app/benchmark/benchmark.service.ts b/apps/api/src/app/benchmark/benchmark.service.tsindex 015fc7ee70..4e87b26f9b 100644--- a/apps/api/src/app/benchmark/benchmark.service.ts+++ b/apps/api/src/app/benchmark/benchmark.service.ts@@ -1,9 +1,9 @@import { RedisCacheService } from '@ghostfolio/api/app/redis-cache/redis-cache.service';import { SymbolService } from '@ghostfolio/api/app/symbol/symbol.service';import { DataProviderService } from '@ghostfolio/api/services/data-provider/data-provider.service';-import { MarketDataService } from '@ghostfolio/api/services/market-data.service';+import { MarketDataService } from '@ghostfolio/api/services/market-data/market-data.service';import { PropertyService } from '@ghostfolio/api/services/property/property.service';-import { SymbolProfileService } from '@ghostfolio/api/services/symbol-profile.service';+import { SymbolProfileService } from '@ghostfolio/api/services/symbol-profile/symbol-profile.service';import {MAX_CHART_ITEMS,PROPERTY_BENCHMARKSdiff --git a/apps/api/src/app/cache/cache.module.ts b/apps/api/src/app/cache/cache.module.tsindex c079c79427..23b3ea2bb2 100644--- a/apps/api/src/app/cache/cache.module.ts+++ b/apps/api/src/app/cache/cache.module.ts@@ -1,10 +1,10 @@import { RedisCacheModule } from '@ghostfolio/api/app/redis-cache/redis-cache.module';-import { ConfigurationModule } from '@ghostfolio/api/services/configuration.module';-import { DataGatheringModule } from '@ghostfolio/api/services/data-gathering.module';+import { ConfigurationModule } from '@ghostfolio/api/services/configuration/configuration.module';+import { DataGatheringModule } from '@ghostfolio/api/services/data-gathering/data-gathering.module';import { DataProviderModule } from '@ghostfolio/api/services/data-provider/data-provider.module';-import { ExchangeRateDataModule } from '@ghostfolio/api/services/exchange-rate-data.module';-import { PrismaModule } from '@ghostfolio/api/services/prisma.module';-import { SymbolProfileModule } from '@ghostfolio/api/services/symbol-profile.module';+import { ExchangeRateDataModule } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.module';+import { PrismaModule } from '@ghostfolio/api/services/prisma/prisma.module';+import { SymbolProfileModule } from '@ghostfolio/api/services/symbol-profile/symbol-profile.module';import { Module } from '@nestjs/common';import { CacheController } from './cache.controller';diff --git a/apps/api/src/app/exchange-rate/exchange-rate.module.ts b/apps/api/src/app/exchange-rate/exchange-rate.module.tsindex 04337d010f..d94f047f39 100644--- a/apps/api/src/app/exchange-rate/exchange-rate.module.ts+++ b/apps/api/src/app/exchange-rate/exchange-rate.module.ts@@ -1,4 +1,4 @@-import { ExchangeRateDataModule } from '@ghostfolio/api/services/exchange-rate-data.module';+import { ExchangeRateDataModule } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.module';import { Module } from '@nestjs/common';import { ExchangeRateController } from './exchange-rate.controller';diff --git a/apps/api/src/app/exchange-rate/exchange-rate.service.ts b/apps/api/src/app/exchange-rate/exchange-rate.service.tsindex d340bb5b33..44a8d05681 100644--- a/apps/api/src/app/exchange-rate/exchange-rate.service.ts+++ b/apps/api/src/app/exchange-rate/exchange-rate.service.ts@@ -1,4 +1,4 @@-import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data.service';+import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.service';import { Injectable } from '@nestjs/common';@Injectable()diff --git a/apps/api/src/app/export/export.module.ts b/apps/api/src/app/export/export.module.tsindex dd273c7173..186e8dc597 100644--- a/apps/api/src/app/export/export.module.ts+++ b/apps/api/src/app/export/export.module.ts@@ -1,8 +1,8 @@import { RedisCacheModule } from '@ghostfolio/api/app/redis-cache/redis-cache.module';-import { ConfigurationModule } from '@ghostfolio/api/services/configuration.module';-import { DataGatheringModule } from '@ghostfolio/api/services/data-gathering.module';+import { ConfigurationModule } from '@ghostfolio/api/services/configuration/configuration.module';+import { DataGatheringModule } from '@ghostfolio/api/services/data-gathering/data-gathering.module';import { DataProviderModule } from '@ghostfolio/api/services/data-provider/data-provider.module';-import { PrismaModule } from '@ghostfolio/api/services/prisma.module';+import { PrismaModule } from '@ghostfolio/api/services/prisma/prisma.module';import { Module } from '@nestjs/common';import { ExportController } from './export.controller';diff --git a/apps/api/src/app/export/export.service.ts b/apps/api/src/app/export/export.service.tsindex c57f1df4e6..c8bd651a67 100644--- a/apps/api/src/app/export/export.service.ts+++ b/apps/api/src/app/export/export.service.ts@@ -1,5 +1,5 @@import { environment } from '@ghostfolio/api/environments/environment';-import { PrismaService } from '@ghostfolio/api/services/prisma.service';+import { PrismaService } from '@ghostfolio/api/services/prisma/prisma.service';import { Export } from '@ghostfolio/common/interfaces';import { Injectable } from '@nestjs/common';diff --git a/apps/api/src/app/frontend.middleware.ts b/apps/api/src/app/frontend.middleware.tsindex baeb5d66de..58e39a5eae 100644--- a/apps/api/src/app/frontend.middleware.ts+++ b/apps/api/src/app/frontend.middleware.ts@@ -2,7 +2,7 @@ import * as fs from 'fs';import * as path from 'path';import { environment } from '@ghostfolio/api/environments/environment';-import { ConfigurationService } from '@ghostfolio/api/services/configuration.service';+import { ConfigurationService } from '@ghostfolio/api/services/configuration/configuration.service';import { DEFAULT_LANGUAGE_CODE } from '@ghostfolio/common/config';import { DATE_FORMAT } from '@ghostfolio/common/helper';import { Injectable, NestMiddleware } from '@nestjs/common';diff --git a/apps/api/src/app/health/health.controller.ts b/apps/api/src/app/health/health.controller.tsindex 699a996dd9..d9af979813 100644--- a/apps/api/src/app/health/health.controller.ts+++ b/apps/api/src/app/health/health.controller.ts@@ -6,11 +6,11 @@ import {Param,UseInterceptors} from '@nestjs/common';--import { HealthService } from './health.service';import { DataSource } from '@prisma/client';import { StatusCodes, getReasonPhrase } from 'http-status-codes';+import { HealthService } from './health.service';+@Controller('health')export class HealthController {public constructor(private readonly healthService: HealthService) {}diff --git a/apps/api/src/app/health/health.module.ts b/apps/api/src/app/health/health.module.tsindex 2aab03bfa0..1c5292027d 100644--- a/apps/api/src/app/health/health.module.ts+++ b/apps/api/src/app/health/health.module.ts@@ -1,4 +1,4 @@-import { ConfigurationModule } from '@ghostfolio/api/services/configuration.module';+import { ConfigurationModule } from '@ghostfolio/api/services/configuration/configuration.module';import { DataProviderModule } from '@ghostfolio/api/services/data-provider/data-provider.module';import { Module } from '@nestjs/common';diff --git a/apps/api/src/app/import/import.controller.ts b/apps/api/src/app/import/import.controller.tsindex 306c722a73..289d103eee 100644--- a/apps/api/src/app/import/import.controller.ts+++ b/apps/api/src/app/import/import.controller.ts@@ -1,6 +1,6 @@import { TransformDataSourceInRequestInterceptor } from '@ghostfolio/api/interceptors/transform-data-source-in-request.interceptor';import { TransformDataSourceInResponseInterceptor } from '@ghostfolio/api/interceptors/transform-data-source-in-response.interceptor';-import { ConfigurationService } from '@ghostfolio/api/services/configuration.service';+import { ConfigurationService } from '@ghostfolio/api/services/configuration/configuration.service';import { ImportResponse } from '@ghostfolio/common/interfaces';import { hasPermission, permissions } from '@ghostfolio/common/permissions';import type { RequestWithUser } from '@ghostfolio/common/types';diff --git a/apps/api/src/app/import/import.module.ts b/apps/api/src/app/import/import.module.tsindex 6ae073175d..16f4bcdd60 100644--- a/apps/api/src/app/import/import.module.ts+++ b/apps/api/src/app/import/import.module.ts@@ -3,17 +3,17 @@ import { CacheModule } from '@ghostfolio/api/app/cache/cache.module';import { OrderModule } from '@ghostfolio/api/app/order/order.module';import { PortfolioModule } from '@ghostfolio/api/app/portfolio/portfolio.module';import { RedisCacheModule } from '@ghostfolio/api/app/redis-cache/redis-cache.module';-import { ConfigurationModule } from '@ghostfolio/api/services/configuration.module';-import { DataGatheringModule } from '@ghostfolio/api/services/data-gathering.module';+import { ConfigurationModule } from '@ghostfolio/api/services/configuration/configuration.module';+import { DataGatheringModule } from '@ghostfolio/api/services/data-gathering/data-gathering.module';import { DataProviderModule } from '@ghostfolio/api/services/data-provider/data-provider.module';-import { ExchangeRateDataModule } from '@ghostfolio/api/services/exchange-rate-data.module';-import { PrismaModule } from '@ghostfolio/api/services/prisma.module';-import { SymbolProfileModule } from '@ghostfolio/api/services/symbol-profile.module';+import { ExchangeRateDataModule } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.module';+import { PlatformModule } from '@ghostfolio/api/services/platform/platform.module';+import { PrismaModule } from '@ghostfolio/api/services/prisma/prisma.module';+import { SymbolProfileModule } from '@ghostfolio/api/services/symbol-profile/symbol-profile.module';import { Module } from '@nestjs/common';import { ImportController } from './import.controller';import { ImportService } from './import.service';-import { PlatformModule } from '@ghostfolio/api/services/platform/platform.module';@Module({controllers: [ImportController],diff --git a/apps/api/src/app/import/import.service.ts b/apps/api/src/app/import/import.service.tsindex 57358ee54c..7d0fda0925 100644--- a/apps/api/src/app/import/import.service.ts+++ b/apps/api/src/app/import/import.service.ts@@ -5,9 +5,9 @@ import { Activity } from '@ghostfolio/api/app/order/interfaces/activities.interfimport { OrderService } from '@ghostfolio/api/app/order/order.service';import { PortfolioService } from '@ghostfolio/api/app/portfolio/portfolio.service';import { DataProviderService } from '@ghostfolio/api/services/data-provider/data-provider.service';-import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data.service';+import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.service';import { PlatformService } from '@ghostfolio/api/services/platform/platform.service';-import { SymbolProfileService } from '@ghostfolio/api/services/symbol-profile.service';+import { SymbolProfileService } from '@ghostfolio/api/services/symbol-profile/symbol-profile.service';import { parseDate } from '@ghostfolio/common/helper';import { UniqueAsset } from '@ghostfolio/common/interfaces';import {diff --git a/apps/api/src/app/info/info.module.ts b/apps/api/src/app/info/info.module.tsindex 4c9c9f9d9b..aa26373933 100644--- a/apps/api/src/app/info/info.module.ts+++ b/apps/api/src/app/info/info.module.ts@@ -1,12 +1,12 @@import { BenchmarkModule } from '@ghostfolio/api/app/benchmark/benchmark.module';import { RedisCacheModule } from '@ghostfolio/api/app/redis-cache/redis-cache.module';-import { ConfigurationModule } from '@ghostfolio/api/services/configuration.module';-import { DataGatheringModule } from '@ghostfolio/api/services/data-gathering.module';+import { ConfigurationModule } from '@ghostfolio/api/services/configuration/configuration.module';+import { DataGatheringModule } from '@ghostfolio/api/services/data-gathering/data-gathering.module';import { DataProviderModule } from '@ghostfolio/api/services/data-provider/data-provider.module';-import { ExchangeRateDataModule } from '@ghostfolio/api/services/exchange-rate-data.module';-import { PrismaModule } from '@ghostfolio/api/services/prisma.module';+import { ExchangeRateDataModule } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.module';+import { PrismaModule } from '@ghostfolio/api/services/prisma/prisma.module';import { PropertyModule } from '@ghostfolio/api/services/property/property.module';-import { SymbolProfileModule } from '@ghostfolio/api/services/symbol-profile.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 { JwtModule } from '@nestjs/jwt';diff --git a/apps/api/src/app/info/info.service.ts b/apps/api/src/app/info/info.service.tsindex 6c4d370475..f2cf36ae09 100644--- a/apps/api/src/app/info/info.service.ts+++ b/apps/api/src/app/info/info.service.ts@@ -1,8 +1,8 @@import { BenchmarkService } from '@ghostfolio/api/app/benchmark/benchmark.service';import { RedisCacheService } from '@ghostfolio/api/app/redis-cache/redis-cache.service';-import { ConfigurationService } from '@ghostfolio/api/services/configuration.service';-import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data.service';-import { PrismaService } from '@ghostfolio/api/services/prisma.service';+import { ConfigurationService } from '@ghostfolio/api/services/configuration/configuration.service';+import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.service';+import { PrismaService } from '@ghostfolio/api/services/prisma/prisma.service';import { PropertyService } from '@ghostfolio/api/services/property/property.service';import { TagService } from '@ghostfolio/api/services/tag/tag.service';import {diff --git a/apps/api/src/app/logo/logo.module.ts b/apps/api/src/app/logo/logo.module.tsindex 518010f39d..43052a14fc 100644--- a/apps/api/src/app/logo/logo.module.ts+++ b/apps/api/src/app/logo/logo.module.ts@@ -1,5 +1,5 @@-import { ConfigurationModule } from '@ghostfolio/api/services/configuration.module';-import { SymbolProfileModule } from '@ghostfolio/api/services/symbol-profile.module';+import { ConfigurationModule } from '@ghostfolio/api/services/configuration/configuration.module';+import { SymbolProfileModule } from '@ghostfolio/api/services/symbol-profile/symbol-profile.module';import { Module } from '@nestjs/common';import { LogoController } from './logo.controller';diff --git a/apps/api/src/app/logo/logo.service.ts b/apps/api/src/app/logo/logo.service.tsindex 3bea44ca9d..d2e377fc08 100644--- a/apps/api/src/app/logo/logo.service.ts+++ b/apps/api/src/app/logo/logo.service.ts@@ -1,4 +1,4 @@-import { SymbolProfileService } from '@ghostfolio/api/services/symbol-profile.service';+import { SymbolProfileService } from '@ghostfolio/api/services/symbol-profile/symbol-profile.service';import { UniqueAsset } from '@ghostfolio/common/interfaces';import { HttpException, Injectable } from '@nestjs/common';import { DataSource } from '@prisma/client';diff --git a/apps/api/src/app/order/order.controller.ts b/apps/api/src/app/order/order.controller.tsindex 5e5da4fde2..90f8c10b10 100644--- a/apps/api/src/app/order/order.controller.ts+++ b/apps/api/src/app/order/order.controller.ts@@ -2,7 +2,7 @@ import { RedactValuesInResponseInterceptor } from '@ghostfolio/api/interceptors/import { TransformDataSourceInRequestInterceptor } from '@ghostfolio/api/interceptors/transform-data-source-in-request.interceptor';import { TransformDataSourceInResponseInterceptor } from '@ghostfolio/api/interceptors/transform-data-source-in-response.interceptor';import { ApiService } from '@ghostfolio/api/services/api/api.service';-import { ImpersonationService } from '@ghostfolio/api/services/impersonation.service';+import { ImpersonationService } from '@ghostfolio/api/services/impersonation/impersonation.service';import { HEADER_KEY_IMPERSONATION } from '@ghostfolio/common/config';import { hasPermission, permissions } from '@ghostfolio/common/permissions';import type { RequestWithUser } from '@ghostfolio/common/types';diff --git a/apps/api/src/app/order/order.module.ts b/apps/api/src/app/order/order.module.tsindex 7ecc577a5c..c8742f9d2e 100644--- a/apps/api/src/app/order/order.module.ts+++ b/apps/api/src/app/order/order.module.ts@@ -3,13 +3,13 @@ import { CacheModule } from '@ghostfolio/api/app/cache/cache.module';import { RedisCacheModule } from '@ghostfolio/api/app/redis-cache/redis-cache.module';import { UserModule } from '@ghostfolio/api/app/user/user.module';import { ApiModule } from '@ghostfolio/api/services/api/api.module';-import { ConfigurationModule } from '@ghostfolio/api/services/configuration.module';-import { DataGatheringModule } from '@ghostfolio/api/services/data-gathering.module';+import { ConfigurationModule } from '@ghostfolio/api/services/configuration/configuration.module';+import { DataGatheringModule } from '@ghostfolio/api/services/data-gathering/data-gathering.module';import { DataProviderModule } from '@ghostfolio/api/services/data-provider/data-provider.module';-import { ExchangeRateDataModule } from '@ghostfolio/api/services/exchange-rate-data.module';-import { ImpersonationModule } from '@ghostfolio/api/services/impersonation.module';-import { PrismaModule } from '@ghostfolio/api/services/prisma.module';-import { SymbolProfileModule } from '@ghostfolio/api/services/symbol-profile.module';+import { ExchangeRateDataModule } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.module';+import { ImpersonationModule } from '@ghostfolio/api/services/impersonation/impersonation.module';+import { PrismaModule } from '@ghostfolio/api/services/prisma/prisma.module';+import { SymbolProfileModule } from '@ghostfolio/api/services/symbol-profile/symbol-profile.module';import { Module } from '@nestjs/common';import { OrderController } from './order.controller';diff --git a/apps/api/src/app/order/order.service.ts b/apps/api/src/app/order/order.service.tsindex 50f936148e..2403bf4954 100644--- a/apps/api/src/app/order/order.service.ts+++ b/apps/api/src/app/order/order.service.ts@@ -1,8 +1,8 @@import { AccountService } from '@ghostfolio/api/app/account/account.service';-import { DataGatheringService } from '@ghostfolio/api/services/data-gathering.service';-import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data.service';-import { PrismaService } from '@ghostfolio/api/services/prisma.service';-import { SymbolProfileService } from '@ghostfolio/api/services/symbol-profile.service';+import { DataGatheringService } from '@ghostfolio/api/services/data-gathering/data-gathering.service';+import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.service';+import { PrismaService } from '@ghostfolio/api/services/prisma/prisma.service';+import { SymbolProfileService } from '@ghostfolio/api/services/symbol-profile/symbol-profile.service';import {GATHER_ASSET_PROFILE_PROCESS,GATHER_ASSET_PROFILE_PROCESS_OPTIONSdiff --git a/apps/api/src/app/portfolio/current-rate.service.mock.ts b/apps/api/src/app/portfolio/current-rate.service.mock.tsindex 9fe6b2ec2b..a9dc03acf9 100644--- a/apps/api/src/app/portfolio/current-rate.service.mock.ts+++ b/apps/api/src/app/portfolio/current-rate.service.mock.ts@@ -2,8 +2,8 @@ import { parseDate, resetHours } from '@ghostfolio/common/helper';import { addDays, endOfDay, isBefore, isSameDay } from 'date-fns';import { GetValueObject } from './interfaces/get-value-object.interface';-import { GetValuesParams } from './interfaces/get-values-params.interface';import { GetValuesObject } from './interfaces/get-values-object.interface';+import { GetValuesParams } from './interfaces/get-values-params.interface';function mockGetValue(symbol: string, date: Date) {switch (symbol) {diff --git a/apps/api/src/app/portfolio/current-rate.service.spec.ts b/apps/api/src/app/portfolio/current-rate.service.spec.tsindex f0e4ea4a9f..00062ee603 100644--- a/apps/api/src/app/portfolio/current-rate.service.spec.ts+++ b/apps/api/src/app/portfolio/current-rate.service.spec.ts@@ -1,13 +1,13 @@import { DataProviderService } from '@ghostfolio/api/services/data-provider/data-provider.service';-import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data.service';-import { MarketDataService } from '@ghostfolio/api/services/market-data.service';+import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.service';+import { MarketDataService } from '@ghostfolio/api/services/market-data/market-data.service';import { PropertyService } from '@ghostfolio/api/services/property/property.service';import { DataSource, MarketData } from '@prisma/client';import { CurrentRateService } from './current-rate.service';import { GetValuesObject } from './interfaces/get-values-object.interface';-jest.mock('@ghostfolio/api/services/market-data.service', () => {+jest.mock('@ghostfolio/api/services/market-data/market-data.service', () => {return {MarketDataService: jest.fn().mockImplementation(() => {return {@@ -54,18 +54,21 @@ jest.mock('@ghostfolio/api/services/market-data.service', () => {};});-jest.mock('@ghostfolio/api/services/exchange-rate-data.service', () => {- return {- ExchangeRateDataService: jest.fn().mockImplementation(() => {- return {- initialize: () => Promise.resolve(),- toCurrency: (value: number) => {- return 1 * value;- }- };- })- };-});+jest.mock(+ '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.service',+ () => {+ return {+ ExchangeRateDataService: jest.fn().mockImplementation(() => {+ return {+ initialize: () => Promise.resolve(),+ toCurrency: (value: number) => {+ return 1 * value;+ }+ };+ })+ };+ }+);jest.mock('@ghostfolio/api/services/property/property.service', () => {return {diff --git a/apps/api/src/app/portfolio/current-rate.service.ts b/apps/api/src/app/portfolio/current-rate.service.tsindex 9ca95d7791..6d48573f7b 100644--- a/apps/api/src/app/portfolio/current-rate.service.ts+++ b/apps/api/src/app/portfolio/current-rate.service.ts@@ -1,6 +1,6 @@import { DataProviderService } from '@ghostfolio/api/services/data-provider/data-provider.service';-import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data.service';-import { MarketDataService } from '@ghostfolio/api/services/market-data.service';+import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.service';+import { MarketDataService } from '@ghostfolio/api/services/market-data/market-data.service';import { resetHours } from '@ghostfolio/common/helper';import { DataProviderInfo, ResponseError } from '@ghostfolio/common/interfaces';import { Injectable } from '@nestjs/common';@@ -8,8 +8,8 @@ import { isBefore, isToday } from 'date-fns';import { flatten, isEmpty, uniqBy } from 'lodash';import { GetValueObject } from './interfaces/get-value-object.interface';-import { GetValuesParams } from './interfaces/get-values-params.interface';import { GetValuesObject } from './interfaces/get-values-object.interface';+import { GetValuesParams } from './interfaces/get-values-params.interface';@Injectable()export class CurrentRateService {diff --git a/apps/api/src/app/portfolio/portfolio.controller.ts b/apps/api/src/app/portfolio/portfolio.controller.tsindex dd6eb0ca67..299db2a1b0 100644--- a/apps/api/src/app/portfolio/portfolio.controller.ts+++ b/apps/api/src/app/portfolio/portfolio.controller.ts@@ -8,8 +8,8 @@ import { RedactValuesInResponseInterceptor } from '@ghostfolio/api/interceptors/import { TransformDataSourceInRequestInterceptor } from '@ghostfolio/api/interceptors/transform-data-source-in-request.interceptor';import { TransformDataSourceInResponseInterceptor } from '@ghostfolio/api/interceptors/transform-data-source-in-response.interceptor';import { ApiService } from '@ghostfolio/api/services/api/api.service';-import { ConfigurationService } from '@ghostfolio/api/services/configuration.service';-import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data.service';+import { ConfigurationService } from '@ghostfolio/api/services/configuration/configuration.service';+import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.service';import { HEADER_KEY_IMPERSONATION } from '@ghostfolio/common/config';import {PortfolioDetails,diff --git a/apps/api/src/app/portfolio/portfolio.module.ts b/apps/api/src/app/portfolio/portfolio.module.tsindex bf5829833a..fa11476acd 100644--- a/apps/api/src/app/portfolio/portfolio.module.ts+++ b/apps/api/src/app/portfolio/portfolio.module.ts@@ -3,14 +3,14 @@ import { AccountService } from '@ghostfolio/api/app/account/account.service';import { OrderModule } from '@ghostfolio/api/app/order/order.module';import { UserModule } from '@ghostfolio/api/app/user/user.module';import { ApiModule } from '@ghostfolio/api/services/api/api.module';-import { ConfigurationModule } from '@ghostfolio/api/services/configuration.module';-import { DataGatheringModule } from '@ghostfolio/api/services/data-gathering.module';+import { ConfigurationModule } from '@ghostfolio/api/services/configuration/configuration.module';+import { DataGatheringModule } from '@ghostfolio/api/services/data-gathering/data-gathering.module';import { DataProviderModule } from '@ghostfolio/api/services/data-provider/data-provider.module';-import { ExchangeRateDataModule } from '@ghostfolio/api/services/exchange-rate-data.module';-import { ImpersonationModule } from '@ghostfolio/api/services/impersonation.module';-import { MarketDataModule } from '@ghostfolio/api/services/market-data.module';-import { PrismaModule } from '@ghostfolio/api/services/prisma.module';-import { SymbolProfileModule } from '@ghostfolio/api/services/symbol-profile.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 { SymbolProfileModule } from '@ghostfolio/api/services/symbol-profile/symbol-profile.module';import { Module } from '@nestjs/common';import { CurrentRateService } from './current-rate.service';diff --git a/apps/api/src/app/portfolio/portfolio.service.ts b/apps/api/src/app/portfolio/portfolio.service.tsindex 4e88136304..ff29ccd571 100644--- a/apps/api/src/app/portfolio/portfolio.service.ts+++ b/apps/api/src/app/portfolio/portfolio.service.ts@@ -14,11 +14,11 @@ import { CurrencyClusterRiskBaseCurrencyInitialInvestment } from '@ghostfolio/apimport { CurrencyClusterRiskCurrentInvestment } from '@ghostfolio/api/models/rules/currency-cluster-risk/current-investment';import { CurrencyClusterRiskInitialInvestment } from '@ghostfolio/api/models/rules/currency-cluster-risk/initial-investment';import { FeeRatioInitialInvestment } from '@ghostfolio/api/models/rules/fees/fee-ratio-initial-investment';-import { ConfigurationService } from '@ghostfolio/api/services/configuration.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.service';-import { ImpersonationService } from '@ghostfolio/api/services/impersonation.service';-import { SymbolProfileService } from '@ghostfolio/api/services/symbol-profile.service';+import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.service';+import { ImpersonationService } from '@ghostfolio/api/services/impersonation/impersonation.service';+import { SymbolProfileService } from '@ghostfolio/api/services/symbol-profile/symbol-profile.service';import {EMERGENCY_FUND_TAG_ID,MAX_CHART_ITEMS,diff --git a/apps/api/src/app/redis-cache/redis-cache.module.ts b/apps/api/src/app/redis-cache/redis-cache.module.tsindex 299a25baba..41f49c4998 100644--- a/apps/api/src/app/redis-cache/redis-cache.module.ts+++ b/apps/api/src/app/redis-cache/redis-cache.module.ts@@ -1,5 +1,5 @@-import { ConfigurationModule } from '@ghostfolio/api/services/configuration.module';-import { ConfigurationService } from '@ghostfolio/api/services/configuration.service';+import { ConfigurationModule } from '@ghostfolio/api/services/configuration/configuration.module';+import { ConfigurationService } from '@ghostfolio/api/services/configuration/configuration.service';import { CacheManagerOptions, CacheModule, Module } from '@nestjs/common';import * as redisStore from 'cache-manager-redis-store';diff --git a/apps/api/src/app/redis-cache/redis-cache.service.ts b/apps/api/src/app/redis-cache/redis-cache.service.tsindex f930b3a72f..49f736bc5a 100644--- a/apps/api/src/app/redis-cache/redis-cache.service.ts+++ b/apps/api/src/app/redis-cache/redis-cache.service.ts@@ -1,4 +1,4 @@-import { ConfigurationService } from '@ghostfolio/api/services/configuration.service';+import { ConfigurationService } from '@ghostfolio/api/services/configuration/configuration.service';import { CACHE_MANAGER, Inject, Injectable } from '@nestjs/common';import { Cache } from 'cache-manager';diff --git a/apps/api/src/app/subscription/subscription.controller.ts b/apps/api/src/app/subscription/subscription.controller.tsindex 1f1aee6492..e063a86367 100644--- a/apps/api/src/app/subscription/subscription.controller.ts+++ b/apps/api/src/app/subscription/subscription.controller.ts@@ -1,4 +1,4 @@-import { ConfigurationService } from '@ghostfolio/api/services/configuration.service';+import { ConfigurationService } from '@ghostfolio/api/services/configuration/configuration.service';import { PropertyService } from '@ghostfolio/api/services/property/property.service';import {DEFAULT_LANGUAGE_CODE,diff --git a/apps/api/src/app/subscription/subscription.module.ts b/apps/api/src/app/subscription/subscription.module.tsindex df08616574..c2c80c135c 100644--- a/apps/api/src/app/subscription/subscription.module.ts+++ b/apps/api/src/app/subscription/subscription.module.ts@@ -1,5 +1,5 @@-import { ConfigurationModule } from '@ghostfolio/api/services/configuration.module';-import { PrismaModule } from '@ghostfolio/api/services/prisma.module';+import { ConfigurationModule } from '@ghostfolio/api/services/configuration/configuration.module';+import { PrismaModule } from '@ghostfolio/api/services/prisma/prisma.module';import { PropertyModule } from '@ghostfolio/api/services/property/property.module';import { Module } from '@nestjs/common';diff --git a/apps/api/src/app/subscription/subscription.service.ts b/apps/api/src/app/subscription/subscription.service.tsindex b339538fc5..591721f842 100644--- a/apps/api/src/app/subscription/subscription.service.ts+++ b/apps/api/src/app/subscription/subscription.service.ts@@ -1,5 +1,5 @@-import { ConfigurationService } from '@ghostfolio/api/services/configuration.service';-import { PrismaService } from '@ghostfolio/api/services/prisma.service';+import { ConfigurationService } from '@ghostfolio/api/services/configuration/configuration.service';+import { PrismaService } from '@ghostfolio/api/services/prisma/prisma.service';import {DEFAULT_LANGUAGE_CODE,PROPERTY_STRIPE_CONFIGdiff --git a/apps/api/src/app/symbol/symbol.module.ts b/apps/api/src/app/symbol/symbol.module.tsindex 2b47334a64..4d9f2d5ebc 100644--- a/apps/api/src/app/symbol/symbol.module.ts+++ b/apps/api/src/app/symbol/symbol.module.ts@@ -1,7 +1,7 @@-import { ConfigurationModule } from '@ghostfolio/api/services/configuration.module';+import { ConfigurationModule } from '@ghostfolio/api/services/configuration/configuration.module';import { DataProviderModule } from '@ghostfolio/api/services/data-provider/data-provider.module';-import { MarketDataModule } from '@ghostfolio/api/services/market-data.module';-import { PrismaModule } from '@ghostfolio/api/services/prisma.module';+import { MarketDataModule } from '@ghostfolio/api/services/market-data/market-data.module';+import { PrismaModule } from '@ghostfolio/api/services/prisma/prisma.module';import { Module } from '@nestjs/common';import { SymbolController } from './symbol.controller';diff --git a/apps/api/src/app/symbol/symbol.service.ts b/apps/api/src/app/symbol/symbol.service.tsindex 066752388e..9a08d7ed55 100644--- a/apps/api/src/app/symbol/symbol.service.ts+++ b/apps/api/src/app/symbol/symbol.service.ts@@ -3,7 +3,7 @@ import {IDataGatheringItem,IDataProviderHistoricalResponse} from '@ghostfolio/api/services/interfaces/interfaces';-import { MarketDataService } from '@ghostfolio/api/services/market-data.service';+import { MarketDataService } from '@ghostfolio/api/services/market-data/market-data.service';import { DATE_FORMAT } from '@ghostfolio/common/helper';import { HistoricalDataItem } from '@ghostfolio/common/interfaces';import { UserWithSettings } from '@ghostfolio/common/types';diff --git a/apps/api/src/app/user/user.module.ts b/apps/api/src/app/user/user.module.tsindex 6a705524ff..3df366bc17 100644--- a/apps/api/src/app/user/user.module.ts+++ b/apps/api/src/app/user/user.module.ts@@ -1,6 +1,6 @@import { SubscriptionModule } from '@ghostfolio/api/app/subscription/subscription.module';-import { ConfigurationModule } from '@ghostfolio/api/services/configuration.module';-import { PrismaModule } from '@ghostfolio/api/services/prisma.module';+import { ConfigurationModule } from '@ghostfolio/api/services/configuration/configuration.module';+import { PrismaModule } from '@ghostfolio/api/services/prisma/prisma.module';import { PropertyModule } from '@ghostfolio/api/services/property/property.module';import { TagModule } from '@ghostfolio/api/services/tag/tag.module';import { Module } from '@nestjs/common';diff --git a/apps/api/src/app/user/user.service.ts b/apps/api/src/app/user/user.service.tsindex 420fa0874e..aaf4d9bad2 100644--- a/apps/api/src/app/user/user.service.ts+++ b/apps/api/src/app/user/user.service.ts@@ -1,6 +1,6 @@import { SubscriptionService } from '@ghostfolio/api/app/subscription/subscription.service';-import { ConfigurationService } from '@ghostfolio/api/services/configuration.service';-import { PrismaService } from '@ghostfolio/api/services/prisma.service';+import { ConfigurationService } from '@ghostfolio/api/services/configuration/configuration.service';+import { PrismaService } from '@ghostfolio/api/services/prisma/prisma.service';import { PropertyService } from '@ghostfolio/api/services/property/property.service';import { TagService } from '@ghostfolio/api/services/tag/tag.service';import { PROPERTY_IS_READ_ONLY_MODE, locale } from '@ghostfolio/common/config';diff --git a/apps/api/src/interceptors/transform-data-source-in-request.interceptor.ts b/apps/api/src/interceptors/transform-data-source-in-request.interceptor.tsindex ecef35bb69..6b75a5615f 100644--- a/apps/api/src/interceptors/transform-data-source-in-request.interceptor.ts+++ b/apps/api/src/interceptors/transform-data-source-in-request.interceptor.ts@@ -1,3 +1,4 @@+import { ConfigurationService } from '@ghostfolio/api/services/configuration/configuration.service';import { decodeDataSource } from '@ghostfolio/common/helper';import {CallHandler,@@ -7,8 +8,6 @@ import {} from '@nestjs/common';import { Observable } from 'rxjs';-import { ConfigurationService } from '../services/configuration.service';-@Injectable()export class TransformDataSourceInRequestInterceptor<T>implements NestInterceptor<T, any>diff --git a/apps/api/src/interceptors/transform-data-source-in-response.interceptor.ts b/apps/api/src/interceptors/transform-data-source-in-response.interceptor.tsindex 0d8b8f2646..6968a0f0f0 100644--- a/apps/api/src/interceptors/transform-data-source-in-response.interceptor.ts+++ b/apps/api/src/interceptors/transform-data-source-in-response.interceptor.ts@@ -1,4 +1,5 @@import { redactAttributes } from '@ghostfolio/api/helper/object.helper';+import { ConfigurationService } from '@ghostfolio/api/services/configuration/configuration.service';import { encodeDataSource } from '@ghostfolio/common/helper';import {CallHandler,@@ -10,8 +11,6 @@ import { DataSource } from '@prisma/client';import { Observable } from 'rxjs';import { map } from 'rxjs/operators';-import { ConfigurationService } from '../services/configuration.service';-@Injectable()export class TransformDataSourceInResponseInterceptor<T>implements NestInterceptor<T, any>diff --git a/apps/api/src/models/order.ts b/apps/api/src/models/order.tsindex 8882ebe379..f24f4455d3 100644--- a/apps/api/src/models/order.ts+++ b/apps/api/src/models/order.ts@@ -1,8 +1,7 @@+import { IOrder } from '@ghostfolio/api/services/interfaces/interfaces';import { Account, SymbolProfile, Type as TypeOfOrder } from '@prisma/client';import { v4 as uuidv4 } from 'uuid';-import { IOrder } from '../services/interfaces/interfaces';-export class Order {private account: Account;private currency: string;diff --git a/apps/api/src/models/rule.ts b/apps/api/src/models/rule.tsindex ad1629ac30..171da810de 100644--- a/apps/api/src/models/rule.ts+++ b/apps/api/src/models/rule.ts@@ -1,5 +1,5 @@import { RuleSettings } from '@ghostfolio/api/models/interfaces/rule-settings.interface';-import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data.service';+import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.service';import { groupBy } from '@ghostfolio/common/helper';import { TimelinePosition, UserSettings } from '@ghostfolio/common/interfaces';diff --git a/apps/api/src/models/rules/account-cluster-risk/current-investment.ts b/apps/api/src/models/rules/account-cluster-risk/current-investment.tsindex 078123743a..7a6d648092 100644--- a/apps/api/src/models/rules/account-cluster-risk/current-investment.ts+++ b/apps/api/src/models/rules/account-cluster-risk/current-investment.ts@@ -1,5 +1,5 @@import { RuleSettings } from '@ghostfolio/api/models/interfaces/rule-settings.interface';-import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data.service';+import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.service';import {PortfolioDetails,PortfolioPosition,diff --git a/apps/api/src/models/rules/account-cluster-risk/initial-investment.ts b/apps/api/src/models/rules/account-cluster-risk/initial-investment.tsindex f490b0d6d6..607f710019 100644--- a/apps/api/src/models/rules/account-cluster-risk/initial-investment.ts+++ b/apps/api/src/models/rules/account-cluster-risk/initial-investment.ts@@ -1,5 +1,5 @@import { RuleSettings } from '@ghostfolio/api/models/interfaces/rule-settings.interface';-import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data.service';+import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.service';import {PortfolioDetails,PortfolioPosition,diff --git a/apps/api/src/models/rules/account-cluster-risk/single-account.ts b/apps/api/src/models/rules/account-cluster-risk/single-account.tsindex 7d75ef4d6e..3be323d7c7 100644--- a/apps/api/src/models/rules/account-cluster-risk/single-account.ts+++ b/apps/api/src/models/rules/account-cluster-risk/single-account.ts@@ -1,5 +1,5 @@import { RuleSettings } from '@ghostfolio/api/models/interfaces/rule-settings.interface';-import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data.service';+import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.service';import { PortfolioDetails, UserSettings } from '@ghostfolio/common/interfaces';import { Rule } from '../../rule';diff --git a/apps/api/src/models/rules/currency-cluster-risk/base-currency-current-investment.ts b/apps/api/src/models/rules/currency-cluster-risk/base-currency-current-investment.tsindex 1d584b04f4..64f8852fe7 100644--- a/apps/api/src/models/rules/currency-cluster-risk/base-currency-current-investment.ts+++ b/apps/api/src/models/rules/currency-cluster-risk/base-currency-current-investment.ts@@ -1,5 +1,5 @@import { RuleSettings } from '@ghostfolio/api/models/interfaces/rule-settings.interface';-import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data.service';+import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.service';import { TimelinePosition, UserSettings } from '@ghostfolio/common/interfaces';import { Rule } from '../../rule';diff --git a/apps/api/src/models/rules/currency-cluster-risk/base-currency-initial-investment.ts b/apps/api/src/models/rules/currency-cluster-risk/base-currency-initial-investment.tsindex c8a3c8b262..45205b2f91 100644--- a/apps/api/src/models/rules/currency-cluster-risk/base-currency-initial-investment.ts+++ b/apps/api/src/models/rules/currency-cluster-risk/base-currency-initial-investment.ts@@ -1,5 +1,5 @@import { RuleSettings } from '@ghostfolio/api/models/interfaces/rule-settings.interface';-import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data.service';+import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.service';import { TimelinePosition, UserSettings } from '@ghostfolio/common/interfaces';import { Rule } from '../../rule';diff --git a/apps/api/src/models/rules/currency-cluster-risk/current-investment.ts b/apps/api/src/models/rules/currency-cluster-risk/current-investment.tsindex 402eddf3f4..2a86ed6f65 100644--- a/apps/api/src/models/rules/currency-cluster-risk/current-investment.ts+++ b/apps/api/src/models/rules/currency-cluster-risk/current-investment.ts@@ -1,5 +1,5 @@import { RuleSettings } from '@ghostfolio/api/models/interfaces/rule-settings.interface';-import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data.service';+import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.service';import { TimelinePosition, UserSettings } from '@ghostfolio/common/interfaces';import { Rule } from '../../rule';diff --git a/apps/api/src/models/rules/currency-cluster-risk/initial-investment.ts b/apps/api/src/models/rules/currency-cluster-risk/initial-investment.tsindex 18477f6f70..65009e3468 100644--- a/apps/api/src/models/rules/currency-cluster-risk/initial-investment.ts+++ b/apps/api/src/models/rules/currency-cluster-risk/initial-investment.ts@@ -1,5 +1,5 @@import { RuleSettings } from '@ghostfolio/api/models/interfaces/rule-settings.interface';-import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data.service';+import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.service';import { TimelinePosition, UserSettings } from '@ghostfolio/common/interfaces';import { Rule } from '../../rule';diff --git a/apps/api/src/models/rules/fees/fee-ratio-initial-investment.ts b/apps/api/src/models/rules/fees/fee-ratio-initial-investment.tsindex d3e4ea8274..90f26198ff 100644--- a/apps/api/src/models/rules/fees/fee-ratio-initial-investment.ts+++ b/apps/api/src/models/rules/fees/fee-ratio-initial-investment.ts@@ -1,5 +1,5 @@import { RuleSettings } from '@ghostfolio/api/models/interfaces/rule-settings.interface';-import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data.service';+import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.service';import { UserSettings } from '@ghostfolio/common/interfaces';import { Rule } from '../../rule';diff --git a/apps/api/src/services/configuration.module.ts b/apps/api/src/services/configuration/configuration.module.tssimilarity index 85%rename from apps/api/src/services/configuration.module.tsrename to apps/api/src/services/configuration/configuration.module.tsindex b914759412..61b8bb4af1 100644--- a/apps/api/src/services/configuration.module.ts+++ b/apps/api/src/services/configuration/configuration.module.ts@@ -1,4 +1,4 @@-import { ConfigurationService } from '@ghostfolio/api/services/configuration.service';+import { ConfigurationService } from '@ghostfolio/api/services/configuration/configuration.service';import { Module } from '@nestjs/common';@Module({diff --git a/apps/api/src/services/configuration.service.ts b/apps/api/src/services/configuration/configuration.service.tssimilarity index 96%rename from apps/api/src/services/configuration.service.tsrename to apps/api/src/services/configuration/configuration.service.tsindex c4c3c48342..df9d6fa24f 100644--- a/apps/api/src/services/configuration.service.ts+++ b/apps/api/src/services/configuration/configuration.service.ts@@ -1,9 +1,8 @@+import { Environment } from '@ghostfolio/api/services/interfaces/environment.interface';import { Injectable } from '@nestjs/common';import { DataSource } from '@prisma/client';import { bool, cleanEnv, host, json, num, port, str } from 'envalid';-import { Environment } from './interfaces/environment.interface';-@Injectable()export class ConfigurationService {private readonly environmentConfiguration: Environment;diff --git a/apps/api/src/services/cron.service.ts b/apps/api/src/services/cron.service.tsindex c4515d477b..72043b36b3 100644--- a/apps/api/src/services/cron.service.ts+++ b/apps/api/src/services/cron.service.ts@@ -5,8 +5,8 @@ import {import { Injectable } from '@nestjs/common';import { Cron, CronExpression } from '@nestjs/schedule';-import { DataGatheringService } from './data-gathering.service';-import { ExchangeRateDataService } from './exchange-rate-data.service';+import { DataGatheringService } from './data-gathering/data-gathering.service';+import { ExchangeRateDataService } from './exchange-rate-data/exchange-rate-data.service';import { TwitterBotService } from './twitter-bot/twitter-bot.service';@Injectable()diff --git a/apps/api/src/services/data-gathering.module.ts b/apps/api/src/services/data-gathering/data-gathering.module.tssimilarity index 70%rename from apps/api/src/services/data-gathering.module.tsrename to apps/api/src/services/data-gathering/data-gathering.module.tsindex 0083a8d755..50131bbe8d 100644--- a/apps/api/src/services/data-gathering.module.ts+++ b/apps/api/src/services/data-gathering/data-gathering.module.ts@@ -1,17 +1,17 @@-import { ConfigurationModule } from '@ghostfolio/api/services/configuration.module';-import { DataGatheringService } from '@ghostfolio/api/services/data-gathering.service';+import { ConfigurationModule } from '@ghostfolio/api/services/configuration/configuration.module';+import { DataGatheringService } from '@ghostfolio/api/services/data-gathering/data-gathering.service';import { DataEnhancerModule } from '@ghostfolio/api/services/data-provider/data-enhancer/data-enhancer.module';import { DataProviderModule } from '@ghostfolio/api/services/data-provider/data-provider.module';-import { PrismaModule } from '@ghostfolio/api/services/prisma.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 { SymbolProfileModule } from '@ghostfolio/api/services/symbol-profile/symbol-profile.module';import { DATA_GATHERING_QUEUE } from '@ghostfolio/common/config';import { BullModule } from '@nestjs/bull';import { Module } from '@nestjs/common';import ms from 'ms';import { DataGatheringProcessor } from './data-gathering.processor';-import { ExchangeRateDataModule } from './exchange-rate-data.module';-import { MarketDataModule } from './market-data.module';-import { SymbolProfileModule } from './symbol-profile.module';@Module({imports: [diff --git a/apps/api/src/services/data-gathering.processor.ts b/apps/api/src/services/data-gathering/data-gathering.processor.tssimilarity index 92%rename from apps/api/src/services/data-gathering.processor.tsrename to apps/api/src/services/data-gathering/data-gathering.processor.tsindex 7e2a276420..b18bc3969a 100644--- a/apps/api/src/services/data-gathering.processor.ts+++ b/apps/api/src/services/data-gathering/data-gathering.processor.ts@@ -1,3 +1,6 @@+import { DataProviderService } from '@ghostfolio/api/services/data-provider/data-provider.service';+import { IDataGatheringItem } from '@ghostfolio/api/services/interfaces/interfaces';+import { PrismaService } from '@ghostfolio/api/services/prisma/prisma.service';import {DATA_GATHERING_QUEUE,GATHER_ASSET_PROFILE_PROCESS,@@ -18,9 +21,6 @@ import {} from 'date-fns';import { DataGatheringService } from './data-gathering.service';-import { DataProviderService } from './data-provider/data-provider.service';-import { IDataGatheringItem } from './interfaces/interfaces';-import { PrismaService } from './prisma.service';@Injectable()@Processor(DATA_GATHERING_QUEUE)diff --git a/apps/api/src/services/data-gathering.service.ts b/apps/api/src/services/data-gathering/data-gathering.service.tssimilarity index 94%rename from apps/api/src/services/data-gathering.service.tsrename to apps/api/src/services/data-gathering/data-gathering.service.tsindex e4f8c0b38c..8b1ea705db 100644--- a/apps/api/src/services/data-gathering.service.ts+++ b/apps/api/src/services/data-gathering/data-gathering.service.ts@@ -1,4 +1,10 @@-import { SymbolProfileService } from '@ghostfolio/api/services/symbol-profile.service';+import { DataProviderService } from '@ghostfolio/api/services/data-provider/data-provider.service';+import { DataEnhancerInterface } from '@ghostfolio/api/services/data-provider/interfaces/data-enhancer.interface';+import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.service';+import { IDataGatheringItem } from '@ghostfolio/api/services/interfaces/interfaces';+import { MarketDataService } from '@ghostfolio/api/services/market-data/market-data.service';+import { PrismaService } from '@ghostfolio/api/services/prisma/prisma.service';+import { SymbolProfileService } from '@ghostfolio/api/services/symbol-profile/symbol-profile.service';import {DATA_GATHERING_QUEUE,GATHER_HISTORICAL_MARKET_DATA_PROCESS,@@ -13,13 +19,6 @@ import { JobOptions, Queue } from 'bull';import { format, min, subDays, subYears } from 'date-fns';import { isEmpty } from 'lodash';-import { DataProviderService } from './data-provider/data-provider.service';-import { DataEnhancerInterface } from './data-provider/interfaces/data-enhancer.interface';-import { ExchangeRateDataService } from './exchange-rate-data.service';-import { IDataGatheringItem } from './interfaces/interfaces';-import { MarketDataService } from './market-data.service';-import { PrismaService } from './prisma.service';-@Injectable()export class DataGatheringService {public constructor(diff --git a/apps/api/src/services/data-provider/alpha-vantage/alpha-vantage.service.ts b/apps/api/src/services/data-provider/alpha-vantage/alpha-vantage.service.tsindex fed0a71ceb..2ac2390b3c 100644--- a/apps/api/src/services/data-provider/alpha-vantage/alpha-vantage.service.ts+++ b/apps/api/src/services/data-provider/alpha-vantage/alpha-vantage.service.ts@@ -1,5 +1,5 @@import { LookupItem } from '@ghostfolio/api/app/symbol/interfaces/lookup-item.interface';-import { ConfigurationService } from '@ghostfolio/api/services/configuration.service';+import { ConfigurationService } from '@ghostfolio/api/services/configuration/configuration.service';import { DataProviderInterface } from '@ghostfolio/api/services/data-provider/interfaces/data-provider.interface';import {IDataProviderHistoricalResponse,diff --git a/apps/api/src/services/data-provider/coingecko/coingecko.service.ts b/apps/api/src/services/data-provider/coingecko/coingecko.service.tsindex fd461a3d9d..94ec926a6b 100644--- a/apps/api/src/services/data-provider/coingecko/coingecko.service.ts+++ b/apps/api/src/services/data-provider/coingecko/coingecko.service.ts@@ -1,5 +1,5 @@import { LookupItem } from '@ghostfolio/api/app/symbol/interfaces/lookup-item.interface';-import { ConfigurationService } from '@ghostfolio/api/services/configuration.service';+import { ConfigurationService } from '@ghostfolio/api/services/configuration/configuration.service';import { DataProviderInterface } from '@ghostfolio/api/services/data-provider/interfaces/data-provider.interface';import {IDataProviderHistoricalResponse,diff --git a/apps/api/src/services/data-provider/data-enhancer/data-enhancer.module.ts b/apps/api/src/services/data-provider/data-enhancer/data-enhancer.module.tsindex d7b7d00a51..a658ef4484 100644--- a/apps/api/src/services/data-provider/data-enhancer/data-enhancer.module.ts+++ b/apps/api/src/services/data-provider/data-enhancer/data-enhancer.module.ts@@ -1,4 +1,4 @@-import { ConfigurationModule } from '@ghostfolio/api/services/configuration.module';+import { ConfigurationModule } from '@ghostfolio/api/services/configuration/configuration.module';import { CryptocurrencyModule } from '@ghostfolio/api/services/cryptocurrency/cryptocurrency.module';import { TrackinsightDataEnhancerService } from '@ghostfolio/api/services/data-provider/data-enhancer/trackinsight/trackinsight.service';import { YahooFinanceDataEnhancerService } from '@ghostfolio/api/services/data-provider/data-enhancer/yahoo-finance/yahoo-finance.service';diff --git a/apps/api/src/services/data-provider/data-enhancer/yahoo-finance/yahoo-finance.service.spec.ts b/apps/api/src/services/data-provider/data-enhancer/yahoo-finance/yahoo-finance.service.spec.tsindex 1dd7f0f0a7..951a623d0b 100644--- a/apps/api/src/services/data-provider/data-enhancer/yahoo-finance/yahoo-finance.service.spec.ts+++ b/apps/api/src/services/data-provider/data-enhancer/yahoo-finance/yahoo-finance.service.spec.ts@@ -1,4 +1,4 @@-import { ConfigurationService } from '@ghostfolio/api/services/configuration.service';+import { ConfigurationService } from '@ghostfolio/api/services/configuration/configuration.service';import { CryptocurrencyService } from '@ghostfolio/api/services/cryptocurrency/cryptocurrency.service';import { YahooFinanceDataEnhancerService } from './yahoo-finance.service';diff --git a/apps/api/src/services/data-provider/data-enhancer/yahoo-finance/yahoo-finance.service.ts b/apps/api/src/services/data-provider/data-enhancer/yahoo-finance/yahoo-finance.service.tsindex 32bcd42c36..1c8b96292b 100644--- a/apps/api/src/services/data-provider/data-enhancer/yahoo-finance/yahoo-finance.service.ts+++ b/apps/api/src/services/data-provider/data-enhancer/yahoo-finance/yahoo-finance.service.ts@@ -1,4 +1,4 @@-import { ConfigurationService } from '@ghostfolio/api/services/configuration.service';+import { ConfigurationService } from '@ghostfolio/api/services/configuration/configuration.service';import { CryptocurrencyService } from '@ghostfolio/api/services/cryptocurrency/cryptocurrency.service';import { DataEnhancerInterface } from '@ghostfolio/api/services/data-provider/interfaces/data-enhancer.interface';import { UNKNOWN_KEY } from '@ghostfolio/common/config';diff --git a/apps/api/src/services/data-provider/data-provider.module.ts b/apps/api/src/services/data-provider/data-provider.module.tsindex b27d5faed8..9164b0c0b9 100644--- a/apps/api/src/services/data-provider/data-provider.module.ts+++ b/apps/api/src/services/data-provider/data-provider.module.ts@@ -1,4 +1,4 @@-import { ConfigurationModule } from '@ghostfolio/api/services/configuration.module';+import { ConfigurationModule } from '@ghostfolio/api/services/configuration/configuration.module';import { CryptocurrencyModule } from '@ghostfolio/api/services/cryptocurrency/cryptocurrency.module';import { AlphaVantageService } from '@ghostfolio/api/services/data-provider/alpha-vantage/alpha-vantage.service';import { CoinGeckoService } from '@ghostfolio/api/services/data-provider/coingecko/coingecko.service';@@ -7,10 +7,10 @@ import { GoogleSheetsService } from '@ghostfolio/api/services/data-provider/googimport { ManualService } from '@ghostfolio/api/services/data-provider/manual/manual.service';import { RapidApiService } from '@ghostfolio/api/services/data-provider/rapid-api/rapid-api.service';import { YahooFinanceService } from '@ghostfolio/api/services/data-provider/yahoo-finance/yahoo-finance.service';-import { MarketDataModule } from '@ghostfolio/api/services/market-data.module';-import { PrismaModule } from '@ghostfolio/api/services/prisma.module';+import { MarketDataModule } from '@ghostfolio/api/services/market-data/market-data.module';+import { PrismaModule } from '@ghostfolio/api/services/prisma/prisma.module';import { PropertyModule } from '@ghostfolio/api/services/property/property.module';-import { SymbolProfileModule } from '@ghostfolio/api/services/symbol-profile.module';+import { SymbolProfileModule } from '@ghostfolio/api/services/symbol-profile/symbol-profile.module';import { Module } from '@nestjs/common';import { DataEnhancerModule } from './data-enhancer/data-enhancer.module';diff --git a/apps/api/src/services/data-provider/data-provider.service.ts b/apps/api/src/services/data-provider/data-provider.service.tsindex 0823af704b..6455252c30 100644--- a/apps/api/src/services/data-provider/data-provider.service.ts+++ b/apps/api/src/services/data-provider/data-provider.service.ts@@ -1,13 +1,15 @@import { LookupItem } from '@ghostfolio/api/app/symbol/interfaces/lookup-item.interface';-import { ConfigurationService } from '@ghostfolio/api/services/configuration.service';+import { ConfigurationService } from '@ghostfolio/api/services/configuration/configuration.service';import { DataProviderInterface } from '@ghostfolio/api/services/data-provider/interfaces/data-provider.interface';import {IDataGatheringItem,IDataProviderHistoricalResponse,IDataProviderResponse} from '@ghostfolio/api/services/interfaces/interfaces';-import { MarketDataService } from '@ghostfolio/api/services/market-data.service';-import { PrismaService } from '@ghostfolio/api/services/prisma.service';+import { MarketDataService } from '@ghostfolio/api/services/market-data/market-data.service';+import { PrismaService } from '@ghostfolio/api/services/prisma/prisma.service';+import { PropertyService } from '@ghostfolio/api/services/property/property.service';+import { PROPERTY_DATA_SOURCE_MAPPING } from '@ghostfolio/common/config';import { DATE_FORMAT, getStartOfUtcDate } from '@ghostfolio/common/helper';import { UserWithSettings } from '@ghostfolio/common/types';import { Granularity } from '@ghostfolio/common/types';@@ -15,8 +17,6 @@ import { Inject, Injectable, Logger } from '@nestjs/common';import { DataSource, MarketData, SymbolProfile } from '@prisma/client';import { format, isValid } from 'date-fns';import { groupBy, isEmpty, isNumber } from 'lodash';-import { PropertyService } from '@ghostfolio/api/services/property/property.service';-import { PROPERTY_DATA_SOURCE_MAPPING } from '@ghostfolio/common/config';@Injectable()export class DataProviderService {diff --git a/apps/api/src/services/data-provider/eod-historical-data/eod-historical-data.service.ts b/apps/api/src/services/data-provider/eod-historical-data/eod-historical-data.service.tsindex b9038a285a..614ec46a8d 100644--- a/apps/api/src/services/data-provider/eod-historical-data/eod-historical-data.service.ts+++ b/apps/api/src/services/data-provider/eod-historical-data/eod-historical-data.service.ts@@ -1,5 +1,5 @@import { LookupItem } from '@ghostfolio/api/app/symbol/interfaces/lookup-item.interface';-import { ConfigurationService } from '@ghostfolio/api/services/configuration.service';+import { ConfigurationService } from '@ghostfolio/api/services/configuration/configuration.service';import { DataProviderInterface } from '@ghostfolio/api/services/data-provider/interfaces/data-provider.interface';import {IDataProviderHistoricalResponse,diff --git a/apps/api/src/services/data-provider/google-sheets/google-sheets.service.ts b/apps/api/src/services/data-provider/google-sheets/google-sheets.service.tsindex cc4c6af2bf..1c24f26386 100644--- a/apps/api/src/services/data-provider/google-sheets/google-sheets.service.ts+++ b/apps/api/src/services/data-provider/google-sheets/google-sheets.service.ts@@ -1,12 +1,12 @@import { LookupItem } from '@ghostfolio/api/app/symbol/interfaces/lookup-item.interface';-import { ConfigurationService } from '@ghostfolio/api/services/configuration.service';+import { ConfigurationService } from '@ghostfolio/api/services/configuration/configuration.service';import { DataProviderInterface } from '@ghostfolio/api/services/data-provider/interfaces/data-provider.interface';import {IDataProviderHistoricalResponse,IDataProviderResponse} from '@ghostfolio/api/services/interfaces/interfaces';-import { PrismaService } from '@ghostfolio/api/services/prisma.service';-import { SymbolProfileService } from '@ghostfolio/api/services/symbol-profile.service';+import { PrismaService } from '@ghostfolio/api/services/prisma/prisma.service';+import { SymbolProfileService } from '@ghostfolio/api/services/symbol-profile/symbol-profile.service';import { DATE_FORMAT, parseDate } from '@ghostfolio/common/helper';import { Granularity } from '@ghostfolio/common/types';import { Injectable, Logger } from '@nestjs/common';diff --git a/apps/api/src/services/data-provider/manual/manual.service.ts b/apps/api/src/services/data-provider/manual/manual.service.tsindex 9d92628e9e..ccc737695b 100644--- a/apps/api/src/services/data-provider/manual/manual.service.ts+++ b/apps/api/src/services/data-provider/manual/manual.service.ts@@ -4,8 +4,8 @@ import {IDataProviderHistoricalResponse,IDataProviderResponse} from '@ghostfolio/api/services/interfaces/interfaces';-import { PrismaService } from '@ghostfolio/api/services/prisma.service';-import { SymbolProfileService } from '@ghostfolio/api/services/symbol-profile.service';+import { PrismaService } from '@ghostfolio/api/services/prisma/prisma.service';+import { SymbolProfileService } from '@ghostfolio/api/services/symbol-profile/symbol-profile.service';import {DATE_FORMAT,extractNumberFromString,diff --git a/apps/api/src/services/data-provider/rapid-api/rapid-api.service.ts b/apps/api/src/services/data-provider/rapid-api/rapid-api.service.tsindex f8ad2d8a18..82b9cbae9d 100644--- a/apps/api/src/services/data-provider/rapid-api/rapid-api.service.ts+++ b/apps/api/src/services/data-provider/rapid-api/rapid-api.service.ts@@ -1,5 +1,5 @@import { LookupItem } from '@ghostfolio/api/app/symbol/interfaces/lookup-item.interface';-import { ConfigurationService } from '@ghostfolio/api/services/configuration.service';+import { ConfigurationService } from '@ghostfolio/api/services/configuration/configuration.service';import { DataProviderInterface } from '@ghostfolio/api/services/data-provider/interfaces/data-provider.interface';import {IDataProviderHistoricalResponse,diff --git a/apps/api/src/services/data-provider/yahoo-finance/yahoo-finance.service.ts b/apps/api/src/services/data-provider/yahoo-finance/yahoo-finance.service.tsindex 680687b3bd..9d20d94936 100644--- a/apps/api/src/services/data-provider/yahoo-finance/yahoo-finance.service.ts+++ b/apps/api/src/services/data-provider/yahoo-finance/yahoo-finance.service.ts@@ -1,5 +1,5 @@import { LookupItem } from '@ghostfolio/api/app/symbol/interfaces/lookup-item.interface';-import { ConfigurationService } from '@ghostfolio/api/services/configuration.service';+import { ConfigurationService } from '@ghostfolio/api/services/configuration/configuration.service';import { CryptocurrencyService } from '@ghostfolio/api/services/cryptocurrency/cryptocurrency.service';import { YahooFinanceDataEnhancerService } from '@ghostfolio/api/services/data-provider/data-enhancer/yahoo-finance/yahoo-finance.service';import { DataProviderInterface } from '@ghostfolio/api/services/data-provider/interfaces/data-provider.interface';diff --git a/apps/api/src/services/exchange-rate-data.module.ts b/apps/api/src/services/exchange-rate-data/exchange-rate-data.module.tssimilarity index 70%rename from apps/api/src/services/exchange-rate-data.module.tsrename to apps/api/src/services/exchange-rate-data/exchange-rate-data.module.tsindex fbbaa98a63..89b0158db5 100644--- a/apps/api/src/services/exchange-rate-data.module.ts+++ b/apps/api/src/services/exchange-rate-data/exchange-rate-data.module.ts@@ -1,12 +1,11 @@-import { ConfigurationModule } from '@ghostfolio/api/services/configuration.module';+import { ConfigurationModule } from '@ghostfolio/api/services/configuration/configuration.module';import { DataProviderModule } from '@ghostfolio/api/services/data-provider/data-provider.module';-import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data.service';+import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.service';+import { MarketDataModule } from '@ghostfolio/api/services/market-data/market-data.module';+import { PrismaModule } from '@ghostfolio/api/services/prisma/prisma.module';import { PropertyModule } from '@ghostfolio/api/services/property/property.module';import { Module } from '@nestjs/common';-import { MarketDataModule } from './market-data.module';-import { PrismaModule } from './prisma.module';-@Module({exports: [ExchangeRateDataService],imports: [diff --git a/apps/api/src/services/exchange-rate-data.service.ts b/apps/api/src/services/exchange-rate-data/exchange-rate-data.service.tssimilarity index 93%rename from apps/api/src/services/exchange-rate-data.service.tsrename to apps/api/src/services/exchange-rate-data/exchange-rate-data.service.tsindex 1523c9024e..10aef9411e 100644--- a/apps/api/src/services/exchange-rate-data.service.ts+++ b/apps/api/src/services/exchange-rate-data/exchange-rate-data.service.ts@@ -1,16 +1,15 @@+import { ConfigurationService } from '@ghostfolio/api/services/configuration/configuration.service';+import { DataProviderService } from '@ghostfolio/api/services/data-provider/data-provider.service';+import { IDataGatheringItem } from '@ghostfolio/api/services/interfaces/interfaces';+import { MarketDataService } from '@ghostfolio/api/services/market-data/market-data.service';+import { PrismaService } from '@ghostfolio/api/services/prisma/prisma.service';+import { PropertyService } from '@ghostfolio/api/services/property/property.service';import { PROPERTY_CURRENCIES } from '@ghostfolio/common/config';import { DATE_FORMAT, getYesterday } from '@ghostfolio/common/helper';import { Injectable, Logger } from '@nestjs/common';import { format, isToday } from 'date-fns';import { isNumber, uniq } from 'lodash';-import { ConfigurationService } from './configuration.service';-import { DataProviderService } from './data-provider/data-provider.service';-import { IDataGatheringItem } from './interfaces/interfaces';-import { MarketDataService } from './market-data.service';-import { PrismaService } from './prisma.service';-import { PropertyService } from './property/property.service';-@Injectable()export class ExchangeRateDataService {private baseCurrency: string;diff --git a/apps/api/src/services/impersonation.module.ts b/apps/api/src/services/impersonation/impersonation.module.tssimilarity index 68%rename from apps/api/src/services/impersonation.module.tsrename to apps/api/src/services/impersonation/impersonation.module.tsindex 00be6e68fb..506fb7f914 100644--- a/apps/api/src/services/impersonation.module.ts+++ b/apps/api/src/services/impersonation/impersonation.module.ts@@ -1,5 +1,5 @@-import { ImpersonationService } from '@ghostfolio/api/services/impersonation.service';-import { PrismaModule } from '@ghostfolio/api/services/prisma.module';+import { ImpersonationService } from '@ghostfolio/api/services/impersonation/impersonation.service';+import { PrismaModule } from '@ghostfolio/api/services/prisma/prisma.module';import { Module } from '@nestjs/common';@Module({diff --git a/apps/api/src/services/impersonation.service.ts b/apps/api/src/services/impersonation/impersonation.service.tssimilarity index 83%rename from apps/api/src/services/impersonation.service.tsrename to apps/api/src/services/impersonation/impersonation.service.tsindex 8082a81985..fe17127c8c 100644--- a/apps/api/src/services/impersonation.service.ts+++ b/apps/api/src/services/impersonation/impersonation.service.ts@@ -1,7 +1,6 @@+import { PrismaService } from '@ghostfolio/api/services/prisma/prisma.service';import { Injectable } from '@nestjs/common';-import { PrismaService } from './prisma.service';-@Injectable()export class ImpersonationService {public constructor(private readonly prismaService: PrismaService) {}diff --git a/apps/api/src/services/market-data.module.ts b/apps/api/src/services/market-data/market-data.module.tssimilarity index 75%rename from apps/api/src/services/market-data.module.tsrename to apps/api/src/services/market-data/market-data.module.tsindex b1a09fa919..32367d5c0d 100644--- a/apps/api/src/services/market-data.module.ts+++ b/apps/api/src/services/market-data/market-data.module.ts@@ -1,4 +1,4 @@-import { PrismaModule } from '@ghostfolio/api/services/prisma.module';+import { PrismaModule } from '@ghostfolio/api/services/prisma/prisma.module';import { Module } from '@nestjs/common';import { MarketDataService } from './market-data.service';diff --git a/apps/api/src/services/market-data.service.ts b/apps/api/src/services/market-data/market-data.service.tssimilarity index 95%rename from apps/api/src/services/market-data.service.tsrename to apps/api/src/services/market-data/market-data.service.tsindex ced802a3f7..f7bffe4316 100644--- a/apps/api/src/services/market-data.service.ts+++ b/apps/api/src/services/market-data/market-data.service.ts@@ -1,13 +1,12 @@import { UpdateMarketDataDto } from '@ghostfolio/api/app/admin/update-market-data.dto';import { DateQuery } from '@ghostfolio/api/app/portfolio/interfaces/date-query.interface';-import { PrismaService } from '@ghostfolio/api/services/prisma.service';+import { IDataGatheringItem } from '@ghostfolio/api/services/interfaces/interfaces';+import { PrismaService } from '@ghostfolio/api/services/prisma/prisma.service';import { resetHours } from '@ghostfolio/common/helper';import { UniqueAsset } from '@ghostfolio/common/interfaces';import { Injectable } from '@nestjs/common';import { DataSource, MarketData, Prisma } from '@prisma/client';-import { IDataGatheringItem } from './interfaces/interfaces';-@Injectable()export class MarketDataService {public constructor(private readonly prismaService: PrismaService) {}diff --git a/apps/api/src/services/platform/platform.module.ts b/apps/api/src/services/platform/platform.module.tsindex d6befa986f..8167a37e0b 100644--- a/apps/api/src/services/platform/platform.module.ts+++ b/apps/api/src/services/platform/platform.module.ts@@ -1,4 +1,4 @@-import { PrismaModule } from '@ghostfolio/api/services/prisma.module';+import { PrismaModule } from '@ghostfolio/api/services/prisma/prisma.module';import { Module } from '@nestjs/common';import { PlatformService } from './platform.service';diff --git a/apps/api/src/services/platform/platform.service.ts b/apps/api/src/services/platform/platform.service.tsindex 32d3370fcd..51bd4d73d6 100644--- a/apps/api/src/services/platform/platform.service.ts+++ b/apps/api/src/services/platform/platform.service.ts@@ -1,4 +1,4 @@-import { PrismaService } from '@ghostfolio/api/services/prisma.service';+import { PrismaService } from '@ghostfolio/api/services/prisma/prisma.service';import { Injectable } from '@nestjs/common';@Injectable()diff --git a/apps/api/src/services/prisma.module.ts b/apps/api/src/services/prisma/prisma.module.tssimilarity index 63%rename from apps/api/src/services/prisma.module.tsrename to apps/api/src/services/prisma/prisma.module.tsindex ee8c8b8c57..7cd76d3146 100644--- a/apps/api/src/services/prisma.module.ts+++ b/apps/api/src/services/prisma/prisma.module.ts@@ -1,4 +1,4 @@-import { PrismaService } from '@ghostfolio/api/services/prisma.service';+import { PrismaService } from '@ghostfolio/api/services/prisma/prisma.service';import { Module } from '@nestjs/common';@Module({diff --git a/apps/api/src/services/prisma.service.ts b/apps/api/src/services/prisma/prisma.service.tssimilarity index 100%rename from apps/api/src/services/prisma.service.tsrename to apps/api/src/services/prisma/prisma.service.tsdiff --git a/apps/api/src/services/property/property.module.ts b/apps/api/src/services/property/property.module.tsindex fcd89de408..50fba955d9 100644--- a/apps/api/src/services/property/property.module.ts+++ b/apps/api/src/services/property/property.module.ts@@ -1,4 +1,4 @@-import { PrismaModule } from '@ghostfolio/api/services/prisma.module';+import { PrismaModule } from '@ghostfolio/api/services/prisma/prisma.module';import { Module } from '@nestjs/common';import { PropertyService } from './property.service';diff --git a/apps/api/src/services/property/property.service.ts b/apps/api/src/services/property/property.service.tsindex 69e7ff46bb..cb5902cd5c 100644--- a/apps/api/src/services/property/property.service.ts+++ b/apps/api/src/services/property/property.service.ts@@ -1,4 +1,4 @@-import { PrismaService } from '@ghostfolio/api/services/prisma.service';+import { PrismaService } from '@ghostfolio/api/services/prisma/prisma.service';import {PROPERTY_CURRENCIES,PROPERTY_IS_USER_SIGNUP_ENABLEDdiff --git a/apps/api/src/services/symbol-profile.module.ts b/apps/api/src/services/symbol-profile/symbol-profile.module.tssimilarity index 76%rename from apps/api/src/services/symbol-profile.module.tsrename to apps/api/src/services/symbol-profile/symbol-profile.module.tsindex ac1337e87c..fb3fc4d627 100644--- a/apps/api/src/services/symbol-profile.module.ts+++ b/apps/api/src/services/symbol-profile/symbol-profile.module.ts@@ -1,4 +1,4 @@-import { PrismaModule } from '@ghostfolio/api/services/prisma.module';+import { PrismaModule } from '@ghostfolio/api/services/prisma/prisma.module';import { Module } from '@nestjs/common';import { SymbolProfileService } from './symbol-profile.service';diff --git a/apps/api/src/services/symbol-profile.service.ts b/apps/api/src/services/symbol-profile/symbol-profile.service.tssimilarity index 98%rename from apps/api/src/services/symbol-profile.service.tsrename to apps/api/src/services/symbol-profile/symbol-profile.service.tsindex 75c386bd09..d78270cac0 100644--- a/apps/api/src/services/symbol-profile.service.ts+++ b/apps/api/src/services/symbol-profile/symbol-profile.service.ts@@ -1,4 +1,4 @@-import { PrismaService } from '@ghostfolio/api/services/prisma.service';+import { PrismaService } from '@ghostfolio/api/services/prisma/prisma.service';import { UNKNOWN_KEY } from '@ghostfolio/common/config';import {EnhancedSymbolProfile,diff --git a/apps/api/src/services/tag/tag.module.ts b/apps/api/src/services/tag/tag.module.tsindex 32d9058844..76ed9fcd64 100644--- a/apps/api/src/services/tag/tag.module.ts+++ b/apps/api/src/services/tag/tag.module.ts@@ -1,4 +1,4 @@-import { PrismaModule } from '@ghostfolio/api/services/prisma.module';+import { PrismaModule } from '@ghostfolio/api/services/prisma/prisma.module';import { Module } from '@nestjs/common';import { TagService } from './tag.service';diff --git a/apps/api/src/services/tag/tag.service.ts b/apps/api/src/services/tag/tag.service.tsindex 534a6e73dd..c02345784f 100644--- a/apps/api/src/services/tag/tag.service.ts+++ b/apps/api/src/services/tag/tag.service.ts@@ -1,4 +1,4 @@-import { PrismaService } from '@ghostfolio/api/services/prisma.service';+import { PrismaService } from '@ghostfolio/api/services/prisma/prisma.service';import { Injectable } from '@nestjs/common';@Injectable()diff --git a/apps/api/src/services/twitter-bot/twitter-bot.module.ts b/apps/api/src/services/twitter-bot/twitter-bot.module.tsindex c810dad4ae..d4d565cb12 100644--- a/apps/api/src/services/twitter-bot/twitter-bot.module.ts+++ b/apps/api/src/services/twitter-bot/twitter-bot.module.ts@@ -1,6 +1,6 @@import { BenchmarkModule } from '@ghostfolio/api/app/benchmark/benchmark.module';import { SymbolModule } from '@ghostfolio/api/app/symbol/symbol.module';-import { ConfigurationModule } from '@ghostfolio/api/services/configuration.module';+import { ConfigurationModule } from '@ghostfolio/api/services/configuration/configuration.module';import { TwitterBotService } from '@ghostfolio/api/services/twitter-bot/twitter-bot.service';import { Module } from '@nestjs/common';diff --git a/apps/api/src/services/twitter-bot/twitter-bot.service.ts b/apps/api/src/services/twitter-bot/twitter-bot.service.tsindex 40e9c9cf2c..218dd291f8 100644--- a/apps/api/src/services/twitter-bot/twitter-bot.service.ts+++ b/apps/api/src/services/twitter-bot/twitter-bot.service.ts@@ -1,6 +1,6 @@import { BenchmarkService } from '@ghostfolio/api/app/benchmark/benchmark.service';import { SymbolService } from '@ghostfolio/api/app/symbol/symbol.service';-import { ConfigurationService } from '@ghostfolio/api/services/configuration.service';+import { ConfigurationService } from '@ghostfolio/api/services/configuration/configuration.service';import {ghostfolioFearAndGreedIndexDataSource,ghostfolioFearAndGreedIndexSymboldiff --git a/apps/client/src/app/app.module.ts b/apps/client/src/app/app.module.tsindex da478ce230..7b26139c35 100644--- a/apps/client/src/app/app.module.ts+++ b/apps/client/src/app/app.module.ts@@ -1,14 +1,14 @@import { Platform } from '@angular/cdk/platform';import { HttpClientModule } from '@angular/common/http';import { NgModule } from '@angular/core';+import { MatAutocompleteModule } from '@angular/material/autocomplete';+import { MatChipsModule } from '@angular/material/chips';import {DateAdapter,MAT_DATE_FORMATS,MAT_DATE_LOCALE,MatNativeDateModule} from '@angular/material/core';-import { MatAutocompleteModule } from '@angular/material/autocomplete';-import { MatChipsModule } from '@angular/material/chips';import { MatSnackBarModule } from '@angular/material/snack-bar';import { MatTooltipModule } from '@angular/material/tooltip';import { BrowserModule } from '@angular/platform-browser';diff --git a/apps/client/src/app/components/accounts-table/accounts-table.component.ts b/apps/client/src/app/components/accounts-table/accounts-table.component.tsindex 03b52a6d0e..8ec0f86fb4 100644--- a/apps/client/src/app/components/accounts-table/accounts-table.component.ts+++ b/apps/client/src/app/components/accounts-table/accounts-table.component.ts@@ -9,8 +9,8 @@ import {Output,ViewChild} from '@angular/core';-import { MatTableDataSource } from '@angular/material/table';import { MatSort } from '@angular/material/sort';+import { MatTableDataSource } from '@angular/material/table';import { Router } from '@angular/router';import { Account as AccountModel } from '@prisma/client';import { get } from 'lodash';diff --git a/apps/client/src/app/components/accounts-table/accounts-table.module.ts b/apps/client/src/app/components/accounts-table/accounts-table.module.tsindex b8e38b30e0..7dad41dbfb 100644--- a/apps/client/src/app/components/accounts-table/accounts-table.module.ts+++ b/apps/client/src/app/components/accounts-table/accounts-table.module.ts@@ -2,8 +2,8 @@ import { CommonModule } from '@angular/common';import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core';import { MatButtonModule } from '@angular/material/button';import { MatMenuModule } from '@angular/material/menu';-import { MatTableModule } from '@angular/material/table';import { MatSortModule } from '@angular/material/sort';+import { MatTableModule } from '@angular/material/table';import { RouterModule } from '@angular/router';import { GfSymbolIconModule } from '@ghostfolio/client/components/symbol-icon/symbol-icon.module';import { GfValueModule } from '@ghostfolio/ui/value';diff --git a/apps/client/src/app/components/admin-market-data-detail/market-data-detail-dialog/market-data-detail-dialog.module.ts b/apps/client/src/app/components/admin-market-data-detail/market-data-detail-dialog/market-data-detail-dialog.module.tsindex 452a68d07c..f3b55d71d2 100644--- a/apps/client/src/app/components/admin-market-data-detail/market-data-detail-dialog/market-data-detail-dialog.module.ts+++ b/apps/client/src/app/components/admin-market-data-detail/market-data-detail-dialog/market-data-detail-dialog.module.ts@@ -3,9 +3,9 @@ import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core';import { FormsModule, ReactiveFormsModule } from '@angular/forms';import { MatButtonModule } from '@angular/material/button';import { MatDatepickerModule } from '@angular/material/datepicker';+import { MatDialogModule } from '@angular/material/dialog';import { MatFormFieldModule } from '@angular/material/form-field';import { MatInputModule } from '@angular/material/input';-import { MatDialogModule } from '@angular/material/dialog';import { MarketDataDetailDialog } from './market-data-detail-dialog.component';diff --git a/apps/client/src/app/components/admin-market-data/admin-market-data.component.ts b/apps/client/src/app/components/admin-market-data/admin-market-data.component.tsindex 556fdf761e..a457035626 100644--- a/apps/client/src/app/components/admin-market-data/admin-market-data.component.ts+++ b/apps/client/src/app/components/admin-market-data/admin-market-data.component.ts@@ -7,8 +7,8 @@ import {ViewChild} from '@angular/core';import { MatDialog } from '@angular/material/dialog';-import { MatTableDataSource } from '@angular/material/table';import { MatSort } from '@angular/material/sort';+import { MatTableDataSource } from '@angular/material/table';import { ActivatedRoute, Router } from '@angular/router';import { AdminService } from '@ghostfolio/client/services/admin.service';import { DataService } from '@ghostfolio/client/services/data.service';diff --git a/apps/client/src/app/components/admin-market-data/admin-market-data.module.ts b/apps/client/src/app/components/admin-market-data/admin-market-data.module.tsindex 6db2de9109..6991a24552 100644--- a/apps/client/src/app/components/admin-market-data/admin-market-data.module.ts+++ b/apps/client/src/app/components/admin-market-data/admin-market-data.module.ts@@ -2,8 +2,8 @@ import { CommonModule } from '@angular/common';import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core';import { MatButtonModule } from '@angular/material/button';import { MatMenuModule } from '@angular/material/menu';-import { MatTableModule } from '@angular/material/table';import { MatSortModule } from '@angular/material/sort';+import { MatTableModule } from '@angular/material/table';import { GfActivitiesFilterModule } from '@ghostfolio/ui/activities-filter/activities-filter.module';import { AdminMarketDataComponent } from './admin-market-data.component';diff --git a/apps/client/src/app/core/auth.interceptor.ts b/apps/client/src/app/core/auth.interceptor.tsindex 5cbbbf8687..22e2cce763 100644--- a/apps/client/src/app/core/auth.interceptor.ts+++ b/apps/client/src/app/core/auth.interceptor.ts@@ -5,6 +5,8 @@ import {HttpRequest} from '@angular/common/http';import { Injectable } from '@angular/core';+import { ImpersonationStorageService } from '@ghostfolio/client/services/impersonation-storage.service';+import { TokenStorageService } from '@ghostfolio/client/services/token-storage.service';import {HEADER_KEY_IMPERSONATION,HEADER_KEY_TIMEZONE,@@ -12,9 +14,6 @@ import {} from '@ghostfolio/common/config';import { Observable } from 'rxjs';-import { ImpersonationStorageService } from '../services/impersonation-storage.service';-import { TokenStorageService } from '../services/token-storage.service';-@Injectable()export class AuthInterceptor implements HttpInterceptor {public constructor(diff --git a/apps/client/src/app/pages/accounts/create-or-update-account-dialog/create-or-update-account-dialog.component.ts b/apps/client/src/app/pages/accounts/create-or-update-account-dialog/create-or-update-account-dialog.component.tsindex 63641644aa..f0178f2f59 100644--- a/apps/client/src/app/pages/accounts/create-or-update-account-dialog/create-or-update-account-dialog.component.ts+++ b/apps/client/src/app/pages/accounts/create-or-update-account-dialog/create-or-update-account-dialog.component.ts@@ -5,9 +5,9 @@ import {OnDestroy} from '@angular/core';import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';+import { DataService } from '@ghostfolio/client/services/data.service';import { Subject } from 'rxjs';-import { DataService } from '../../../services/data.service';import { CreateOrUpdateAccountDialogParams } from './interfaces/interfaces';@Component({diff --git a/apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.module.ts b/apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.module.tsindex 375d4582a7..b83f72518a 100644--- a/apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.module.ts+++ b/apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.module.ts@@ -5,9 +5,9 @@ import { MatAutocompleteModule } from '@angular/material/autocomplete';import { MatButtonModule } from '@angular/material/button';import { MatChipsModule } from '@angular/material/chips';import { MatDatepickerModule } from '@angular/material/datepicker';+import { MatDialogModule } from '@angular/material/dialog';import { MatFormFieldModule } from '@angular/material/form-field';import { MatInputModule } from '@angular/material/input';-import { MatDialogModule } from '@angular/material/dialog';import { MatProgressSpinnerModule } from '@angular/material/progress-spinner';import { MatSelectModule } from '@angular/material/select';import { GfSymbolModule } from '@ghostfolio/client/pipes/symbol/symbol.module';diff --git a/apps/client/src/app/pages/portfolio/activities/import-activities-dialog/import-activities-dialog.module.ts b/apps/client/src/app/pages/portfolio/activities/import-activities-dialog/import-activities-dialog.module.tsindex 16e89e69dd..fdae625f93 100644--- a/apps/client/src/app/pages/portfolio/activities/import-activities-dialog/import-activities-dialog.module.ts+++ b/apps/client/src/app/pages/portfolio/activities/import-activities-dialog/import-activities-dialog.module.ts@@ -1,9 +1,9 @@import { CommonModule } from '@angular/common';import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core';import { FormsModule, ReactiveFormsModule } from '@angular/forms';-import { MatExpansionModule } from '@angular/material/expansion';import { MatButtonModule } from '@angular/material/button';import { MatDialogModule } from '@angular/material/dialog';+import { MatExpansionModule } from '@angular/material/expansion';import { MatFormFieldModule } from '@angular/material/form-field';import { MatSelectModule } from '@angular/material/select';import { GfDialogFooterModule } from '@ghostfolio/client/components/dialog-footer/dialog-footer.module';