Open Source Wealth Management Software. Angular + NestJS + Prisma + Nx + TypeScript 🤍
TypeScript angularetffinancefintechghostfoliohacktoberfestinvestingnestjsosspersonal-financeportfolioprismasoftwarestocktrackertradingtypescriptwealth-managementweb
Task/move redis cache module to services (#8226)
Thomas Kaula03c4c9b2627
diff --git a/apps/api/src/app/activities/activities.module.ts b/apps/api/src/app/activities/activities.module.tsindex 1508917f04..869a4d3650 100644--- a/apps/api/src/app/activities/activities.module.ts+++ b/apps/api/src/app/activities/activities.module.ts@@ -1,7 +1,6 @@import { AccountBalanceService } from '@ghostfolio/api/app/account-balance/account-balance.service';import { AccountService } from '@ghostfolio/api/app/account/account.service';import { CacheModule } from '@ghostfolio/api/app/cache/cache.module';-import { RedisCacheModule } from '@ghostfolio/api/app/redis-cache/redis-cache.module';import { RedactValuesInResponseModule } from '@ghostfolio/api/interceptors/redact-values-in-response/redact-values-in-response.module';import { TransformDataSourceInRequestModule } from '@ghostfolio/api/interceptors/transform-data-source-in-request/transform-data-source-in-request.module';import { TransformDataSourceInResponseModule } from '@ghostfolio/api/interceptors/transform-data-source-in-response/transform-data-source-in-response.module';@@ -14,6 +13,7 @@ import { ImpersonationModule } from '@ghostfolio/api/services/impersonation/impeimport { MarketDataModule } from '@ghostfolio/api/services/market-data/market-data.module';import { PrismaModule } from '@ghostfolio/api/services/prisma/prisma.module';import { DataGatheringQueueModule } from '@ghostfolio/api/services/queues/data-gathering/data-gathering.module';+import { RedisCacheModule } from '@ghostfolio/api/services/redis-cache/redis-cache.module';import { SymbolProfileModule } from '@ghostfolio/api/services/symbol-profile/symbol-profile.module';import { TagModule } from '@ghostfolio/api/services/tag/tag.module';diff --git a/apps/api/src/app/app.module.ts b/apps/api/src/app/app.module.tsindex 33617602d6..27fdff6b64 100644--- a/apps/api/src/app/app.module.ts+++ b/apps/api/src/app/app.module.ts@@ -14,6 +14,7 @@ import { PrismaModule } from '@ghostfolio/api/services/prisma/prisma.module';import { PropertyModule } from '@ghostfolio/api/services/property/property.module';import { DataGatheringQueueModule } from '@ghostfolio/api/services/queues/data-gathering/data-gathering.module';import { PortfolioSnapshotQueueModule } from '@ghostfolio/api/services/queues/portfolio-snapshot/portfolio-snapshot.module';+import { RedisCacheModule } from '@ghostfolio/api/services/redis-cache/redis-cache.module';import {BULL_BOARD_ROUTE,THROTTLE_DEFAULT_LIMIT,@@ -64,7 +65,6 @@ import { InfoModule } from './info/info.module';import { LogoModule } from './logo/logo.module';import { PlatformModule } from './platform/platform.module';import { PortfolioModule } from './portfolio/portfolio.module';-import { RedisCacheModule } from './redis-cache/redis-cache.module';import { SubscriptionModule } from './subscription/subscription.module';import { SymbolModule } from './symbol/symbol.module';import { UserModule } from './user/user.module';diff --git a/apps/api/src/app/auth/auth.module.ts b/apps/api/src/app/auth/auth.module.tsindex 879463cc13..1eafdb6091 100644--- a/apps/api/src/app/auth/auth.module.ts+++ b/apps/api/src/app/auth/auth.module.ts@@ -1,6 +1,5 @@import { AuthDeviceService } from '@ghostfolio/api/app/auth-device/auth-device.service';import { WebAuthService } from '@ghostfolio/api/app/auth/web-auth.service';-import { RedisCacheModule } from '@ghostfolio/api/app/redis-cache/redis-cache.module';import { SubscriptionModule } from '@ghostfolio/api/app/subscription/subscription.module';import { UserModule } from '@ghostfolio/api/app/user/user.module';import { ApiKeyService } from '@ghostfolio/api/services/api-key/api-key.service';@@ -12,6 +11,7 @@ import { FetchService } from '@ghostfolio/api/services/fetch/fetch.service';import { PrismaModule } from '@ghostfolio/api/services/prisma/prisma.module';import { PropertyModule } from '@ghostfolio/api/services/property/property.module';import { PortfolioSnapshotQueueModule } from '@ghostfolio/api/services/queues/portfolio-snapshot/portfolio-snapshot.module';+import { RedisCacheModule } from '@ghostfolio/api/services/redis-cache/redis-cache.module';import { Logger, Module } from '@nestjs/common';import { JwtModule } from '@nestjs/jwt';diff --git a/apps/api/src/app/auth/web-auth.service.ts b/apps/api/src/app/auth/web-auth.service.tsindex 40a86398a6..fe9a9467b2 100644--- a/apps/api/src/app/auth/web-auth.service.ts+++ b/apps/api/src/app/auth/web-auth.service.ts@@ -1,10 +1,10 @@import { AuthDeviceService } from '@ghostfolio/api/app/auth-device/auth-device.service';import { PortfolioSnapshotValue } from '@ghostfolio/api/app/portfolio/interfaces/snapshot-value.interface';-import { RedisCacheService } from '@ghostfolio/api/app/redis-cache/redis-cache.service';import { UserService } from '@ghostfolio/api/app/user/user.service';import { ApiService } from '@ghostfolio/api/services/api/api.service';import { ConfigurationService } from '@ghostfolio/api/services/configuration/configuration.service';import { PortfolioSnapshotService } from '@ghostfolio/api/services/queues/portfolio-snapshot/portfolio-snapshot.service';+import { RedisCacheService } from '@ghostfolio/api/services/redis-cache/redis-cache.service';import {PORTFOLIO_SNAPSHOT_COMPUTATION_QUEUE_PRIORITY_LOW,PORTFOLIO_SNAPSHOT_PROCESS_JOB_NAME,diff --git a/apps/api/src/app/cache/cache.controller.ts b/apps/api/src/app/cache/cache.controller.tsindex 680e7e6825..1072550d64 100644--- a/apps/api/src/app/cache/cache.controller.ts+++ b/apps/api/src/app/cache/cache.controller.ts@@ -1,7 +1,7 @@-import { RedisCacheService } from '@ghostfolio/api/app/redis-cache/redis-cache.service';import { AllowDuringImpersonation } from '@ghostfolio/api/decorators/allow-during-impersonation.decorator';import { HasPermission } from '@ghostfolio/api/decorators/has-permission.decorator';import { HasPermissionGuard } from '@ghostfolio/api/guards/has-permission.guard';+import { RedisCacheService } from '@ghostfolio/api/services/redis-cache/redis-cache.service';import { permissions } from '@ghostfolio/common/permissions';import { Controller, Post, UseGuards } from '@nestjs/common';diff --git a/apps/api/src/app/cache/cache.module.ts b/apps/api/src/app/cache/cache.module.tsindex d435c72a64..6bc9fb16c3 100644--- a/apps/api/src/app/cache/cache.module.ts+++ b/apps/api/src/app/cache/cache.module.ts@@ -1,4 +1,4 @@-import { RedisCacheModule } from '@ghostfolio/api/app/redis-cache/redis-cache.module';+import { RedisCacheModule } from '@ghostfolio/api/services/redis-cache/redis-cache.module';import { Module } from '@nestjs/common';diff --git a/apps/api/src/app/endpoints/benchmarks/benchmarks.module.ts b/apps/api/src/app/endpoints/benchmarks/benchmarks.module.tsindex 3c540c3370..29dc7190d0 100644--- a/apps/api/src/app/endpoints/benchmarks/benchmarks.module.ts+++ b/apps/api/src/app/endpoints/benchmarks/benchmarks.module.ts@@ -5,7 +5,6 @@ import { PortfolioCalculatorFactory } from '@ghostfolio/api/app/portfolio/calculimport { CurrentRateService } from '@ghostfolio/api/app/portfolio/current-rate.service';import { PortfolioService } from '@ghostfolio/api/app/portfolio/portfolio.service';import { RulesService } from '@ghostfolio/api/app/portfolio/rules.service';-import { RedisCacheModule } from '@ghostfolio/api/app/redis-cache/redis-cache.module';import { SymbolModule } from '@ghostfolio/api/app/symbol/symbol.module';import { UserModule } from '@ghostfolio/api/app/user/user.module';import { TransformDataSourceInRequestModule } from '@ghostfolio/api/interceptors/transform-data-source-in-request/transform-data-source-in-request.module';@@ -22,6 +21,7 @@ import { MarketDataService } from '@ghostfolio/api/services/market-data/market-dimport { PrismaModule } from '@ghostfolio/api/services/prisma/prisma.module';import { PropertyModule } from '@ghostfolio/api/services/property/property.module';import { PortfolioSnapshotQueueModule } from '@ghostfolio/api/services/queues/portfolio-snapshot/portfolio-snapshot.module';+import { RedisCacheModule } from '@ghostfolio/api/services/redis-cache/redis-cache.module';import { SymbolProfileModule } from '@ghostfolio/api/services/symbol-profile/symbol-profile.module';import { TagModule } from '@ghostfolio/api/services/tag/tag.module';diff --git a/apps/api/src/app/endpoints/data-providers/ghostfolio/ghostfolio.module.ts b/apps/api/src/app/endpoints/data-providers/ghostfolio/ghostfolio.module.tsindex 1b8788ecb7..e77dea9eeb 100644--- a/apps/api/src/app/endpoints/data-providers/ghostfolio/ghostfolio.module.ts+++ b/apps/api/src/app/endpoints/data-providers/ghostfolio/ghostfolio.module.ts@@ -1,4 +1,3 @@-import { RedisCacheModule } from '@ghostfolio/api/app/redis-cache/redis-cache.module';import { SymbolModule } from '@ghostfolio/api/app/symbol/symbol.module';import { ConfigurationService } from '@ghostfolio/api/services/configuration/configuration.service';import { CryptocurrencyModule } from '@ghostfolio/api/services/cryptocurrency/cryptocurrency.module';@@ -17,6 +16,7 @@ import { FetchModule } from '@ghostfolio/api/services/fetch/fetch.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 { RedisCacheModule } from '@ghostfolio/api/services/redis-cache/redis-cache.module';import { SymbolProfileModule } from '@ghostfolio/api/services/symbol-profile/symbol-profile.module';import { Module } from '@nestjs/common';diff --git a/apps/api/src/app/endpoints/public/public.module.ts b/apps/api/src/app/endpoints/public/public.module.tsindex d94f350c36..4e4c4b7c00 100644--- a/apps/api/src/app/endpoints/public/public.module.ts+++ b/apps/api/src/app/endpoints/public/public.module.ts@@ -6,7 +6,6 @@ import { PortfolioCalculatorFactory } from '@ghostfolio/api/app/portfolio/calculimport { CurrentRateService } from '@ghostfolio/api/app/portfolio/current-rate.service';import { PortfolioService } from '@ghostfolio/api/app/portfolio/portfolio.service';import { RulesService } from '@ghostfolio/api/app/portfolio/rules.service';-import { RedisCacheModule } from '@ghostfolio/api/app/redis-cache/redis-cache.module';import { UserModule } from '@ghostfolio/api/app/user/user.module';import { TransformDataSourceInRequestModule } from '@ghostfolio/api/interceptors/transform-data-source-in-request/transform-data-source-in-request.module';import { BenchmarkModule } from '@ghostfolio/api/services/benchmark/benchmark.module';@@ -17,6 +16,7 @@ import { ImpersonationModule } from '@ghostfolio/api/services/impersonation/impeimport { MarketDataModule } from '@ghostfolio/api/services/market-data/market-data.module';import { PrismaModule } from '@ghostfolio/api/services/prisma/prisma.module';import { PortfolioSnapshotQueueModule } from '@ghostfolio/api/services/queues/portfolio-snapshot/portfolio-snapshot.module';+import { RedisCacheModule } from '@ghostfolio/api/services/redis-cache/redis-cache.module';import { SymbolProfileModule } from '@ghostfolio/api/services/symbol-profile/symbol-profile.module';import { TagModule } from '@ghostfolio/api/services/tag/tag.module';diff --git a/apps/api/src/app/health/health.module.ts b/apps/api/src/app/health/health.module.tsindex c36924121c..7b517ef013 100644--- a/apps/api/src/app/health/health.module.ts+++ b/apps/api/src/app/health/health.module.ts@@ -1,9 +1,9 @@import { AiModule } from '@ghostfolio/api/app/endpoints/ai/ai.module';-import { RedisCacheModule } from '@ghostfolio/api/app/redis-cache/redis-cache.module';import { TransformDataSourceInRequestModule } from '@ghostfolio/api/interceptors/transform-data-source-in-request/transform-data-source-in-request.module';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 { PropertyModule } from '@ghostfolio/api/services/property/property.module';+import { RedisCacheModule } from '@ghostfolio/api/services/redis-cache/redis-cache.module';import { Module } from '@nestjs/common';diff --git a/apps/api/src/app/health/health.service.ts b/apps/api/src/app/health/health.service.tsindex 42a0be61b8..6cfd5cbce3 100644--- a/apps/api/src/app/health/health.service.ts+++ b/apps/api/src/app/health/health.service.ts@@ -1,7 +1,7 @@-import { RedisCacheService } from '@ghostfolio/api/app/redis-cache/redis-cache.service';import { DataEnhancerService } from '@ghostfolio/api/services/data-provider/data-enhancer/data-enhancer.service';import { DataProviderService } from '@ghostfolio/api/services/data-provider/data-provider.service';import { PropertyService } from '@ghostfolio/api/services/property/property.service';+import { RedisCacheService } from '@ghostfolio/api/services/redis-cache/redis-cache.service';import { PROPERTY_CURRENCIES } from '@ghostfolio/common/config';import { Injectable } from '@nestjs/common';diff --git a/apps/api/src/app/import/import.module.ts b/apps/api/src/app/import/import.module.tsindex 1a04e7505b..2824d129dd 100644--- a/apps/api/src/app/import/import.module.ts+++ b/apps/api/src/app/import/import.module.ts@@ -3,7 +3,6 @@ import { ActivitiesModule } from '@ghostfolio/api/app/activities/activities.moduimport { CacheModule } from '@ghostfolio/api/app/cache/cache.module';import { PlatformModule } from '@ghostfolio/api/app/platform/platform.module';import { PortfolioModule } from '@ghostfolio/api/app/portfolio/portfolio.module';-import { RedisCacheModule } from '@ghostfolio/api/app/redis-cache/redis-cache.module';import { TransformDataSourceInRequestModule } from '@ghostfolio/api/interceptors/transform-data-source-in-request/transform-data-source-in-request.module';import { TransformDataSourceInResponseModule } from '@ghostfolio/api/interceptors/transform-data-source-in-response/transform-data-source-in-response.module';import { ApiModule } from '@ghostfolio/api/services/api/api.module';@@ -13,6 +12,7 @@ import { ExchangeRateDataModule } from '@ghostfolio/api/services/exchange-rate-dimport { MarketDataModule } from '@ghostfolio/api/services/market-data/market-data.module';import { PrismaModule } from '@ghostfolio/api/services/prisma/prisma.module';import { DataGatheringQueueModule } from '@ghostfolio/api/services/queues/data-gathering/data-gathering.module';+import { RedisCacheModule } from '@ghostfolio/api/services/redis-cache/redis-cache.module';import { SymbolProfileModule } from '@ghostfolio/api/services/symbol-profile/symbol-profile.module';import { TagModule } from '@ghostfolio/api/services/tag/tag.module';diff --git a/apps/api/src/app/info/info.module.ts b/apps/api/src/app/info/info.module.tsindex 06b7249095..a66b75bdd6 100644--- a/apps/api/src/app/info/info.module.ts+++ b/apps/api/src/app/info/info.module.ts@@ -1,5 +1,4 @@import { PlatformModule } from '@ghostfolio/api/app/platform/platform.module';-import { RedisCacheModule } from '@ghostfolio/api/app/redis-cache/redis-cache.module';import { SubscriptionModule } from '@ghostfolio/api/app/subscription/subscription.module';import { UserModule } from '@ghostfolio/api/app/user/user.module';import { TransformDataSourceInResponseModule } from '@ghostfolio/api/interceptors/transform-data-source-in-response/transform-data-source-in-response.module';@@ -10,6 +9,7 @@ import { ExchangeRateDataModule } from '@ghostfolio/api/services/exchange-rate-dimport { MarketDataModule } from '@ghostfolio/api/services/market-data/market-data.module';import { PropertyModule } from '@ghostfolio/api/services/property/property.module';import { DataGatheringQueueModule } from '@ghostfolio/api/services/queues/data-gathering/data-gathering.module';+import { RedisCacheModule } from '@ghostfolio/api/services/redis-cache/redis-cache.module';import { SymbolProfileModule } from '@ghostfolio/api/services/symbol-profile/symbol-profile.module';import { Module } from '@nestjs/common';diff --git a/apps/api/src/app/info/info.service.ts b/apps/api/src/app/info/info.service.tsindex 2a7382446c..ab373055bf 100644--- a/apps/api/src/app/info/info.service.ts+++ b/apps/api/src/app/info/info.service.ts@@ -1,4 +1,3 @@-import { RedisCacheService } from '@ghostfolio/api/app/redis-cache/redis-cache.service';import { SubscriptionService } from '@ghostfolio/api/app/subscription/subscription.service';import { UserService } from '@ghostfolio/api/app/user/user.service';import { BenchmarkService } from '@ghostfolio/api/services/benchmark/benchmark.service';@@ -7,6 +6,7 @@ import { DataProviderService } from '@ghostfolio/api/services/data-provider/dataimport { 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 { RedisCacheService } from '@ghostfolio/api/services/redis-cache/redis-cache.service';import {DEFAULT_CURRENCY,ghostfolioFearAndGreedIndexSymbolStocks,diff --git a/apps/api/src/app/portfolio/calculator/portfolio-calculator.factory.ts b/apps/api/src/app/portfolio/calculator/portfolio-calculator.factory.tsindex 48ab8f3218..138ee1020f 100644--- a/apps/api/src/app/portfolio/calculator/portfolio-calculator.factory.ts+++ b/apps/api/src/app/portfolio/calculator/portfolio-calculator.factory.ts@@ -1,8 +1,8 @@import { CurrentRateService } from '@ghostfolio/api/app/portfolio/current-rate.service';-import { RedisCacheService } from '@ghostfolio/api/app/redis-cache/redis-cache.service';import { ConfigurationService } from '@ghostfolio/api/services/configuration/configuration.service';import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.service';import { PortfolioSnapshotService } from '@ghostfolio/api/services/queues/portfolio-snapshot/portfolio-snapshot.service';+import { RedisCacheService } from '@ghostfolio/api/services/redis-cache/redis-cache.service';import { SubscriptionType } from '@ghostfolio/common/enums';import {Activity,diff --git a/apps/api/src/app/portfolio/calculator/portfolio-calculator.ts b/apps/api/src/app/portfolio/calculator/portfolio-calculator.tsindex 4ef6a95841..7d0c2ddda9 100644--- a/apps/api/src/app/portfolio/calculator/portfolio-calculator.ts+++ b/apps/api/src/app/portfolio/calculator/portfolio-calculator.ts@@ -14,13 +14,13 @@ import { PortfolioCalculatorActivity } from '@ghostfolio/api/app/portfolio/interimport { PortfolioCalculatorHolding } from '@ghostfolio/api/app/portfolio/interfaces/portfolio-calculator-holding.interface';import { PortfolioSnapshotValue } from '@ghostfolio/api/app/portfolio/interfaces/snapshot-value.interface';import { PerformancePercentages } from '@ghostfolio/api/app/portfolio/types/performance-percentages.type';-import { RedisCacheService } from '@ghostfolio/api/app/redis-cache/redis-cache.service';import { getFactor } from '@ghostfolio/api/helper/portfolio.helper';import { LogPerformance } from '@ghostfolio/api/interceptors/performance-logging/performance-logging.interceptor';import { ConfigurationService } from '@ghostfolio/api/services/configuration/configuration.service';import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.service';import { DataGatheringItem } from '@ghostfolio/api/services/interfaces/interfaces';import { PortfolioSnapshotService } from '@ghostfolio/api/services/queues/portfolio-snapshot/portfolio-snapshot.service';+import { RedisCacheService } from '@ghostfolio/api/services/redis-cache/redis-cache.service';import {getAnnualizedPerformancePercent,getIntervalFromDateRangediff --git a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-baln-buy-and-buy.spec.ts b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-baln-buy-and-buy.spec.tsindex 5d3cbcf320..15f61d0614 100644--- a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-baln-buy-and-buy.spec.ts+++ b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-baln-buy-and-buy.spec.ts@@ -5,12 +5,12 @@ import {import { PortfolioCalculatorFactory } from '@ghostfolio/api/app/portfolio/calculator/portfolio-calculator.factory';import { CurrentRateService } from '@ghostfolio/api/app/portfolio/current-rate.service';import { CurrentRateServiceMock } from '@ghostfolio/api/app/portfolio/current-rate.service.mock';-import { RedisCacheService } from '@ghostfolio/api/app/redis-cache/redis-cache.service';-import { RedisCacheServiceMock } from '@ghostfolio/api/app/redis-cache/redis-cache.service.mock';import { ConfigurationService } from '@ghostfolio/api/services/configuration/configuration.service';import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.service';import { PortfolioSnapshotService } from '@ghostfolio/api/services/queues/portfolio-snapshot/portfolio-snapshot.service';import { PortfolioSnapshotServiceMock } from '@ghostfolio/api/services/queues/portfolio-snapshot/portfolio-snapshot.service.mock';+import { RedisCacheService } from '@ghostfolio/api/services/redis-cache/redis-cache.service';+import { RedisCacheServiceMock } from '@ghostfolio/api/services/redis-cache/redis-cache.service.mock';import { parseDate } from '@ghostfolio/common/helper';import { PerformanceCalculationType } from '@ghostfolio/common/types/performance-calculation-type.type';@@ -35,7 +35,7 @@ jest.mock(});-jest.mock('@ghostfolio/api/app/redis-cache/redis-cache.service', () => {+jest.mock('@ghostfolio/api/services/redis-cache/redis-cache.service', () => {return {RedisCacheService: jest.fn().mockImplementation(() => {return RedisCacheServiceMock;diff --git a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-baln-buy-and-sell-in-two-activities.spec.ts b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-baln-buy-and-sell-in-two-activities.spec.tsindex 54f1dfcb48..9d114d8dce 100644--- a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-baln-buy-and-sell-in-two-activities.spec.ts+++ b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-baln-buy-and-sell-in-two-activities.spec.ts@@ -6,12 +6,12 @@ import {import { PortfolioCalculatorFactory } from '@ghostfolio/api/app/portfolio/calculator/portfolio-calculator.factory';import { CurrentRateService } from '@ghostfolio/api/app/portfolio/current-rate.service';import { CurrentRateServiceMock } from '@ghostfolio/api/app/portfolio/current-rate.service.mock';-import { RedisCacheService } from '@ghostfolio/api/app/redis-cache/redis-cache.service';-import { RedisCacheServiceMock } from '@ghostfolio/api/app/redis-cache/redis-cache.service.mock';import { ConfigurationService } from '@ghostfolio/api/services/configuration/configuration.service';import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.service';import { PortfolioSnapshotService } from '@ghostfolio/api/services/queues/portfolio-snapshot/portfolio-snapshot.service';import { PortfolioSnapshotServiceMock } from '@ghostfolio/api/services/queues/portfolio-snapshot/portfolio-snapshot.service.mock';+import { RedisCacheService } from '@ghostfolio/api/services/redis-cache/redis-cache.service';+import { RedisCacheServiceMock } from '@ghostfolio/api/services/redis-cache/redis-cache.service.mock';import { parseDate } from '@ghostfolio/common/helper';import { Activity } from '@ghostfolio/common/interfaces';import { PerformanceCalculationType } from '@ghostfolio/common/types/performance-calculation-type.type';@@ -37,7 +37,7 @@ jest.mock(});-jest.mock('@ghostfolio/api/app/redis-cache/redis-cache.service', () => {+jest.mock('@ghostfolio/api/services/redis-cache/redis-cache.service', () => {return {RedisCacheService: jest.fn().mockImplementation(() => {return RedisCacheServiceMock;diff --git a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-baln-buy-and-sell.spec.ts b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-baln-buy-and-sell.spec.tsindex 9ee4877180..6bd391683b 100644--- a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-baln-buy-and-sell.spec.ts+++ b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-baln-buy-and-sell.spec.ts@@ -6,12 +6,12 @@ import {import { PortfolioCalculatorFactory } from '@ghostfolio/api/app/portfolio/calculator/portfolio-calculator.factory';import { CurrentRateService } from '@ghostfolio/api/app/portfolio/current-rate.service';import { CurrentRateServiceMock } from '@ghostfolio/api/app/portfolio/current-rate.service.mock';-import { RedisCacheService } from '@ghostfolio/api/app/redis-cache/redis-cache.service';-import { RedisCacheServiceMock } from '@ghostfolio/api/app/redis-cache/redis-cache.service.mock';import { ConfigurationService } from '@ghostfolio/api/services/configuration/configuration.service';import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.service';import { PortfolioSnapshotService } from '@ghostfolio/api/services/queues/portfolio-snapshot/portfolio-snapshot.service';import { PortfolioSnapshotServiceMock } from '@ghostfolio/api/services/queues/portfolio-snapshot/portfolio-snapshot.service.mock';+import { RedisCacheService } from '@ghostfolio/api/services/redis-cache/redis-cache.service';+import { RedisCacheServiceMock } from '@ghostfolio/api/services/redis-cache/redis-cache.service.mock';import { parseDate } from '@ghostfolio/common/helper';import { PerformanceCalculationType } from '@ghostfolio/common/types/performance-calculation-type.type';@@ -36,7 +36,7 @@ jest.mock(});-jest.mock('@ghostfolio/api/app/redis-cache/redis-cache.service', () => {+jest.mock('@ghostfolio/api/services/redis-cache/redis-cache.service', () => {return {RedisCacheService: jest.fn().mockImplementation(() => {return RedisCacheServiceMock;diff --git a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-baln-buy.spec.ts b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-baln-buy.spec.tsindex afae22c1c6..de507791c7 100644--- a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-baln-buy.spec.ts+++ b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-baln-buy.spec.ts@@ -5,12 +5,12 @@ import {import { PortfolioCalculatorFactory } from '@ghostfolio/api/app/portfolio/calculator/portfolio-calculator.factory';import { CurrentRateService } from '@ghostfolio/api/app/portfolio/current-rate.service';import { CurrentRateServiceMock } from '@ghostfolio/api/app/portfolio/current-rate.service.mock';-import { RedisCacheService } from '@ghostfolio/api/app/redis-cache/redis-cache.service';-import { RedisCacheServiceMock } from '@ghostfolio/api/app/redis-cache/redis-cache.service.mock';import { ConfigurationService } from '@ghostfolio/api/services/configuration/configuration.service';import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.service';import { PortfolioSnapshotService } from '@ghostfolio/api/services/queues/portfolio-snapshot/portfolio-snapshot.service';import { PortfolioSnapshotServiceMock } from '@ghostfolio/api/services/queues/portfolio-snapshot/portfolio-snapshot.service.mock';+import { RedisCacheService } from '@ghostfolio/api/services/redis-cache/redis-cache.service';+import { RedisCacheServiceMock } from '@ghostfolio/api/services/redis-cache/redis-cache.service.mock';import { parseDate } from '@ghostfolio/common/helper';import { PerformanceCalculationType } from '@ghostfolio/common/types/performance-calculation-type.type';@@ -35,7 +35,7 @@ jest.mock(});-jest.mock('@ghostfolio/api/app/redis-cache/redis-cache.service', () => {+jest.mock('@ghostfolio/api/services/redis-cache/redis-cache.service', () => {return {RedisCacheService: jest.fn().mockImplementation(() => {return RedisCacheServiceMock;diff --git a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-btceur-in-base-currency-eur.spec.ts b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-btceur-in-base-currency-eur.spec.tsindex 5c78f8a42b..f3f069eeae 100644--- a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-btceur-in-base-currency-eur.spec.ts+++ b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-btceur-in-base-currency-eur.spec.ts@@ -7,13 +7,13 @@ import {import { PortfolioCalculatorFactory } from '@ghostfolio/api/app/portfolio/calculator/portfolio-calculator.factory';import { CurrentRateService } from '@ghostfolio/api/app/portfolio/current-rate.service';import { CurrentRateServiceMock } from '@ghostfolio/api/app/portfolio/current-rate.service.mock';-import { RedisCacheService } from '@ghostfolio/api/app/redis-cache/redis-cache.service';-import { RedisCacheServiceMock } from '@ghostfolio/api/app/redis-cache/redis-cache.service.mock';import { ConfigurationService } from '@ghostfolio/api/services/configuration/configuration.service';import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.service';import { ExchangeRateDataServiceMock } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.service.mock';import { PortfolioSnapshotService } from '@ghostfolio/api/services/queues/portfolio-snapshot/portfolio-snapshot.service';import { PortfolioSnapshotServiceMock } from '@ghostfolio/api/services/queues/portfolio-snapshot/portfolio-snapshot.service.mock';+import { RedisCacheService } from '@ghostfolio/api/services/redis-cache/redis-cache.service';+import { RedisCacheServiceMock } from '@ghostfolio/api/services/redis-cache/redis-cache.service.mock';import { parseDate } from '@ghostfolio/common/helper';import { Activity, ExportResponse } from '@ghostfolio/common/interfaces';import { PerformanceCalculationType } from '@ghostfolio/common/types/performance-calculation-type.type';@@ -51,7 +51,7 @@ jest.mock(});-jest.mock('@ghostfolio/api/app/redis-cache/redis-cache.service', () => {+jest.mock('@ghostfolio/api/services/redis-cache/redis-cache.service', () => {return {RedisCacheService: jest.fn().mockImplementation(() => {return RedisCacheServiceMock;diff --git a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-btceur.spec.ts b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-btceur.spec.tsindex ed8841b167..219b988f5b 100644--- a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-btceur.spec.ts+++ b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-btceur.spec.ts@@ -7,12 +7,12 @@ import {import { PortfolioCalculatorFactory } from '@ghostfolio/api/app/portfolio/calculator/portfolio-calculator.factory';import { CurrentRateService } from '@ghostfolio/api/app/portfolio/current-rate.service';import { CurrentRateServiceMock } from '@ghostfolio/api/app/portfolio/current-rate.service.mock';-import { RedisCacheService } from '@ghostfolio/api/app/redis-cache/redis-cache.service';-import { RedisCacheServiceMock } from '@ghostfolio/api/app/redis-cache/redis-cache.service.mock';import { ConfigurationService } from '@ghostfolio/api/services/configuration/configuration.service';import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.service';import { PortfolioSnapshotService } from '@ghostfolio/api/services/queues/portfolio-snapshot/portfolio-snapshot.service';import { PortfolioSnapshotServiceMock } from '@ghostfolio/api/services/queues/portfolio-snapshot/portfolio-snapshot.service.mock';+import { RedisCacheService } from '@ghostfolio/api/services/redis-cache/redis-cache.service';+import { RedisCacheServiceMock } from '@ghostfolio/api/services/redis-cache/redis-cache.service.mock';import { parseDate } from '@ghostfolio/common/helper';import { Activity, ExportResponse } from '@ghostfolio/common/interfaces';import { PerformanceCalculationType } from '@ghostfolio/common/types/performance-calculation-type.type';@@ -39,7 +39,7 @@ jest.mock(});-jest.mock('@ghostfolio/api/app/redis-cache/redis-cache.service', () => {+jest.mock('@ghostfolio/api/services/redis-cache/redis-cache.service', () => {return {RedisCacheService: jest.fn().mockImplementation(() => {return RedisCacheServiceMock;diff --git a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-btcusd-buy-and-sell-partially.spec.ts b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-btcusd-buy-and-sell-partially.spec.tsindex 507dd731e2..1ff6f55d59 100644--- a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-btcusd-buy-and-sell-partially.spec.ts+++ b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-btcusd-buy-and-sell-partially.spec.ts@@ -6,13 +6,13 @@ import {import { PortfolioCalculatorFactory } from '@ghostfolio/api/app/portfolio/calculator/portfolio-calculator.factory';import { CurrentRateService } from '@ghostfolio/api/app/portfolio/current-rate.service';import { CurrentRateServiceMock } from '@ghostfolio/api/app/portfolio/current-rate.service.mock';-import { RedisCacheService } from '@ghostfolio/api/app/redis-cache/redis-cache.service';-import { RedisCacheServiceMock } from '@ghostfolio/api/app/redis-cache/redis-cache.service.mock';import { ConfigurationService } from '@ghostfolio/api/services/configuration/configuration.service';import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.service';import { ExchangeRateDataServiceMock } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.service.mock';import { PortfolioSnapshotService } from '@ghostfolio/api/services/queues/portfolio-snapshot/portfolio-snapshot.service';import { PortfolioSnapshotServiceMock } from '@ghostfolio/api/services/queues/portfolio-snapshot/portfolio-snapshot.service.mock';+import { RedisCacheService } from '@ghostfolio/api/services/redis-cache/redis-cache.service';+import { RedisCacheServiceMock } from '@ghostfolio/api/services/redis-cache/redis-cache.service.mock';import { getIntervalFromDateRange } from '@ghostfolio/common/calculation-helper';import { parseDate } from '@ghostfolio/common/helper';import { PerformanceCalculationType } from '@ghostfolio/common/types/performance-calculation-type.type';@@ -38,7 +38,7 @@ jest.mock(});-jest.mock('@ghostfolio/api/app/redis-cache/redis-cache.service', () => {+jest.mock('@ghostfolio/api/services/redis-cache/redis-cache.service', () => {return {RedisCacheService: jest.fn().mockImplementation(() => {return RedisCacheServiceMock;diff --git a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-btcusd-buy-before-first-market-price.spec.ts b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-btcusd-buy-before-first-market-price.spec.tsindex 6b3d9ce6d4..bd8d76948c 100644--- a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-btcusd-buy-before-first-market-price.spec.ts+++ b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-btcusd-buy-before-first-market-price.spec.ts@@ -6,12 +6,12 @@ import {import { PortfolioCalculatorFactory } from '@ghostfolio/api/app/portfolio/calculator/portfolio-calculator.factory';import { CurrentRateService } from '@ghostfolio/api/app/portfolio/current-rate.service';import { CurrentRateServiceMock } from '@ghostfolio/api/app/portfolio/current-rate.service.mock';-import { RedisCacheService } from '@ghostfolio/api/app/redis-cache/redis-cache.service';-import { RedisCacheServiceMock } from '@ghostfolio/api/app/redis-cache/redis-cache.service.mock';import { ConfigurationService } from '@ghostfolio/api/services/configuration/configuration.service';import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.service';import { PortfolioSnapshotService } from '@ghostfolio/api/services/queues/portfolio-snapshot/portfolio-snapshot.service';import { PortfolioSnapshotServiceMock } from '@ghostfolio/api/services/queues/portfolio-snapshot/portfolio-snapshot.service.mock';+import { RedisCacheService } from '@ghostfolio/api/services/redis-cache/redis-cache.service';+import { RedisCacheServiceMock } from '@ghostfolio/api/services/redis-cache/redis-cache.service.mock';import { parseDate } from '@ghostfolio/common/helper';import { Activity } from '@ghostfolio/common/interfaces';import { PerformanceCalculationType } from '@ghostfolio/common/types/performance-calculation-type.type';@@ -35,7 +35,7 @@ jest.mock(});-jest.mock('@ghostfolio/api/app/redis-cache/redis-cache.service', () => {+jest.mock('@ghostfolio/api/services/redis-cache/redis-cache.service', () => {return {RedisCacheService: jest.fn().mockImplementation(() => {return RedisCacheServiceMock;diff --git a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-btcusd-short.spec.ts b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-btcusd-short.spec.tsindex 356fdebd03..30201c34f7 100644--- a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-btcusd-short.spec.ts+++ b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-btcusd-short.spec.ts@@ -5,12 +5,12 @@ import {import { PortfolioCalculatorFactory } from '@ghostfolio/api/app/portfolio/calculator/portfolio-calculator.factory';import { CurrentRateService } from '@ghostfolio/api/app/portfolio/current-rate.service';import { CurrentRateServiceMock } from '@ghostfolio/api/app/portfolio/current-rate.service.mock';-import { RedisCacheService } from '@ghostfolio/api/app/redis-cache/redis-cache.service';-import { RedisCacheServiceMock } from '@ghostfolio/api/app/redis-cache/redis-cache.service.mock';import { ConfigurationService } from '@ghostfolio/api/services/configuration/configuration.service';import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.service';import { PortfolioSnapshotService } from '@ghostfolio/api/services/queues/portfolio-snapshot/portfolio-snapshot.service';import { PortfolioSnapshotServiceMock } from '@ghostfolio/api/services/queues/portfolio-snapshot/portfolio-snapshot.service.mock';+import { RedisCacheService } from '@ghostfolio/api/services/redis-cache/redis-cache.service';+import { RedisCacheServiceMock } from '@ghostfolio/api/services/redis-cache/redis-cache.service.mock';import { parseDate } from '@ghostfolio/common/helper';import { PerformanceCalculationType } from '@ghostfolio/common/types/performance-calculation-type.type';@@ -35,7 +35,7 @@ jest.mock(});-jest.mock('@ghostfolio/api/app/redis-cache/redis-cache.service', () => {+jest.mock('@ghostfolio/api/services/redis-cache/redis-cache.service', () => {return {RedisCacheService: jest.fn().mockImplementation(() => {return RedisCacheServiceMock;diff --git a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-btcusd.spec.ts b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-btcusd.spec.tsindex 0d0f6cfc3b..05ac3f5072 100644--- a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-btcusd.spec.ts+++ b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-btcusd.spec.ts@@ -5,12 +5,12 @@ import {import { PortfolioCalculatorFactory } from '@ghostfolio/api/app/portfolio/calculator/portfolio-calculator.factory';import { CurrentRateService } from '@ghostfolio/api/app/portfolio/current-rate.service';import { CurrentRateServiceMock } from '@ghostfolio/api/app/portfolio/current-rate.service.mock';-import { RedisCacheService } from '@ghostfolio/api/app/redis-cache/redis-cache.service';-import { RedisCacheServiceMock } from '@ghostfolio/api/app/redis-cache/redis-cache.service.mock';import { ConfigurationService } from '@ghostfolio/api/services/configuration/configuration.service';import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.service';import { PortfolioSnapshotService } from '@ghostfolio/api/services/queues/portfolio-snapshot/portfolio-snapshot.service';import { PortfolioSnapshotServiceMock } from '@ghostfolio/api/services/queues/portfolio-snapshot/portfolio-snapshot.service.mock';+import { RedisCacheService } from '@ghostfolio/api/services/redis-cache/redis-cache.service';+import { RedisCacheServiceMock } from '@ghostfolio/api/services/redis-cache/redis-cache.service.mock';import { parseDate } from '@ghostfolio/common/helper';import { PerformanceCalculationType } from '@ghostfolio/common/types/performance-calculation-type.type';@@ -35,7 +35,7 @@ jest.mock(});-jest.mock('@ghostfolio/api/app/redis-cache/redis-cache.service', () => {+jest.mock('@ghostfolio/api/services/redis-cache/redis-cache.service', () => {return {RedisCacheService: jest.fn().mockImplementation(() => {return RedisCacheServiceMock;diff --git a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-cash.spec.ts b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-cash.spec.tsindex b98aa9e5f2..67aa90899e 100644--- a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-cash.spec.ts+++ b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-cash.spec.ts@@ -9,8 +9,6 @@ import {import { PortfolioCalculatorFactory } from '@ghostfolio/api/app/portfolio/calculator/portfolio-calculator.factory';import { CurrentRateService } from '@ghostfolio/api/app/portfolio/current-rate.service';import { CurrentRateServiceMock } from '@ghostfolio/api/app/portfolio/current-rate.service.mock';-import { RedisCacheService } from '@ghostfolio/api/app/redis-cache/redis-cache.service';-import { RedisCacheServiceMock } from '@ghostfolio/api/app/redis-cache/redis-cache.service.mock';import { AssetProfileSplitService } from '@ghostfolio/api/services/asset-profile-split/asset-profile-split.service';import { ConfigurationService } from '@ghostfolio/api/services/configuration/configuration.service';import { DataProviderService } from '@ghostfolio/api/services/data-provider/data-provider.service';@@ -18,6 +16,8 @@ import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-import { ExchangeRateDataServiceMock } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.service.mock';import { PortfolioSnapshotService } from '@ghostfolio/api/services/queues/portfolio-snapshot/portfolio-snapshot.service';import { PortfolioSnapshotServiceMock } from '@ghostfolio/api/services/queues/portfolio-snapshot/portfolio-snapshot.service.mock';+import { RedisCacheService } from '@ghostfolio/api/services/redis-cache/redis-cache.service';+import { RedisCacheServiceMock } from '@ghostfolio/api/services/redis-cache/redis-cache.service.mock';import { parseDate } from '@ghostfolio/common/helper';import { PortfolioSnapshotHolding } from '@ghostfolio/common/models';import { PerformanceCalculationType } from '@ghostfolio/common/types/performance-calculation-type.type';@@ -57,7 +57,7 @@ jest.mock(});-jest.mock('@ghostfolio/api/app/redis-cache/redis-cache.service', () => {+jest.mock('@ghostfolio/api/services/redis-cache/redis-cache.service', () => {return {RedisCacheService: jest.fn().mockImplementation(() => {return RedisCacheServiceMock;diff --git a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-fee.spec.ts b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-fee.spec.tsindex 6e9a42e3e8..06c68f8773 100644--- a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-fee.spec.ts+++ b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-fee.spec.ts@@ -6,12 +6,12 @@ import {import { PortfolioCalculatorFactory } from '@ghostfolio/api/app/portfolio/calculator/portfolio-calculator.factory';import { CurrentRateService } from '@ghostfolio/api/app/portfolio/current-rate.service';import { CurrentRateServiceMock } from '@ghostfolio/api/app/portfolio/current-rate.service.mock';-import { RedisCacheService } from '@ghostfolio/api/app/redis-cache/redis-cache.service';-import { RedisCacheServiceMock } from '@ghostfolio/api/app/redis-cache/redis-cache.service.mock';import { ConfigurationService } from '@ghostfolio/api/services/configuration/configuration.service';import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.service';import { PortfolioSnapshotService } from '@ghostfolio/api/services/queues/portfolio-snapshot/portfolio-snapshot.service';import { PortfolioSnapshotServiceMock } from '@ghostfolio/api/services/queues/portfolio-snapshot/portfolio-snapshot.service.mock';+import { RedisCacheService } from '@ghostfolio/api/services/redis-cache/redis-cache.service';+import { RedisCacheServiceMock } from '@ghostfolio/api/services/redis-cache/redis-cache.service.mock';import { parseDate } from '@ghostfolio/common/helper';import { Activity } from '@ghostfolio/common/interfaces';import { PerformanceCalculationType } from '@ghostfolio/common/types/performance-calculation-type.type';@@ -37,7 +37,7 @@ jest.mock(});-jest.mock('@ghostfolio/api/app/redis-cache/redis-cache.service', () => {+jest.mock('@ghostfolio/api/services/redis-cache/redis-cache.service', () => {return {RedisCacheService: jest.fn().mockImplementation(() => {return RedisCacheServiceMock;diff --git a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-googl-buy-with-dividend.spec.ts b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-googl-buy-with-dividend.spec.tsindex 46dbe493bf..1a5af99daf 100644--- a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-googl-buy-with-dividend.spec.ts+++ b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-googl-buy-with-dividend.spec.ts@@ -6,13 +6,13 @@ import {import { PortfolioCalculatorFactory } from '@ghostfolio/api/app/portfolio/calculator/portfolio-calculator.factory';import { CurrentRateService } from '@ghostfolio/api/app/portfolio/current-rate.service';import { CurrentRateServiceMock } from '@ghostfolio/api/app/portfolio/current-rate.service.mock';-import { RedisCacheService } from '@ghostfolio/api/app/redis-cache/redis-cache.service';-import { RedisCacheServiceMock } from '@ghostfolio/api/app/redis-cache/redis-cache.service.mock';import { ConfigurationService } from '@ghostfolio/api/services/configuration/configuration.service';import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.service';import { ExchangeRateDataServiceMock } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.service.mock';import { PortfolioSnapshotService } from '@ghostfolio/api/services/queues/portfolio-snapshot/portfolio-snapshot.service';import { PortfolioSnapshotServiceMock } from '@ghostfolio/api/services/queues/portfolio-snapshot/portfolio-snapshot.service.mock';+import { RedisCacheService } from '@ghostfolio/api/services/redis-cache/redis-cache.service';+import { RedisCacheServiceMock } from '@ghostfolio/api/services/redis-cache/redis-cache.service.mock';import { parseDate } from '@ghostfolio/common/helper';import { Activity } from '@ghostfolio/common/interfaces';import { PerformanceCalculationType } from '@ghostfolio/common/types/performance-calculation-type.type';@@ -38,7 +38,7 @@ jest.mock(});-jest.mock('@ghostfolio/api/app/redis-cache/redis-cache.service', () => {+jest.mock('@ghostfolio/api/services/redis-cache/redis-cache.service', () => {return {RedisCacheService: jest.fn().mockImplementation(() => {return RedisCacheServiceMock;diff --git a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-googl-buy.spec.ts b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-googl-buy.spec.tsindex e048d2df51..f375a32419 100644--- a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-googl-buy.spec.ts+++ b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-googl-buy.spec.ts@@ -6,13 +6,13 @@ import {import { PortfolioCalculatorFactory } from '@ghostfolio/api/app/portfolio/calculator/portfolio-calculator.factory';import { CurrentRateService } from '@ghostfolio/api/app/portfolio/current-rate.service';import { CurrentRateServiceMock } from '@ghostfolio/api/app/portfolio/current-rate.service.mock';-import { RedisCacheService } from '@ghostfolio/api/app/redis-cache/redis-cache.service';-import { RedisCacheServiceMock } from '@ghostfolio/api/app/redis-cache/redis-cache.service.mock';import { ConfigurationService } from '@ghostfolio/api/services/configuration/configuration.service';import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.service';import { ExchangeRateDataServiceMock } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.service.mock';import { PortfolioSnapshotService } from '@ghostfolio/api/services/queues/portfolio-snapshot/portfolio-snapshot.service';import { PortfolioSnapshotServiceMock } from '@ghostfolio/api/services/queues/portfolio-snapshot/portfolio-snapshot.service.mock';+import { RedisCacheService } from '@ghostfolio/api/services/redis-cache/redis-cache.service';+import { RedisCacheServiceMock } from '@ghostfolio/api/services/redis-cache/redis-cache.service.mock';import { parseDate } from '@ghostfolio/common/helper';import { Activity } from '@ghostfolio/common/interfaces';import { PerformanceCalculationType } from '@ghostfolio/common/types/performance-calculation-type.type';@@ -38,7 +38,7 @@ jest.mock(});-jest.mock('@ghostfolio/api/app/redis-cache/redis-cache.service', () => {+jest.mock('@ghostfolio/api/services/redis-cache/redis-cache.service', () => {return {RedisCacheService: jest.fn().mockImplementation(() => {return RedisCacheServiceMock;diff --git a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-googl-fee-and-dividend.spec.ts b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-googl-fee-and-dividend.spec.tsindex bb6385d18d..891d4397e0 100644--- a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-googl-fee-and-dividend.spec.ts+++ b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-googl-fee-and-dividend.spec.ts@@ -7,12 +7,12 @@ import {import { PortfolioCalculatorFactory } from '@ghostfolio/api/app/portfolio/calculator/portfolio-calculator.factory';import { CurrentRateService } from '@ghostfolio/api/app/portfolio/current-rate.service';import { CurrentRateServiceMock } from '@ghostfolio/api/app/portfolio/current-rate.service.mock';-import { RedisCacheService } from '@ghostfolio/api/app/redis-cache/redis-cache.service';-import { RedisCacheServiceMock } from '@ghostfolio/api/app/redis-cache/redis-cache.service.mock';import { ConfigurationService } from '@ghostfolio/api/services/configuration/configuration.service';import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.service';import { PortfolioSnapshotService } from '@ghostfolio/api/services/queues/portfolio-snapshot/portfolio-snapshot.service';import { PortfolioSnapshotServiceMock } from '@ghostfolio/api/services/queues/portfolio-snapshot/portfolio-snapshot.service.mock';+import { RedisCacheService } from '@ghostfolio/api/services/redis-cache/redis-cache.service';+import { RedisCacheServiceMock } from '@ghostfolio/api/services/redis-cache/redis-cache.service.mock';import { parseDate } from '@ghostfolio/common/helper';import { Activity } from '@ghostfolio/common/interfaces';import { PerformanceCalculationType } from '@ghostfolio/common/types/performance-calculation-type.type';@@ -38,7 +38,7 @@ jest.mock(});-jest.mock('@ghostfolio/api/app/redis-cache/redis-cache.service', () => {+jest.mock('@ghostfolio/api/services/redis-cache/redis-cache.service', () => {return {RedisCacheService: jest.fn().mockImplementation(() => {return RedisCacheServiceMock;diff --git a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-jnug-buy-and-sell-and-buy-and-sell.spec.ts b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-jnug-buy-and-sell-and-buy-and-sell.spec.tsindex b2e0ffab6b..2c5aec649b 100644--- a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-jnug-buy-and-sell-and-buy-and-sell.spec.ts+++ b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-jnug-buy-and-sell-and-buy-and-sell.spec.ts@@ -5,12 +5,12 @@ import {import { PortfolioCalculatorFactory } from '@ghostfolio/api/app/portfolio/calculator/portfolio-calculator.factory';import { CurrentRateService } from '@ghostfolio/api/app/portfolio/current-rate.service';import { CurrentRateServiceMock } from '@ghostfolio/api/app/portfolio/current-rate.service.mock';-import { RedisCacheService } from '@ghostfolio/api/app/redis-cache/redis-cache.service';-import { RedisCacheServiceMock } from '@ghostfolio/api/app/redis-cache/redis-cache.service.mock';import { ConfigurationService } from '@ghostfolio/api/services/configuration/configuration.service';import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.service';import { PortfolioSnapshotService } from '@ghostfolio/api/services/queues/portfolio-snapshot/portfolio-snapshot.service';import { PortfolioSnapshotServiceMock } from '@ghostfolio/api/services/queues/portfolio-snapshot/portfolio-snapshot.service.mock';+import { RedisCacheService } from '@ghostfolio/api/services/redis-cache/redis-cache.service';+import { RedisCacheServiceMock } from '@ghostfolio/api/services/redis-cache/redis-cache.service.mock';import { parseDate } from '@ghostfolio/common/helper';import { PerformanceCalculationType } from '@ghostfolio/common/types/performance-calculation-type.type';@@ -35,7 +35,7 @@ jest.mock(});-jest.mock('@ghostfolio/api/app/redis-cache/redis-cache.service', () => {+jest.mock('@ghostfolio/api/services/redis-cache/redis-cache.service', () => {return {RedisCacheService: jest.fn().mockImplementation(() => {return RedisCacheServiceMock;diff --git a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-liability.spec.ts b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-liability.spec.tsindex 370205fc98..8e9b87bf31 100644--- a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-liability.spec.ts+++ b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-liability.spec.ts@@ -6,12 +6,12 @@ import {import { PortfolioCalculatorFactory } from '@ghostfolio/api/app/portfolio/calculator/portfolio-calculator.factory';import { CurrentRateService } from '@ghostfolio/api/app/portfolio/current-rate.service';import { CurrentRateServiceMock } from '@ghostfolio/api/app/portfolio/current-rate.service.mock';-import { RedisCacheService } from '@ghostfolio/api/app/redis-cache/redis-cache.service';-import { RedisCacheServiceMock } from '@ghostfolio/api/app/redis-cache/redis-cache.service.mock';import { ConfigurationService } from '@ghostfolio/api/services/configuration/configuration.service';import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.service';import { PortfolioSnapshotService } from '@ghostfolio/api/services/queues/portfolio-snapshot/portfolio-snapshot.service';import { PortfolioSnapshotServiceMock } from '@ghostfolio/api/services/queues/portfolio-snapshot/portfolio-snapshot.service.mock';+import { RedisCacheService } from '@ghostfolio/api/services/redis-cache/redis-cache.service';+import { RedisCacheServiceMock } from '@ghostfolio/api/services/redis-cache/redis-cache.service.mock';import { parseDate } from '@ghostfolio/common/helper';import { Activity } from '@ghostfolio/common/interfaces';import { PerformanceCalculationType } from '@ghostfolio/common/types/performance-calculation-type.type';@@ -37,7 +37,7 @@ jest.mock(});-jest.mock('@ghostfolio/api/app/redis-cache/redis-cache.service', () => {+jest.mock('@ghostfolio/api/services/redis-cache/redis-cache.service', () => {return {RedisCacheService: jest.fn().mockImplementation(() => {return RedisCacheServiceMock;diff --git a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-manual-buy-before-first-market-price.spec.ts b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-manual-buy-before-first-market-price.spec.tsindex 135e6f6407..47ac8df4c7 100644--- a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-manual-buy-before-first-market-price.spec.ts+++ b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-manual-buy-before-first-market-price.spec.ts@@ -6,12 +6,12 @@ import {import { PortfolioCalculatorFactory } from '@ghostfolio/api/app/portfolio/calculator/portfolio-calculator.factory';import { CurrentRateService } from '@ghostfolio/api/app/portfolio/current-rate.service';import { CurrentRateServiceMock } from '@ghostfolio/api/app/portfolio/current-rate.service.mock';-import { RedisCacheService } from '@ghostfolio/api/app/redis-cache/redis-cache.service';-import { RedisCacheServiceMock } from '@ghostfolio/api/app/redis-cache/redis-cache.service.mock';import { ConfigurationService } from '@ghostfolio/api/services/configuration/configuration.service';import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.service';import { PortfolioSnapshotService } from '@ghostfolio/api/services/queues/portfolio-snapshot/portfolio-snapshot.service';import { PortfolioSnapshotServiceMock } from '@ghostfolio/api/services/queues/portfolio-snapshot/portfolio-snapshot.service.mock';+import { RedisCacheService } from '@ghostfolio/api/services/redis-cache/redis-cache.service';+import { RedisCacheServiceMock } from '@ghostfolio/api/services/redis-cache/redis-cache.service.mock';import { parseDate } from '@ghostfolio/common/helper';import { Activity } from '@ghostfolio/common/interfaces';import { PerformanceCalculationType } from '@ghostfolio/common/types/performance-calculation-type.type';@@ -35,7 +35,7 @@ jest.mock(});-jest.mock('@ghostfolio/api/app/redis-cache/redis-cache.service', () => {+jest.mock('@ghostfolio/api/services/redis-cache/redis-cache.service', () => {return {RedisCacheService: jest.fn().mockImplementation(() => {return RedisCacheServiceMock;diff --git a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-manual-buy-with-market-price-between-chart-dates.spec.ts b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-manual-buy-with-market-price-between-chart-dates.spec.tsindex 989409e77b..9658d998d0 100644--- a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-manual-buy-with-market-price-between-chart-dates.spec.ts+++ b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-manual-buy-with-market-price-between-chart-dates.spec.ts@@ -6,12 +6,12 @@ import {import { PortfolioCalculatorFactory } from '@ghostfolio/api/app/portfolio/calculator/portfolio-calculator.factory';import { CurrentRateService } from '@ghostfolio/api/app/portfolio/current-rate.service';import { CurrentRateServiceMock } from '@ghostfolio/api/app/portfolio/current-rate.service.mock';-import { RedisCacheService } from '@ghostfolio/api/app/redis-cache/redis-cache.service';-import { RedisCacheServiceMock } from '@ghostfolio/api/app/redis-cache/redis-cache.service.mock';import { ConfigurationService } from '@ghostfolio/api/services/configuration/configuration.service';import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.service';import { PortfolioSnapshotService } from '@ghostfolio/api/services/queues/portfolio-snapshot/portfolio-snapshot.service';import { PortfolioSnapshotServiceMock } from '@ghostfolio/api/services/queues/portfolio-snapshot/portfolio-snapshot.service.mock';+import { RedisCacheService } from '@ghostfolio/api/services/redis-cache/redis-cache.service';+import { RedisCacheServiceMock } from '@ghostfolio/api/services/redis-cache/redis-cache.service.mock';import { parseDate } from '@ghostfolio/common/helper';import { Activity } from '@ghostfolio/common/interfaces';import { PerformanceCalculationType } from '@ghostfolio/common/types/performance-calculation-type.type';@@ -37,7 +37,7 @@ jest.mock(});-jest.mock('@ghostfolio/api/app/redis-cache/redis-cache.service', () => {+jest.mock('@ghostfolio/api/services/redis-cache/redis-cache.service', () => {return {RedisCacheService: jest.fn().mockImplementation(() => {return RedisCacheServiceMock;diff --git a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-msft-buy-and-sell.spec.ts b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-msft-buy-and-sell.spec.tsindex 1db23bc6cb..2ca108430d 100644--- a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-msft-buy-and-sell.spec.ts+++ b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-msft-buy-and-sell.spec.ts@@ -6,12 +6,12 @@ import {import { PortfolioCalculatorFactory } from '@ghostfolio/api/app/portfolio/calculator/portfolio-calculator.factory';import { CurrentRateService } from '@ghostfolio/api/app/portfolio/current-rate.service';import { CurrentRateServiceMock } from '@ghostfolio/api/app/portfolio/current-rate.service.mock';-import { RedisCacheService } from '@ghostfolio/api/app/redis-cache/redis-cache.service';-import { RedisCacheServiceMock } from '@ghostfolio/api/app/redis-cache/redis-cache.service.mock';import { ConfigurationService } from '@ghostfolio/api/services/configuration/configuration.service';import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.service';import { PortfolioSnapshotService } from '@ghostfolio/api/services/queues/portfolio-snapshot/portfolio-snapshot.service';import { PortfolioSnapshotServiceMock } from '@ghostfolio/api/services/queues/portfolio-snapshot/portfolio-snapshot.service.mock';+import { RedisCacheService } from '@ghostfolio/api/services/redis-cache/redis-cache.service';+import { RedisCacheServiceMock } from '@ghostfolio/api/services/redis-cache/redis-cache.service.mock';import { parseDate } from '@ghostfolio/common/helper';import { Activity } from '@ghostfolio/common/interfaces';import { PerformanceCalculationType } from '@ghostfolio/common/types/performance-calculation-type.type';@@ -35,7 +35,7 @@ jest.mock(});-jest.mock('@ghostfolio/api/app/redis-cache/redis-cache.service', () => {+jest.mock('@ghostfolio/api/services/redis-cache/redis-cache.service', () => {return {RedisCacheService: jest.fn().mockImplementation(() => {return RedisCacheServiceMock;diff --git a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-msft-buy-from-two-data-sources.spec.ts b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-msft-buy-from-two-data-sources.spec.tsindex 00b3ce4af1..d420ee873b 100644--- a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-msft-buy-from-two-data-sources.spec.ts+++ b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-msft-buy-from-two-data-sources.spec.ts@@ -6,13 +6,13 @@ import {import { PortfolioCalculatorFactory } from '@ghostfolio/api/app/portfolio/calculator/portfolio-calculator.factory';import { CurrentRateService } from '@ghostfolio/api/app/portfolio/current-rate.service';import { CurrentRateServiceMock } from '@ghostfolio/api/app/portfolio/current-rate.service.mock';-import { RedisCacheService } from '@ghostfolio/api/app/redis-cache/redis-cache.service';-import { RedisCacheServiceMock } from '@ghostfolio/api/app/redis-cache/redis-cache.service.mock';import { ConfigurationService } from '@ghostfolio/api/services/configuration/configuration.service';import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.service';import { ExchangeRateDataServiceMock } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.service.mock';import { PortfolioSnapshotService } from '@ghostfolio/api/services/queues/portfolio-snapshot/portfolio-snapshot.service';import { PortfolioSnapshotServiceMock } from '@ghostfolio/api/services/queues/portfolio-snapshot/portfolio-snapshot.service.mock';+import { RedisCacheService } from '@ghostfolio/api/services/redis-cache/redis-cache.service';+import { RedisCacheServiceMock } from '@ghostfolio/api/services/redis-cache/redis-cache.service.mock';import { parseDate } from '@ghostfolio/common/helper';import { Activity } from '@ghostfolio/common/interfaces';import { PerformanceCalculationType } from '@ghostfolio/common/types/performance-calculation-type.type';@@ -38,7 +38,7 @@ jest.mock(});-jest.mock('@ghostfolio/api/app/redis-cache/redis-cache.service', () => {+jest.mock('@ghostfolio/api/services/redis-cache/redis-cache.service', () => {return {RedisCacheService: jest.fn().mockImplementation(() => {return RedisCacheServiceMock;diff --git a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-msft-buy-with-dividend.spec.ts b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-msft-buy-with-dividend.spec.tsindex 2b89ddd31b..b3e67a0793 100644--- a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-msft-buy-with-dividend.spec.ts+++ b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-msft-buy-with-dividend.spec.ts@@ -6,12 +6,12 @@ import {import { PortfolioCalculatorFactory } from '@ghostfolio/api/app/portfolio/calculator/portfolio-calculator.factory';import { CurrentRateService } from '@ghostfolio/api/app/portfolio/current-rate.service';import { CurrentRateServiceMock } from '@ghostfolio/api/app/portfolio/current-rate.service.mock';-import { RedisCacheService } from '@ghostfolio/api/app/redis-cache/redis-cache.service';-import { RedisCacheServiceMock } from '@ghostfolio/api/app/redis-cache/redis-cache.service.mock';import { ConfigurationService } from '@ghostfolio/api/services/configuration/configuration.service';import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.service';import { PortfolioSnapshotService } from '@ghostfolio/api/services/queues/portfolio-snapshot/portfolio-snapshot.service';import { PortfolioSnapshotServiceMock } from '@ghostfolio/api/services/queues/portfolio-snapshot/portfolio-snapshot.service.mock';+import { RedisCacheService } from '@ghostfolio/api/services/redis-cache/redis-cache.service';+import { RedisCacheServiceMock } from '@ghostfolio/api/services/redis-cache/redis-cache.service.mock';import { parseDate } from '@ghostfolio/common/helper';import { PerformanceCalculationType } from '@ghostfolio/common/types/performance-calculation-type.type';@@ -36,7 +36,7 @@ jest.mock(});-jest.mock('@ghostfolio/api/app/redis-cache/redis-cache.service', () => {+jest.mock('@ghostfolio/api/services/redis-cache/redis-cache.service', () => {return {RedisCacheService: jest.fn().mockImplementation(() => {return RedisCacheServiceMock;diff --git a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-no-activities.spec.ts b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-no-activities.spec.tsindex f248114fe4..2326e3486f 100644--- a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-no-activities.spec.ts+++ b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-no-activities.spec.ts@@ -2,12 +2,12 @@ import { userDummyData } from '@ghostfolio/api/app/portfolio/calculator/portfoliimport { PortfolioCalculatorFactory } from '@ghostfolio/api/app/portfolio/calculator/portfolio-calculator.factory';import { CurrentRateService } from '@ghostfolio/api/app/portfolio/current-rate.service';import { CurrentRateServiceMock } from '@ghostfolio/api/app/portfolio/current-rate.service.mock';-import { RedisCacheService } from '@ghostfolio/api/app/redis-cache/redis-cache.service';-import { RedisCacheServiceMock } from '@ghostfolio/api/app/redis-cache/redis-cache.service.mock';import { ConfigurationService } from '@ghostfolio/api/services/configuration/configuration.service';import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.service';import { PortfolioSnapshotService } from '@ghostfolio/api/services/queues/portfolio-snapshot/portfolio-snapshot.service';import { PortfolioSnapshotServiceMock } from '@ghostfolio/api/services/queues/portfolio-snapshot/portfolio-snapshot.service.mock';+import { RedisCacheService } from '@ghostfolio/api/services/redis-cache/redis-cache.service';+import { RedisCacheServiceMock } from '@ghostfolio/api/services/redis-cache/redis-cache.service.mock';import { parseDate } from '@ghostfolio/common/helper';import { PerformanceCalculationType } from '@ghostfolio/common/types/performance-calculation-type.type';@@ -32,7 +32,7 @@ jest.mock(});-jest.mock('@ghostfolio/api/app/redis-cache/redis-cache.service', () => {+jest.mock('@ghostfolio/api/services/redis-cache/redis-cache.service', () => {return {RedisCacheService: jest.fn().mockImplementation(() => {return RedisCacheServiceMock;diff --git a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-novn-buy-and-sell-partially.spec.ts b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-novn-buy-and-sell-partially.spec.tsindex e85a053e61..1e12a6aa2c 100644--- a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-novn-buy-and-sell-partially.spec.ts+++ b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-novn-buy-and-sell-partially.spec.ts@@ -5,12 +5,12 @@ import {import { PortfolioCalculatorFactory } from '@ghostfolio/api/app/portfolio/calculator/portfolio-calculator.factory';import { CurrentRateService } from '@ghostfolio/api/app/portfolio/current-rate.service';import { CurrentRateServiceMock } from '@ghostfolio/api/app/portfolio/current-rate.service.mock';-import { RedisCacheService } from '@ghostfolio/api/app/redis-cache/redis-cache.service';-import { RedisCacheServiceMock } from '@ghostfolio/api/app/redis-cache/redis-cache.service.mock';import { ConfigurationService } from '@ghostfolio/api/services/configuration/configuration.service';import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.service';import { PortfolioSnapshotService } from '@ghostfolio/api/services/queues/portfolio-snapshot/portfolio-snapshot.service';import { PortfolioSnapshotServiceMock } from '@ghostfolio/api/services/queues/portfolio-snapshot/portfolio-snapshot.service.mock';+import { RedisCacheService } from '@ghostfolio/api/services/redis-cache/redis-cache.service';+import { RedisCacheServiceMock } from '@ghostfolio/api/services/redis-cache/redis-cache.service.mock';import { parseDate } from '@ghostfolio/common/helper';import { PerformanceCalculationType } from '@ghostfolio/common/types/performance-calculation-type.type';@@ -35,7 +35,7 @@ jest.mock(});-jest.mock('@ghostfolio/api/app/redis-cache/redis-cache.service', () => {+jest.mock('@ghostfolio/api/services/redis-cache/redis-cache.service', () => {return {RedisCacheService: jest.fn().mockImplementation(() => {return RedisCacheServiceMock;diff --git a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-novn-buy-and-sell.spec.ts b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-novn-buy-and-sell.spec.tsindex a0174b048e..f5c7923853 100644--- a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-novn-buy-and-sell.spec.ts+++ b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-novn-buy-and-sell.spec.ts@@ -5,12 +5,12 @@ import {import { PortfolioCalculatorFactory } from '@ghostfolio/api/app/portfolio/calculator/portfolio-calculator.factory';import { CurrentRateService } from '@ghostfolio/api/app/portfolio/current-rate.service';import { CurrentRateServiceMock } from '@ghostfolio/api/app/portfolio/current-rate.service.mock';-import { RedisCacheService } from '@ghostfolio/api/app/redis-cache/redis-cache.service';-import { RedisCacheServiceMock } from '@ghostfolio/api/app/redis-cache/redis-cache.service.mock';import { ConfigurationService } from '@ghostfolio/api/services/configuration/configuration.service';import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.service';import { PortfolioSnapshotService } from '@ghostfolio/api/services/queues/portfolio-snapshot/portfolio-snapshot.service';import { PortfolioSnapshotServiceMock } from '@ghostfolio/api/services/queues/portfolio-snapshot/portfolio-snapshot.service.mock';+import { RedisCacheService } from '@ghostfolio/api/services/redis-cache/redis-cache.service';+import { RedisCacheServiceMock } from '@ghostfolio/api/services/redis-cache/redis-cache.service.mock';import { parseDate } from '@ghostfolio/common/helper';import { PerformanceCalculationType } from '@ghostfolio/common/types/performance-calculation-type.type';@@ -35,7 +35,7 @@ jest.mock(});-jest.mock('@ghostfolio/api/app/redis-cache/redis-cache.service', () => {+jest.mock('@ghostfolio/api/services/redis-cache/redis-cache.service', () => {return {RedisCacheService: jest.fn().mockImplementation(() => {return RedisCacheServiceMock;diff --git a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-stock-split.spec.ts b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-stock-split.spec.tsindex f45e453734..1292cbe04f 100644--- a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-stock-split.spec.ts+++ b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-stock-split.spec.ts@@ -6,13 +6,13 @@ import {import { PortfolioCalculatorFactory } from '@ghostfolio/api/app/portfolio/calculator/portfolio-calculator.factory';import { CurrentRateService } from '@ghostfolio/api/app/portfolio/current-rate.service';import { CurrentRateServiceMock } from '@ghostfolio/api/app/portfolio/current-rate.service.mock';-import { RedisCacheService } from '@ghostfolio/api/app/redis-cache/redis-cache.service';-import { RedisCacheServiceMock } from '@ghostfolio/api/app/redis-cache/redis-cache.service.mock';import { adjustActivityBySplits } from '@ghostfolio/api/services/asset-profile-split/asset-profile-split.helper';import { ConfigurationService } from '@ghostfolio/api/services/configuration/configuration.service';import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.service';import { PortfolioSnapshotService } from '@ghostfolio/api/services/queues/portfolio-snapshot/portfolio-snapshot.service';import { PortfolioSnapshotServiceMock } from '@ghostfolio/api/services/queues/portfolio-snapshot/portfolio-snapshot.service.mock';+import { RedisCacheService } from '@ghostfolio/api/services/redis-cache/redis-cache.service';+import { RedisCacheServiceMock } from '@ghostfolio/api/services/redis-cache/redis-cache.service.mock';import { parseDate } from '@ghostfolio/common/helper';import { Activity } from '@ghostfolio/common/interfaces';import { PerformanceCalculationType } from '@ghostfolio/common/types/performance-calculation-type.type';@@ -39,7 +39,7 @@ jest.mock(});-jest.mock('@ghostfolio/api/app/redis-cache/redis-cache.service', () => {+jest.mock('@ghostfolio/api/services/redis-cache/redis-cache.service', () => {return {RedisCacheService: jest.fn().mockImplementation(() => {return RedisCacheServiceMock;diff --git a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-valuable.spec.ts b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-valuable.spec.tsindex 3d0ab45f85..69df7ac49b 100644--- a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-valuable.spec.ts+++ b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-valuable.spec.ts@@ -6,12 +6,12 @@ import {import { PortfolioCalculatorFactory } from '@ghostfolio/api/app/portfolio/calculator/portfolio-calculator.factory';import { CurrentRateService } from '@ghostfolio/api/app/portfolio/current-rate.service';import { CurrentRateServiceMock } from '@ghostfolio/api/app/portfolio/current-rate.service.mock';-import { RedisCacheService } from '@ghostfolio/api/app/redis-cache/redis-cache.service';-import { RedisCacheServiceMock } from '@ghostfolio/api/app/redis-cache/redis-cache.service.mock';import { ConfigurationService } from '@ghostfolio/api/services/configuration/configuration.service';import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.service';import { PortfolioSnapshotService } from '@ghostfolio/api/services/queues/portfolio-snapshot/portfolio-snapshot.service';import { PortfolioSnapshotServiceMock } from '@ghostfolio/api/services/queues/portfolio-snapshot/portfolio-snapshot.service.mock';+import { RedisCacheService } from '@ghostfolio/api/services/redis-cache/redis-cache.service';+import { RedisCacheServiceMock } from '@ghostfolio/api/services/redis-cache/redis-cache.service.mock';import { parseDate } from '@ghostfolio/common/helper';import { Activity } from '@ghostfolio/common/interfaces';import { PerformanceCalculationType } from '@ghostfolio/common/types/performance-calculation-type.type';@@ -37,7 +37,7 @@ jest.mock(});-jest.mock('@ghostfolio/api/app/redis-cache/redis-cache.service', () => {+jest.mock('@ghostfolio/api/services/redis-cache/redis-cache.service', () => {return {RedisCacheService: jest.fn().mockImplementation(() => {return RedisCacheServiceMock;diff --git a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator.spec.ts b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator.spec.tsindex c2779c2c14..9400ec20ff 100644--- a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator.spec.ts+++ b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator.spec.ts@@ -7,12 +7,12 @@ import { userDummyData } from '@ghostfolio/api/app/portfolio/calculator/portfoliimport { PortfolioCalculatorFactory } from '@ghostfolio/api/app/portfolio/calculator/portfolio-calculator.factory';import { CurrentRateService } from '@ghostfolio/api/app/portfolio/current-rate.service';import { CurrentRateServiceMock } from '@ghostfolio/api/app/portfolio/current-rate.service.mock';-import { RedisCacheService } from '@ghostfolio/api/app/redis-cache/redis-cache.service';-import { RedisCacheServiceMock } from '@ghostfolio/api/app/redis-cache/redis-cache.service.mock';import { ConfigurationService } from '@ghostfolio/api/services/configuration/configuration.service';import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.service';import { PortfolioSnapshotService } from '@ghostfolio/api/services/queues/portfolio-snapshot/portfolio-snapshot.service';import { PortfolioSnapshotServiceMock } from '@ghostfolio/api/services/queues/portfolio-snapshot/portfolio-snapshot.service.mock';+import { RedisCacheService } from '@ghostfolio/api/services/redis-cache/redis-cache.service';+import { RedisCacheServiceMock } from '@ghostfolio/api/services/redis-cache/redis-cache.service.mock';import { getIntervalFromDateRange } from '@ghostfolio/common/calculation-helper';import { HistoricalDataItem } from '@ghostfolio/common/interfaces';import { PerformanceCalculationType } from '@ghostfolio/common/types/performance-calculation-type.type';@@ -36,7 +36,7 @@ jest.mock(});-jest.mock('@ghostfolio/api/app/redis-cache/redis-cache.service', () => {+jest.mock('@ghostfolio/api/services/redis-cache/redis-cache.service', () => {return {RedisCacheService: jest.fn().mockImplementation(() => {return RedisCacheServiceMock;diff --git a/apps/api/src/app/portfolio/calculator/roi/portfolio-calculator-baln-buy-and-buy.spec.ts b/apps/api/src/app/portfolio/calculator/roi/portfolio-calculator-baln-buy-and-buy.spec.tsindex a7167a2de1..e2c7d1e5a8 100644--- a/apps/api/src/app/portfolio/calculator/roi/portfolio-calculator-baln-buy-and-buy.spec.ts+++ b/apps/api/src/app/portfolio/calculator/roi/portfolio-calculator-baln-buy-and-buy.spec.ts@@ -5,12 +5,12 @@ import {import { PortfolioCalculatorFactory } from '@ghostfolio/api/app/portfolio/calculator/portfolio-calculator.factory';import { CurrentRateService } from '@ghostfolio/api/app/portfolio/current-rate.service';import { CurrentRateServiceMock } from '@ghostfolio/api/app/portfolio/current-rate.service.mock';-import { RedisCacheService } from '@ghostfolio/api/app/redis-cache/redis-cache.service';-import { RedisCacheServiceMock } from '@ghostfolio/api/app/redis-cache/redis-cache.service.mock';import { ConfigurationService } from '@ghostfolio/api/services/configuration/configuration.service';import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.service';import { PortfolioSnapshotService } from '@ghostfolio/api/services/queues/portfolio-snapshot/portfolio-snapshot.service';import { PortfolioSnapshotServiceMock } from '@ghostfolio/api/services/queues/portfolio-snapshot/portfolio-snapshot.service.mock';+import { RedisCacheService } from '@ghostfolio/api/services/redis-cache/redis-cache.service';+import { RedisCacheServiceMock } from '@ghostfolio/api/services/redis-cache/redis-cache.service.mock';import { parseDate } from '@ghostfolio/common/helper';import { PerformanceCalculationType } from '@ghostfolio/common/types/performance-calculation-type.type';@@ -35,7 +35,7 @@ jest.mock(});-jest.mock('@ghostfolio/api/app/redis-cache/redis-cache.service', () => {+jest.mock('@ghostfolio/api/services/redis-cache/redis-cache.service', () => {return {RedisCacheService: jest.fn().mockImplementation(() => {return RedisCacheServiceMock;diff --git a/apps/api/src/app/portfolio/calculator/roi/portfolio-calculator-baln-buy-and-sell.spec.ts b/apps/api/src/app/portfolio/calculator/roi/portfolio-calculator-baln-buy-and-sell.spec.tsindex 02300923dd..3a228349c2 100644--- a/apps/api/src/app/portfolio/calculator/roi/portfolio-calculator-baln-buy-and-sell.spec.ts+++ b/apps/api/src/app/portfolio/calculator/roi/portfolio-calculator-baln-buy-and-sell.spec.ts@@ -6,12 +6,12 @@ import {import { PortfolioCalculatorFactory } from '@ghostfolio/api/app/portfolio/calculator/portfolio-calculator.factory';import { CurrentRateService } from '@ghostfolio/api/app/portfolio/current-rate.service';import { CurrentRateServiceMock } from '@ghostfolio/api/app/portfolio/current-rate.service.mock';-import { RedisCacheService } from '@ghostfolio/api/app/redis-cache/redis-cache.service';-import { RedisCacheServiceMock } from '@ghostfolio/api/app/redis-cache/redis-cache.service.mock';import { ConfigurationService } from '@ghostfolio/api/services/configuration/configuration.service';import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.service';import { PortfolioSnapshotService } from '@ghostfolio/api/services/queues/portfolio-snapshot/portfolio-snapshot.service';import { PortfolioSnapshotServiceMock } from '@ghostfolio/api/services/queues/portfolio-snapshot/portfolio-snapshot.service.mock';+import { RedisCacheService } from '@ghostfolio/api/services/redis-cache/redis-cache.service';+import { RedisCacheServiceMock } from '@ghostfolio/api/services/redis-cache/redis-cache.service.mock';import { parseDate } from '@ghostfolio/common/helper';import { PerformanceCalculationType } from '@ghostfolio/common/types/performance-calculation-type.type';@@ -36,7 +36,7 @@ jest.mock(});-jest.mock('@ghostfolio/api/app/redis-cache/redis-cache.service', () => {+jest.mock('@ghostfolio/api/services/redis-cache/redis-cache.service', () => {return {RedisCacheService: jest.fn().mockImplementation(() => {return RedisCacheServiceMock;diff --git a/apps/api/src/app/portfolio/calculator/roi/portfolio-calculator-baln-buy.spec.ts b/apps/api/src/app/portfolio/calculator/roi/portfolio-calculator-baln-buy.spec.tsindex c590f4503f..9bfcd12b2a 100644--- a/apps/api/src/app/portfolio/calculator/roi/portfolio-calculator-baln-buy.spec.ts+++ b/apps/api/src/app/portfolio/calculator/roi/portfolio-calculator-baln-buy.spec.ts@@ -5,12 +5,12 @@ import {import { PortfolioCalculatorFactory } from '@ghostfolio/api/app/portfolio/calculator/portfolio-calculator.factory';import { CurrentRateService } from '@ghostfolio/api/app/portfolio/current-rate.service';import { CurrentRateServiceMock } from '@ghostfolio/api/app/portfolio/current-rate.service.mock';-import { RedisCacheService } from '@ghostfolio/api/app/redis-cache/redis-cache.service';-import { RedisCacheServiceMock } from '@ghostfolio/api/app/redis-cache/redis-cache.service.mock';import { ConfigurationService } from '@ghostfolio/api/services/configuration/configuration.service';import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.service';import { PortfolioSnapshotService } from '@ghostfolio/api/services/queues/portfolio-snapshot/portfolio-snapshot.service';import { PortfolioSnapshotServiceMock } from '@ghostfolio/api/services/queues/portfolio-snapshot/portfolio-snapshot.service.mock';+import { RedisCacheService } from '@ghostfolio/api/services/redis-cache/redis-cache.service';+import { RedisCacheServiceMock } from '@ghostfolio/api/services/redis-cache/redis-cache.service.mock';import { parseDate } from '@ghostfolio/common/helper';import { PerformanceCalculationType } from '@ghostfolio/common/types/performance-calculation-type.type';@@ -35,7 +35,7 @@ jest.mock(});-jest.mock('@ghostfolio/api/app/redis-cache/redis-cache.service', () => {+jest.mock('@ghostfolio/api/services/redis-cache/redis-cache.service', () => {return {RedisCacheService: jest.fn().mockImplementation(() => {return RedisCacheServiceMock;diff --git a/apps/api/src/app/portfolio/calculator/roi/portfolio-calculator-baln-sell-and-buy-on-same-day.spec.ts b/apps/api/src/app/portfolio/calculator/roi/portfolio-calculator-baln-sell-and-buy-on-same-day.spec.tsindex 6a66322fcb..080901f3a5 100644--- a/apps/api/src/app/portfolio/calculator/roi/portfolio-calculator-baln-sell-and-buy-on-same-day.spec.ts+++ b/apps/api/src/app/portfolio/calculator/roi/portfolio-calculator-baln-sell-and-buy-on-same-day.spec.ts@@ -7,12 +7,12 @@ import {import { PortfolioCalculatorFactory } from '@ghostfolio/api/app/portfolio/calculator/portfolio-calculator.factory';import { CurrentRateService } from '@ghostfolio/api/app/portfolio/current-rate.service';import { CurrentRateServiceMock } from '@ghostfolio/api/app/portfolio/current-rate.service.mock';-import { RedisCacheService } from '@ghostfolio/api/app/redis-cache/redis-cache.service';-import { RedisCacheServiceMock } from '@ghostfolio/api/app/redis-cache/redis-cache.service.mock';import { ConfigurationService } from '@ghostfolio/api/services/configuration/configuration.service';import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.service';import { PortfolioSnapshotService } from '@ghostfolio/api/services/queues/portfolio-snapshot/portfolio-snapshot.service';import { PortfolioSnapshotServiceMock } from '@ghostfolio/api/services/queues/portfolio-snapshot/portfolio-snapshot.service.mock';+import { RedisCacheService } from '@ghostfolio/api/services/redis-cache/redis-cache.service';+import { RedisCacheServiceMock } from '@ghostfolio/api/services/redis-cache/redis-cache.service.mock';import { parseDate } from '@ghostfolio/common/helper';import { Activity } from '@ghostfolio/common/interfaces';import { PerformanceCalculationType } from '@ghostfolio/common/types/performance-calculation-type.type';@@ -38,7 +38,7 @@ jest.mock(});-jest.mock('@ghostfolio/api/app/redis-cache/redis-cache.service', () => {+jest.mock('@ghostfolio/api/services/redis-cache/redis-cache.service', () => {return {RedisCacheService: jest.fn().mockImplementation(() => {return RedisCacheServiceMock;diff --git a/apps/api/src/app/portfolio/calculator/roi/portfolio-calculator-btcusd-buy-and-sell-partially.spec.ts b/apps/api/src/app/portfolio/calculator/roi/portfolio-calculator-btcusd-buy-and-sell-partially.spec.tsindex 3d6a9e35ad..8aa8c6bb07 100644--- a/apps/api/src/app/portfolio/calculator/roi/portfolio-calculator-btcusd-buy-and-sell-partially.spec.ts+++ b/apps/api/src/app/portfolio/calculator/roi/portfolio-calculator-btcusd-buy-and-sell-partially.spec.ts@@ -6,13 +6,13 @@ import {import { PortfolioCalculatorFactory } from '@ghostfolio/api/app/portfolio/calculator/portfolio-calculator.factory';import { CurrentRateService } from '@ghostfolio/api/app/portfolio/current-rate.service';import { CurrentRateServiceMock } from '@ghostfolio/api/app/portfolio/current-rate.service.mock';-import { RedisCacheService } from '@ghostfolio/api/app/redis-cache/redis-cache.service';-import { RedisCacheServiceMock } from '@ghostfolio/api/app/redis-cache/redis-cache.service.mock';import { ConfigurationService } from '@ghostfolio/api/services/configuration/configuration.service';import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.service';import { ExchangeRateDataServiceMock } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.service.mock';import { PortfolioSnapshotService } from '@ghostfolio/api/services/queues/portfolio-snapshot/portfolio-snapshot.service';import { PortfolioSnapshotServiceMock } from '@ghostfolio/api/services/queues/portfolio-snapshot/portfolio-snapshot.service.mock';+import { RedisCacheService } from '@ghostfolio/api/services/redis-cache/redis-cache.service';+import { RedisCacheServiceMock } from '@ghostfolio/api/services/redis-cache/redis-cache.service.mock';import { getIntervalFromDateRange } from '@ghostfolio/common/calculation-helper';import { parseDate } from '@ghostfolio/common/helper';import { PerformanceCalculationType } from '@ghostfolio/common/types/performance-calculation-type.type';@@ -38,7 +38,7 @@ jest.mock(});-jest.mock('@ghostfolio/api/app/redis-cache/redis-cache.service', () => {+jest.mock('@ghostfolio/api/services/redis-cache/redis-cache.service', () => {return {RedisCacheService: jest.fn().mockImplementation(() => {return RedisCacheServiceMock;diff --git a/apps/api/src/app/portfolio/calculator/roi/portfolio-calculator-cash.spec.ts b/apps/api/src/app/portfolio/calculator/roi/portfolio-calculator-cash.spec.tsindex 59060483ce..1f44b6ce2b 100644--- a/apps/api/src/app/portfolio/calculator/roi/portfolio-calculator-cash.spec.ts+++ b/apps/api/src/app/portfolio/calculator/roi/portfolio-calculator-cash.spec.ts@@ -10,8 +10,6 @@ import {import { PortfolioCalculatorFactory } from '@ghostfolio/api/app/portfolio/calculator/portfolio-calculator.factory';import { CurrentRateService } from '@ghostfolio/api/app/portfolio/current-rate.service';import { CurrentRateServiceMock } from '@ghostfolio/api/app/portfolio/current-rate.service.mock';-import { RedisCacheService } from '@ghostfolio/api/app/redis-cache/redis-cache.service';-import { RedisCacheServiceMock } from '@ghostfolio/api/app/redis-cache/redis-cache.service.mock';import { AssetProfileSplitService } from '@ghostfolio/api/services/asset-profile-split/asset-profile-split.service';import { ConfigurationService } from '@ghostfolio/api/services/configuration/configuration.service';import { DataProviderService } from '@ghostfolio/api/services/data-provider/data-provider.service';@@ -19,6 +17,8 @@ import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-import { ExchangeRateDataServiceMock } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.service.mock';import { PortfolioSnapshotService } from '@ghostfolio/api/services/queues/portfolio-snapshot/portfolio-snapshot.service';import { PortfolioSnapshotServiceMock } from '@ghostfolio/api/services/queues/portfolio-snapshot/portfolio-snapshot.service.mock';+import { RedisCacheService } from '@ghostfolio/api/services/redis-cache/redis-cache.service';+import { RedisCacheServiceMock } from '@ghostfolio/api/services/redis-cache/redis-cache.service.mock';import { parseDate } from '@ghostfolio/common/helper';import { PortfolioSnapshotHolding } from '@ghostfolio/common/models';import { PerformanceCalculationType } from '@ghostfolio/common/types/performance-calculation-type.type';@@ -58,7 +58,7 @@ jest.mock(});-jest.mock('@ghostfolio/api/app/redis-cache/redis-cache.service', () => {+jest.mock('@ghostfolio/api/services/redis-cache/redis-cache.service', () => {return {RedisCacheService: jest.fn().mockImplementation(() => {return RedisCacheServiceMock;diff --git a/apps/api/src/app/portfolio/calculator/roi/portfolio-calculator-msft-buy-with-dividend.spec.ts b/apps/api/src/app/portfolio/calculator/roi/portfolio-calculator-msft-buy-with-dividend.spec.tsindex 0c0e32d931..31173e4f14 100644--- a/apps/api/src/app/portfolio/calculator/roi/portfolio-calculator-msft-buy-with-dividend.spec.ts+++ b/apps/api/src/app/portfolio/calculator/roi/portfolio-calculator-msft-buy-with-dividend.spec.ts@@ -6,12 +6,12 @@ import {import { PortfolioCalculatorFactory } from '@ghostfolio/api/app/portfolio/calculator/portfolio-calculator.factory';import { CurrentRateService } from '@ghostfolio/api/app/portfolio/current-rate.service';import { CurrentRateServiceMock } from '@ghostfolio/api/app/portfolio/current-rate.service.mock';-import { RedisCacheService } from '@ghostfolio/api/app/redis-cache/redis-cache.service';-import { RedisCacheServiceMock } from '@ghostfolio/api/app/redis-cache/redis-cache.service.mock';import { ConfigurationService } from '@ghostfolio/api/services/configuration/configuration.service';import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.service';import { PortfolioSnapshotService } from '@ghostfolio/api/services/queues/portfolio-snapshot/portfolio-snapshot.service';import { PortfolioSnapshotServiceMock } from '@ghostfolio/api/services/queues/portfolio-snapshot/portfolio-snapshot.service.mock';+import { RedisCacheService } from '@ghostfolio/api/services/redis-cache/redis-cache.service';+import { RedisCacheServiceMock } from '@ghostfolio/api/services/redis-cache/redis-cache.service.mock';import { parseDate } from '@ghostfolio/common/helper';import { PerformanceCalculationType } from '@ghostfolio/common/types/performance-calculation-type.type';@@ -36,7 +36,7 @@ jest.mock(});-jest.mock('@ghostfolio/api/app/redis-cache/redis-cache.service', () => {+jest.mock('@ghostfolio/api/services/redis-cache/redis-cache.service', () => {return {RedisCacheService: jest.fn().mockImplementation(() => {return RedisCacheServiceMock;diff --git a/apps/api/src/app/portfolio/portfolio.module.ts b/apps/api/src/app/portfolio/portfolio.module.tsindex 7f7a894df0..82eeb5395a 100644--- a/apps/api/src/app/portfolio/portfolio.module.ts+++ b/apps/api/src/app/portfolio/portfolio.module.ts@@ -2,7 +2,6 @@ import { AccessModule } from '@ghostfolio/api/app/access/access.module';import { AccountBalanceService } from '@ghostfolio/api/app/account-balance/account-balance.service';import { AccountService } from '@ghostfolio/api/app/account/account.service';import { ActivitiesModule } from '@ghostfolio/api/app/activities/activities.module';-import { RedisCacheModule } from '@ghostfolio/api/app/redis-cache/redis-cache.module';import { UserModule } from '@ghostfolio/api/app/user/user.module';import { PerformanceLoggingModule } from '@ghostfolio/api/interceptors/performance-logging/performance-logging.module';import { RedactValuesInResponseModule } from '@ghostfolio/api/interceptors/redact-values-in-response/redact-values-in-response.module';@@ -19,6 +18,7 @@ import { MarketDataModule } from '@ghostfolio/api/services/market-data/market-daimport { PrismaModule } from '@ghostfolio/api/services/prisma/prisma.module';import { DataGatheringQueueModule } from '@ghostfolio/api/services/queues/data-gathering/data-gathering.module';import { PortfolioSnapshotQueueModule } from '@ghostfolio/api/services/queues/portfolio-snapshot/portfolio-snapshot.module';+import { RedisCacheModule } from '@ghostfolio/api/services/redis-cache/redis-cache.module';import { SymbolProfileModule } from '@ghostfolio/api/services/symbol-profile/symbol-profile.module';import { TagModule } from '@ghostfolio/api/services/tag/tag.module';diff --git a/apps/api/src/events/events.module.ts b/apps/api/src/events/events.module.tsindex dabc3edb77..b04a59a00e 100644--- a/apps/api/src/events/events.module.ts+++ b/apps/api/src/events/events.module.ts@@ -1,5 +1,4 @@import { ActivitiesModule } from '@ghostfolio/api/app/activities/activities.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/configuration.module';@@ -7,6 +6,7 @@ import { DataProviderModule } from '@ghostfolio/api/services/data-provider/data-import { ExchangeRateDataModule } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.module';import { DataGatheringQueueModule } from '@ghostfolio/api/services/queues/data-gathering/data-gathering.module';import { PortfolioSnapshotQueueModule } from '@ghostfolio/api/services/queues/portfolio-snapshot/portfolio-snapshot.module';+import { RedisCacheModule } from '@ghostfolio/api/services/redis-cache/redis-cache.module';import { Module } from '@nestjs/common';diff --git a/apps/api/src/events/portfolio-changed.listener.ts b/apps/api/src/events/portfolio-changed.listener.tsindex 9397eb0e52..a081e1bbdb 100644--- a/apps/api/src/events/portfolio-changed.listener.ts+++ b/apps/api/src/events/portfolio-changed.listener.ts@@ -1,7 +1,7 @@-import { RedisCacheService } from '@ghostfolio/api/app/redis-cache/redis-cache.service';import { UserService } from '@ghostfolio/api/app/user/user.service';import { ApiService } from '@ghostfolio/api/services/api/api.service';import { PortfolioSnapshotService } from '@ghostfolio/api/services/queues/portfolio-snapshot/portfolio-snapshot.service';+import { RedisCacheService } from '@ghostfolio/api/services/redis-cache/redis-cache.service';import {PORTFOLIO_SNAPSHOT_COMPUTATION_QUEUE_PRIORITY_LOW,PORTFOLIO_SNAPSHOT_PROCESS_JOB_NAME,diff --git a/apps/api/src/services/benchmark/benchmark.module.ts b/apps/api/src/services/benchmark/benchmark.module.tsindex 870ef244fe..561a951971 100644--- a/apps/api/src/services/benchmark/benchmark.module.ts+++ b/apps/api/src/services/benchmark/benchmark.module.ts@@ -1,8 +1,8 @@-import { RedisCacheModule } from '@ghostfolio/api/app/redis-cache/redis-cache.module';import { DataProviderModule } from '@ghostfolio/api/services/data-provider/data-provider.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 { RedisCacheModule } from '@ghostfolio/api/services/redis-cache/redis-cache.module';import { SymbolProfileModule } from '@ghostfolio/api/services/symbol-profile/symbol-profile.module';import { Module } from '@nestjs/common';diff --git a/apps/api/src/services/benchmark/benchmark.service.ts b/apps/api/src/services/benchmark/benchmark.service.tsindex 3c39848401..ea7bbaec12 100644--- a/apps/api/src/services/benchmark/benchmark.service.ts+++ b/apps/api/src/services/benchmark/benchmark.service.ts@@ -1,8 +1,8 @@-import { RedisCacheService } from '@ghostfolio/api/app/redis-cache/redis-cache.service';import { DataProviderService } from '@ghostfolio/api/services/data-provider/data-provider.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 { RedisCacheService } from '@ghostfolio/api/services/redis-cache/redis-cache.service';import { SymbolProfileService } from '@ghostfolio/api/services/symbol-profile/symbol-profile.service';import {CACHE_TTL_INFINITE,diff --git a/apps/api/src/services/data-provider/data-provider.module.ts b/apps/api/src/services/data-provider/data-provider.module.tsindex 2c6e9fce18..e932d387fd 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,3 @@-import { RedisCacheModule } from '@ghostfolio/api/app/redis-cache/redis-cache.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';@@ -14,6 +13,7 @@ import { FetchModule } from '@ghostfolio/api/services/fetch/fetch.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 { RedisCacheModule } from '@ghostfolio/api/services/redis-cache/redis-cache.module';import { SymbolProfileModule } from '@ghostfolio/api/services/symbol-profile/symbol-profile.module';import { Module } from '@nestjs/common';diff --git a/apps/api/src/services/data-provider/data-provider.service.spec.ts b/apps/api/src/services/data-provider/data-provider.service.spec.tsindex 20f5acaadb..815ab2743e 100644--- a/apps/api/src/services/data-provider/data-provider.service.spec.ts+++ b/apps/api/src/services/data-provider/data-provider.service.spec.ts@@ -1,9 +1,9 @@-import { RedisCacheService } from '@ghostfolio/api/app/redis-cache/redis-cache.service';import { ConfigurationService } from '@ghostfolio/api/services/configuration/configuration.service';import { DataProviderInterface } from '@ghostfolio/api/services/data-provider/interfaces/data-provider.interface';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 { RedisCacheService } from '@ghostfolio/api/services/redis-cache/redis-cache.service';import { DataSource } from '@prisma/client';diff --git a/apps/api/src/services/data-provider/data-provider.service.ts b/apps/api/src/services/data-provider/data-provider.service.tsindex 3206b2442b..826e14d16a 100644--- a/apps/api/src/services/data-provider/data-provider.service.ts+++ b/apps/api/src/services/data-provider/data-provider.service.ts@@ -1,12 +1,12 @@import { ImportValidationError } from '@ghostfolio/api/app/import/errors/import-validation.error';import { ImportDataDto } from '@ghostfolio/api/app/import/import-data.dto';-import { RedisCacheService } from '@ghostfolio/api/app/redis-cache/redis-cache.service';import { getMaskedGhostfolioDataSource } from '@ghostfolio/api/helper/data-source.helper';import { ConfigurationService } from '@ghostfolio/api/services/configuration/configuration.service';import { DataProviderInterface } from '@ghostfolio/api/services/data-provider/interfaces/data-provider.interface';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 { RedisCacheService } from '@ghostfolio/api/services/redis-cache/redis-cache.service';import {DEFAULT_CURRENCY,DERIVED_CURRENCIES,diff --git a/apps/api/src/services/queues/portfolio-snapshot/portfolio-snapshot.module.ts b/apps/api/src/services/queues/portfolio-snapshot/portfolio-snapshot.module.tsindex 0da5298211..617bf1aae4 100644--- a/apps/api/src/services/queues/portfolio-snapshot/portfolio-snapshot.module.ts+++ b/apps/api/src/services/queues/portfolio-snapshot/portfolio-snapshot.module.ts@@ -2,12 +2,12 @@ import { AccountBalanceModule } from '@ghostfolio/api/app/account-balance/accounimport { ActivitiesModule } from '@ghostfolio/api/app/activities/activities.module';import { PortfolioCalculatorFactory } from '@ghostfolio/api/app/portfolio/calculator/portfolio-calculator.factory';import { CurrentRateService } from '@ghostfolio/api/app/portfolio/current-rate.service';-import { RedisCacheModule } from '@ghostfolio/api/app/redis-cache/redis-cache.module';import { ConfigurationModule } from '@ghostfolio/api/services/configuration/configuration.module';import { DataProviderModule } from '@ghostfolio/api/services/data-provider/data-provider.module';import { ExchangeRateDataModule } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.module';import { MarketDataModule } from '@ghostfolio/api/services/market-data/market-data.module';import { PortfolioSnapshotService } from '@ghostfolio/api/services/queues/portfolio-snapshot/portfolio-snapshot.service';+import { RedisCacheModule } from '@ghostfolio/api/services/redis-cache/redis-cache.module';import {DEFAULT_PROCESSOR_PORTFOLIO_SNAPSHOT_COMPUTATION_TIMEOUT,PORTFOLIO_SNAPSHOT_COMPUTATION_QUEUEdiff --git a/apps/api/src/services/queues/portfolio-snapshot/portfolio-snapshot.processor.ts b/apps/api/src/services/queues/portfolio-snapshot/portfolio-snapshot.processor.tsindex adc66e6028..b9628f9447 100644--- a/apps/api/src/services/queues/portfolio-snapshot/portfolio-snapshot.processor.ts+++ b/apps/api/src/services/queues/portfolio-snapshot/portfolio-snapshot.processor.ts@@ -2,8 +2,8 @@ import { AccountBalanceService } from '@ghostfolio/api/app/account-balance/accouimport { ActivitiesService } from '@ghostfolio/api/app/activities/activities.service';import { PortfolioCalculatorFactory } from '@ghostfolio/api/app/portfolio/calculator/portfolio-calculator.factory';import { PortfolioSnapshotValue } from '@ghostfolio/api/app/portfolio/interfaces/snapshot-value.interface';-import { RedisCacheService } from '@ghostfolio/api/app/redis-cache/redis-cache.service';import { ConfigurationService } from '@ghostfolio/api/services/configuration/configuration.service';+import { RedisCacheService } from '@ghostfolio/api/services/redis-cache/redis-cache.service';import {CACHE_TTL_INFINITE,DEFAULT_PROCESSOR_PORTFOLIO_SNAPSHOT_COMPUTATION_CONCURRENCY,diff --git a/apps/api/src/services/queues/portfolio-snapshot/portfolio-snapshot.service.mock.ts b/apps/api/src/services/queues/portfolio-snapshot/portfolio-snapshot.service.mock.tsindex fddbd01aba..11b794dfc8 100644--- a/apps/api/src/services/queues/portfolio-snapshot/portfolio-snapshot.service.mock.ts+++ b/apps/api/src/services/queues/portfolio-snapshot/portfolio-snapshot.service.mock.ts@@ -1,5 +1,5 @@import { PortfolioSnapshotValue } from '@ghostfolio/api/app/portfolio/interfaces/snapshot-value.interface';-import { RedisCacheServiceMock } from '@ghostfolio/api/app/redis-cache/redis-cache.service.mock';+import { RedisCacheServiceMock } from '@ghostfolio/api/services/redis-cache/redis-cache.service.mock';import type { Job, JobId, JobOptions } from 'bull';import ms from 'ms';diff --git a/apps/api/src/app/redis-cache/redis-cache.module.ts b/apps/api/src/services/redis-cache/redis-cache.module.tssimilarity index 100%rename from apps/api/src/app/redis-cache/redis-cache.module.tsrename to apps/api/src/services/redis-cache/redis-cache.module.tsdiff --git a/apps/api/src/app/redis-cache/redis-cache.service.mock.ts b/apps/api/src/services/redis-cache/redis-cache.service.mock.tssimilarity index 100%rename from apps/api/src/app/redis-cache/redis-cache.service.mock.tsrename to apps/api/src/services/redis-cache/redis-cache.service.mock.tsdiff --git a/apps/api/src/app/redis-cache/redis-cache.service.ts b/apps/api/src/services/redis-cache/redis-cache.service.tssimilarity index 100%rename from apps/api/src/app/redis-cache/redis-cache.service.tsrename to apps/api/src/services/redis-cache/redis-cache.service.ts