Set up caching

apps/api/src/app/portfolio/calculator/mwr/portfolio-calculator.ts

@@ -1,7 +1,6 @@
 import { PortfolioCalculator } from '@ghostfolio/api/app/portfolio/calculator/portfolio-calculator';
-import { PortfolioSnapshot } from '@ghostfolio/api/app/portfolio/interfaces/portfolio-snapshot.interface';
 import { SymbolMetrics, UniqueAsset } from '@ghostfolio/common/interfaces';
-import { TimelinePosition } from '@ghostfolio/common/models';
+import { PortfolioSnapshot, TimelinePosition } from '@ghostfolio/common/models';
 
 export class MWRPortfolioCalculator extends PortfolioCalculator {
   protected calculateOverallPerformance(

apps/api/src/app/portfolio/calculator/portfolio-calculator-test-utils.ts

@@ -24,3 +24,7 @@ export const symbolProfileDummyData = {
   sectors: [],
   updatedAt: undefined
 };
+
+export const userDummyData = {
+  id: 'xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx'
+};

apps/api/src/app/portfolio/calculator/portfolio-calculator.factory.ts

@@ -1,9 +1,10 @@
 import { Activity } from '@ghostfolio/api/app/order/interfaces/activities.interface';
 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 { HistoricalDataItem } from '@ghostfolio/common/interfaces';
-import { DateRange } from '@ghostfolio/common/types';
+import { DateRange, UserWithSettings } from '@ghostfolio/common/types';
 
 import { Injectable } from '@nestjs/common';
 
@@ -19,6 +20,7 @@ export enum PerformanceCalculationType {
 @Injectable()
 export class PortfolioCalculatorFactory {
   public constructor(
+    private readonly configurationService: ConfigurationService,
     private readonly currentRateService: CurrentRateService,
     private readonly exchangeRateDataService: ExchangeRateDataService,
     private readonly redisCacheService: RedisCacheService
@@ -29,13 +31,15 @@ export class PortfolioCalculatorFactory {
     activities,
     calculationType,
     currency,
-    dateRange = 'max'
+    dateRange = 'max',
+    userId
   }: {
     accountBalanceItems?: HistoricalDataItem[];
     activities: Activity[];
     calculationType: PerformanceCalculationType;
     currency: string;
     dateRange?: DateRange;
+    userId: string;
   }): PortfolioCalculator {
     switch (calculationType) {
       case PerformanceCalculationType.MWR:
@@ -44,6 +48,8 @@ export class PortfolioCalculatorFactory {
           activities,
           currency,
           dateRange,
+          userId,
+          configurationService: this.configurationService,
           currentRateService: this.currentRateService,
           exchangeRateDataService: this.exchangeRateDataService,
           redisCacheService: this.redisCacheService
@@ -55,6 +61,8 @@ export class PortfolioCalculatorFactory {
           currency,
           currentRateService: this.currentRateService,
           dateRange,
+          userId,
+          configurationService: this.configurationService,
           exchangeRateDataService: this.exchangeRateDataService,
           redisCacheService: this.redisCacheService
         });

apps/api/src/app/portfolio/calculator/portfolio-calculator.ts

@@ -1,7 +1,6 @@
 import { Activity } from '@ghostfolio/api/app/order/interfaces/activities.interface';
 import { CurrentRateService } from '@ghostfolio/api/app/portfolio/current-rate.service';
 import { PortfolioOrder } from '@ghostfolio/api/app/portfolio/interfaces/portfolio-order.interface';
-import { PortfolioSnapshot } from '@ghostfolio/api/app/portfolio/interfaces/portfolio-snapshot.interface';
 import { TransactionPointSymbol } from '@ghostfolio/api/app/portfolio/interfaces/transaction-point-symbol.interface';
 import { TransactionPoint } from '@ghostfolio/api/app/portfolio/interfaces/transaction-point.interface';
 import { RedisCacheService } from '@ghostfolio/api/app/redis-cache/redis-cache.service';
@@ -9,6 +8,7 @@ import {
   getFactor,
   getInterval
 } from '@ghostfolio/api/helper/portfolio.helper';
+import { ConfigurationService } from '@ghostfolio/api/services/configuration/configuration.service';
 import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.service';
 import { IDataGatheringItem } from '@ghostfolio/api/services/interfaces/interfaces';
 import { MAX_CHART_ITEMS } from '@ghostfolio/common/config';
@@ -26,10 +26,11 @@ import {
   SymbolMetrics,
   UniqueAsset
 } from '@ghostfolio/common/interfaces';
-import { TimelinePosition } from '@ghostfolio/common/models';
+import { PortfolioSnapshot, TimelinePosition } from '@ghostfolio/common/models';
 import { DateRange, GroupBy } from '@ghostfolio/common/types';
 
 import { Big } from 'big.js';
+import { plainToClass } from 'class-transformer';
 import {
   differenceInDays,
   eachDayOfInterval,
@@ -42,6 +43,7 @@ import {
   subDays
 } from 'date-fns';
 import { first, last, uniq, uniqBy } from 'lodash';
+import ms from 'ms';
 
 export abstract class PortfolioCalculator {
   protected static readonly ENABLE_LOGGING = false;
@@ -49,53 +51,74 @@ export abstract class PortfolioCalculator {
   protected accountBalanceItems: HistoricalDataItem[];
   protected orders: PortfolioOrder[];
 
+  private configurationService: ConfigurationService;
   private currency: string;
   private currentRateService: CurrentRateService;
   private dataProviderInfos: DataProviderInfo[];
   private endDate: Date;
   private exchangeRateDataService: ExchangeRateDataService;
+  private redisCacheService: RedisCacheService;
   private snapshot: PortfolioSnapshot;
   private snapshotPromise: Promise<void>;
   private startDate: Date;
   private transactionPoints: TransactionPoint[];
+  private userId: string;
 
   public constructor({
     accountBalanceItems,
     activities,
+    configurationService,
     currency,
     currentRateService,
     dateRange,
-    exchangeRateDataService
+    exchangeRateDataService,
+    redisCacheService,
+    userId
   }: {
     accountBalanceItems: HistoricalDataItem[];
     activities: Activity[];
+    configurationService: ConfigurationService;
     currency: string;
     currentRateService: CurrentRateService;
     dateRange: DateRange;
     exchangeRateDataService: ExchangeRateDataService;
     redisCacheService: RedisCacheService;
+    userId: string;
   }) {
     this.accountBalanceItems = accountBalanceItems;
+    this.configurationService = configurationService;
     this.currency = currency;
     this.currentRateService = currentRateService;
     this.exchangeRateDataService = exchangeRateDataService;
-    this.orders = activities.map(
+
-      ({ date, fee, quantity, SymbolProfile, tags = [], type, unitPrice }) => {
+    this.orders = activities
-        return {
+      .map(
+        ({
+          date,
+          fee,
+          quantity,
           SymbolProfile,
-          tags,
+          tags = [],
           type,
-          date: format(date, DATE_FORMAT),
+          unitPrice
-          fee: new Big(fee),
+        }) => {
-          quantity: new Big(quantity),
+          return {
-          unitPrice: new Big(unitPrice)
+            SymbolProfile,
-        };
+            tags,
-      }
+            type,
-    );
+            date: format(date, DATE_FORMAT),
+            fee: new Big(fee),
+            quantity: new Big(quantity),
+            unitPrice: new Big(unitPrice)
+          };
+        }
+      )
+      .sort((a, b) => {
+        return a.date?.localeCompare(b.date);
+      });
 
-    this.orders.sort((a, b) => {
+    this.redisCacheService = redisCacheService;
-      return a.date?.localeCompare(b.date);
+    this.userId = userId;
-    });
 
     const { endDate, startDate } = getInterval(dateRange);
 
@@ -1013,6 +1036,23 @@ export abstract class PortfolioCalculator {
   }
 
   private async initialize() {
-    this.snapshot = await this.computeSnapshot(this.startDate, this.endDate);
+    const cachedSnapshot = await this.redisCacheService.get(
+      this.redisCacheService.getPortfolioSnapshotKey(this.userId)
+    );
+
+    if (cachedSnapshot) {
+      this.snapshot = plainToClass(
+        PortfolioSnapshot,
+        JSON.parse(cachedSnapshot)
+      );
+    } else {
+      this.snapshot = await this.computeSnapshot(this.startDate, this.endDate);
+
+      this.redisCacheService.set(
+        this.redisCacheService.getPortfolioSnapshotKey(this.userId),
+        JSON.stringify(this.snapshot),
+        this.configurationService.get('CACHE_QUOTES_TTL')
+      );
+    }
   }
 }

apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-baln-buy-and-sell-in-two-activities.spec.ts

@@ -1,7 +1,8 @@
 import { Activity } from '@ghostfolio/api/app/order/interfaces/activities.interface';
 import {
   activityDummyData,
-  symbolProfileDummyData
+  symbolProfileDummyData,
+  userDummyData
 } from '@ghostfolio/api/app/portfolio/calculator/portfolio-calculator-test-utils';
 import {
   PortfolioCalculatorFactory,
@@ -11,6 +12,7 @@ import { CurrentRateService } from '@ghostfolio/api/app/portfolio/current-rate.s
 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 { parseDate } from '@ghostfolio/common/helper';
 
@@ -35,12 +37,15 @@ jest.mock('@ghostfolio/api/app/redis-cache/redis-cache.service', () => {
 });
 
 describe('PortfolioCalculator', () => {
+  let configurationService: ConfigurationService;
   let currentRateService: CurrentRateService;
   let exchangeRateDataService: ExchangeRateDataService;
   let factory: PortfolioCalculatorFactory;
   let redisCacheService: RedisCacheService;
 
   beforeEach(() => {
+    configurationService = new ConfigurationService();
+
     currentRateService = new CurrentRateService(null, null, null, null);
 
     exchangeRateDataService = new ExchangeRateDataService(
@@ -53,6 +58,7 @@ describe('PortfolioCalculator', () => {
     redisCacheService = new RedisCacheService(null, null);
 
     factory = new PortfolioCalculatorFactory(
+      configurationService,
       currentRateService,
       exchangeRateDataService,
       redisCacheService
@@ -116,7 +122,8 @@ describe('PortfolioCalculator', () => {
       const portfolioCalculator = factory.createCalculator({
         activities,
         calculationType: PerformanceCalculationType.TWR,
-        currency: 'CHF'
+        currency: 'CHF',
+        userId: userDummyData.id
       });
 
       const chartData = await portfolioCalculator.getChartData({

apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-baln-buy-and-sell.spec.ts

@@ -1,7 +1,8 @@
 import { Activity } from '@ghostfolio/api/app/order/interfaces/activities.interface';
 import {
   activityDummyData,
-  symbolProfileDummyData
+  symbolProfileDummyData,
+  userDummyData
 } from '@ghostfolio/api/app/portfolio/calculator/portfolio-calculator-test-utils';
 import {
   PerformanceCalculationType,
@@ -11,6 +12,7 @@ import { CurrentRateService } from '@ghostfolio/api/app/portfolio/current-rate.s
 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 { parseDate } from '@ghostfolio/common/helper';
 
@@ -35,12 +37,15 @@ jest.mock('@ghostfolio/api/app/redis-cache/redis-cache.service', () => {
 });
 
 describe('PortfolioCalculator', () => {
+  let configurationService: ConfigurationService;
   let currentRateService: CurrentRateService;
   let exchangeRateDataService: ExchangeRateDataService;
   let factory: PortfolioCalculatorFactory;
   let redisCacheService: RedisCacheService;
 
   beforeEach(() => {
+    configurationService = new ConfigurationService();
+
     currentRateService = new CurrentRateService(null, null, null, null);
 
     exchangeRateDataService = new ExchangeRateDataService(
@@ -53,6 +58,7 @@ describe('PortfolioCalculator', () => {
     redisCacheService = new RedisCacheService(null, null);
 
     factory = new PortfolioCalculatorFactory(
+      configurationService,
       currentRateService,
       exchangeRateDataService,
       redisCacheService
@@ -101,7 +107,8 @@ describe('PortfolioCalculator', () => {
       const portfolioCalculator = factory.createCalculator({
         activities,
         calculationType: PerformanceCalculationType.TWR,
-        currency: 'CHF'
+        currency: 'CHF',
+        userId: userDummyData.id
       });
 
       const chartData = await portfolioCalculator.getChartData({

apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-baln-buy.spec.ts

@@ -1,7 +1,8 @@
 import { Activity } from '@ghostfolio/api/app/order/interfaces/activities.interface';
 import {
   activityDummyData,
-  symbolProfileDummyData
+  symbolProfileDummyData,
+  userDummyData
 } from '@ghostfolio/api/app/portfolio/calculator/portfolio-calculator-test-utils';
 import {
   PortfolioCalculatorFactory,
@@ -11,6 +12,7 @@ import { CurrentRateService } from '@ghostfolio/api/app/portfolio/current-rate.s
 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 { parseDate } from '@ghostfolio/common/helper';
 
@@ -35,12 +37,15 @@ jest.mock('@ghostfolio/api/app/redis-cache/redis-cache.service', () => {
 });
 
 describe('PortfolioCalculator', () => {
+  let configurationService: ConfigurationService;
   let currentRateService: CurrentRateService;
   let exchangeRateDataService: ExchangeRateDataService;
   let factory: PortfolioCalculatorFactory;
   let redisCacheService: RedisCacheService;
 
   beforeEach(() => {
+    configurationService = new ConfigurationService();
+
     currentRateService = new CurrentRateService(null, null, null, null);
 
     exchangeRateDataService = new ExchangeRateDataService(
@@ -53,6 +58,7 @@ describe('PortfolioCalculator', () => {
     redisCacheService = new RedisCacheService(null, null);
 
     factory = new PortfolioCalculatorFactory(
+      configurationService,
       currentRateService,
       exchangeRateDataService,
       redisCacheService
@@ -86,7 +92,8 @@ describe('PortfolioCalculator', () => {
       const portfolioCalculator = factory.createCalculator({
         activities,
         calculationType: PerformanceCalculationType.TWR,
-        currency: 'CHF'
+        currency: 'CHF',
+        userId: userDummyData.id
       });
 
       const chartData = await portfolioCalculator.getChartData({

apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-btcusd-buy-and-sell-partially.spec.ts

@@ -1,7 +1,8 @@
 import { Activity } from '@ghostfolio/api/app/order/interfaces/activities.interface';
 import {
   activityDummyData,
-  symbolProfileDummyData
+  symbolProfileDummyData,
+  userDummyData
 } from '@ghostfolio/api/app/portfolio/calculator/portfolio-calculator-test-utils';
 import {
   PortfolioCalculatorFactory,
@@ -11,6 +12,7 @@ import { CurrentRateService } from '@ghostfolio/api/app/portfolio/current-rate.s
 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 { parseDate } from '@ghostfolio/common/helper';
@@ -48,12 +50,15 @@ jest.mock(
 );
 
 describe('PortfolioCalculator', () => {
+  let configurationService: ConfigurationService;
   let currentRateService: CurrentRateService;
   let exchangeRateDataService: ExchangeRateDataService;
   let factory: PortfolioCalculatorFactory;
   let redisCacheService: RedisCacheService;
 
   beforeEach(() => {
+    configurationService = new ConfigurationService();
+
     currentRateService = new CurrentRateService(null, null, null, null);
 
     exchangeRateDataService = new ExchangeRateDataService(
@@ -66,6 +71,7 @@ describe('PortfolioCalculator', () => {
     redisCacheService = new RedisCacheService(null, null);
 
     factory = new PortfolioCalculatorFactory(
+      configurationService,
       currentRateService,
       exchangeRateDataService,
       redisCacheService
@@ -114,7 +120,8 @@ describe('PortfolioCalculator', () => {
       const portfolioCalculator = factory.createCalculator({
         activities,
         calculationType: PerformanceCalculationType.TWR,
-        currency: 'CHF'
+        currency: 'CHF',
+        userId: userDummyData.id
       });
 
       const chartData = await portfolioCalculator.getChartData({

apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-fee.spec.ts

@@ -1,7 +1,8 @@
 import { Activity } from '@ghostfolio/api/app/order/interfaces/activities.interface';
 import {
   activityDummyData,
-  symbolProfileDummyData
+  symbolProfileDummyData,
+  userDummyData
 } from '@ghostfolio/api/app/portfolio/calculator/portfolio-calculator-test-utils';
 import {
   PortfolioCalculatorFactory,
@@ -11,6 +12,7 @@ import { CurrentRateService } from '@ghostfolio/api/app/portfolio/current-rate.s
 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 { parseDate } from '@ghostfolio/common/helper';
 
@@ -35,12 +37,15 @@ jest.mock('@ghostfolio/api/app/redis-cache/redis-cache.service', () => {
 });
 
 describe('PortfolioCalculator', () => {
+  let configurationService: ConfigurationService;
   let currentRateService: CurrentRateService;
   let exchangeRateDataService: ExchangeRateDataService;
   let factory: PortfolioCalculatorFactory;
   let redisCacheService: RedisCacheService;
 
   beforeEach(() => {
+    configurationService = new ConfigurationService();
+
     currentRateService = new CurrentRateService(null, null, null, null);
 
     exchangeRateDataService = new ExchangeRateDataService(
@@ -53,6 +58,7 @@ describe('PortfolioCalculator', () => {
     redisCacheService = new RedisCacheService(null, null);
 
     factory = new PortfolioCalculatorFactory(
+      configurationService,
       currentRateService,
       exchangeRateDataService,
       redisCacheService
@@ -86,7 +92,8 @@ describe('PortfolioCalculator', () => {
       const portfolioCalculator = factory.createCalculator({
         activities,
         calculationType: PerformanceCalculationType.TWR,
-        currency: 'USD'
+        currency: 'USD',
+        userId: userDummyData.id
       });
 
       const portfolioSnapshot = await portfolioCalculator.computeSnapshot(

apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-googl-buy.spec.ts

@@ -1,7 +1,8 @@
 import { Activity } from '@ghostfolio/api/app/order/interfaces/activities.interface';
 import {
   activityDummyData,
-  symbolProfileDummyData
+  symbolProfileDummyData,
+  userDummyData
 } from '@ghostfolio/api/app/portfolio/calculator/portfolio-calculator-test-utils';
 import {
   PortfolioCalculatorFactory,
@@ -11,6 +12,7 @@ import { CurrentRateService } from '@ghostfolio/api/app/portfolio/current-rate.s
 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 { parseDate } from '@ghostfolio/common/helper';
@@ -48,12 +50,15 @@ jest.mock(
 );
 
 describe('PortfolioCalculator', () => {
+  let configurationService: ConfigurationService;
   let currentRateService: CurrentRateService;
   let exchangeRateDataService: ExchangeRateDataService;
   let factory: PortfolioCalculatorFactory;
   let redisCacheService: RedisCacheService;
 
   beforeEach(() => {
+    configurationService = new ConfigurationService();
+
     currentRateService = new CurrentRateService(null, null, null, null);
 
     exchangeRateDataService = new ExchangeRateDataService(
@@ -66,6 +71,7 @@ describe('PortfolioCalculator', () => {
     redisCacheService = new RedisCacheService(null, null);
 
     factory = new PortfolioCalculatorFactory(
+      configurationService,
       currentRateService,
       exchangeRateDataService,
       redisCacheService
@@ -99,7 +105,8 @@ describe('PortfolioCalculator', () => {
       const portfolioCalculator = factory.createCalculator({
         activities,
         calculationType: PerformanceCalculationType.TWR,
-        currency: 'CHF'
+        currency: 'CHF',
+        userId: userDummyData.id
       });
 
       const chartData = await portfolioCalculator.getChartData({

apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-item.spec.ts

@@ -1,7 +1,8 @@
 import { Activity } from '@ghostfolio/api/app/order/interfaces/activities.interface';
 import {
   activityDummyData,
-  symbolProfileDummyData
+  symbolProfileDummyData,
+  userDummyData
 } from '@ghostfolio/api/app/portfolio/calculator/portfolio-calculator-test-utils';
 import {
   PortfolioCalculatorFactory,
@@ -11,6 +12,7 @@ import { CurrentRateService } from '@ghostfolio/api/app/portfolio/current-rate.s
 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 { parseDate } from '@ghostfolio/common/helper';
 
@@ -35,12 +37,15 @@ jest.mock('@ghostfolio/api/app/redis-cache/redis-cache.service', () => {
 });
 
 describe('PortfolioCalculator', () => {
+  let configurationService: ConfigurationService;
   let currentRateService: CurrentRateService;
   let exchangeRateDataService: ExchangeRateDataService;
   let factory: PortfolioCalculatorFactory;
   let redisCacheService: RedisCacheService;
 
   beforeEach(() => {
+    configurationService = new ConfigurationService();
+
     currentRateService = new CurrentRateService(null, null, null, null);
 
     exchangeRateDataService = new ExchangeRateDataService(
@@ -53,6 +58,7 @@ describe('PortfolioCalculator', () => {
     redisCacheService = new RedisCacheService(null, null);
 
     factory = new PortfolioCalculatorFactory(
+      configurationService,
       currentRateService,
       exchangeRateDataService,
       redisCacheService
@@ -86,7 +92,8 @@ describe('PortfolioCalculator', () => {
       const portfolioCalculator = factory.createCalculator({
         activities,
         calculationType: PerformanceCalculationType.TWR,
-        currency: 'USD'
+        currency: 'USD',
+        userId: userDummyData.id
       });
 
       const portfolioSnapshot = await portfolioCalculator.computeSnapshot(

apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-liability.spec.ts

@@ -1,7 +1,8 @@
 import { Activity } from '@ghostfolio/api/app/order/interfaces/activities.interface';
 import {
   activityDummyData,
-  symbolProfileDummyData
+  symbolProfileDummyData,
+  userDummyData
 } from '@ghostfolio/api/app/portfolio/calculator/portfolio-calculator-test-utils';
 import {
   PortfolioCalculatorFactory,
@@ -11,6 +12,7 @@ import { CurrentRateService } from '@ghostfolio/api/app/portfolio/current-rate.s
 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 { parseDate } from '@ghostfolio/common/helper';
 
@@ -35,12 +37,15 @@ jest.mock('@ghostfolio/api/app/redis-cache/redis-cache.service', () => {
 });
 
 describe('PortfolioCalculator', () => {
+  let configurationService: ConfigurationService;
   let currentRateService: CurrentRateService;
   let exchangeRateDataService: ExchangeRateDataService;
   let factory: PortfolioCalculatorFactory;
   let redisCacheService: RedisCacheService;
 
   beforeEach(() => {
+    configurationService = new ConfigurationService();
+
     currentRateService = new CurrentRateService(null, null, null, null);
 
     exchangeRateDataService = new ExchangeRateDataService(
@@ -53,6 +58,7 @@ describe('PortfolioCalculator', () => {
     redisCacheService = new RedisCacheService(null, null);
 
     factory = new PortfolioCalculatorFactory(
+      configurationService,
       currentRateService,
       exchangeRateDataService,
       redisCacheService
@@ -86,7 +92,8 @@ describe('PortfolioCalculator', () => {
       const portfolioCalculator = factory.createCalculator({
         activities,
         calculationType: PerformanceCalculationType.TWR,
-        currency: 'USD'
+        currency: 'USD',
+        userId: userDummyData.id
       });
 
       const portfolioSnapshot = await portfolioCalculator.computeSnapshot(

apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-msft-buy-with-dividend.spec.ts

@@ -1,7 +1,8 @@
 import { Activity } from '@ghostfolio/api/app/order/interfaces/activities.interface';
 import {
   activityDummyData,
-  symbolProfileDummyData
+  symbolProfileDummyData,
+  userDummyData
 } from '@ghostfolio/api/app/portfolio/calculator/portfolio-calculator-test-utils';
 import {
   PerformanceCalculationType,
@@ -11,6 +12,7 @@ import { CurrentRateService } from '@ghostfolio/api/app/portfolio/current-rate.s
 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 { parseDate } from '@ghostfolio/common/helper';
@@ -48,12 +50,15 @@ jest.mock(
 );
 
 describe('PortfolioCalculator', () => {
+  let configurationService: ConfigurationService;
   let currentRateService: CurrentRateService;
   let exchangeRateDataService: ExchangeRateDataService;
   let factory: PortfolioCalculatorFactory;
   let redisCacheService: RedisCacheService;
 
   beforeEach(() => {
+    configurationService = new ConfigurationService();
+
     currentRateService = new CurrentRateService(null, null, null, null);
 
     exchangeRateDataService = new ExchangeRateDataService(
@@ -66,6 +71,7 @@ describe('PortfolioCalculator', () => {
     redisCacheService = new RedisCacheService(null, null);
 
     factory = new PortfolioCalculatorFactory(
+      configurationService,
       currentRateService,
       exchangeRateDataService,
       redisCacheService
@@ -114,7 +120,8 @@ describe('PortfolioCalculator', () => {
       const portfolioCalculator = factory.createCalculator({
         activities,
         calculationType: PerformanceCalculationType.TWR,
-        currency: 'USD'
+        currency: 'USD',
+        userId: userDummyData.id
       });
 
       const portfolioSnapshot = await portfolioCalculator.computeSnapshot(

apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-no-orders.spec.ts

@@ -1,3 +1,4 @@
+import { userDummyData } from '@ghostfolio/api/app/portfolio/calculator/portfolio-calculator-test-utils';
 import {
   PerformanceCalculationType,
   PortfolioCalculatorFactory
@@ -6,6 +7,7 @@ import { CurrentRateService } from '@ghostfolio/api/app/portfolio/current-rate.s
 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 { parseDate } from '@ghostfolio/common/helper';
 
@@ -31,12 +33,15 @@ jest.mock('@ghostfolio/api/app/redis-cache/redis-cache.service', () => {
 });
 
 describe('PortfolioCalculator', () => {
+  let configurationService: ConfigurationService;
   let currentRateService: CurrentRateService;
   let exchangeRateDataService: ExchangeRateDataService;
   let factory: PortfolioCalculatorFactory;
   let redisCacheService: RedisCacheService;
 
   beforeEach(() => {
+    configurationService = new ConfigurationService();
+
     currentRateService = new CurrentRateService(null, null, null, null);
 
     exchangeRateDataService = new ExchangeRateDataService(
@@ -49,6 +54,7 @@ describe('PortfolioCalculator', () => {
     redisCacheService = new RedisCacheService(null, null);
 
     factory = new PortfolioCalculatorFactory(
+      configurationService,
       currentRateService,
       exchangeRateDataService,
       redisCacheService
@@ -64,7 +70,8 @@ describe('PortfolioCalculator', () => {
       const portfolioCalculator = factory.createCalculator({
         activities: [],
         calculationType: PerformanceCalculationType.TWR,
-        currency: 'CHF'
+        currency: 'CHF',
+        userId: userDummyData.id
       });
 
       const start = subDays(new Date(Date.now()), 10);

apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-novn-buy-and-sell-partially.spec.ts

@@ -1,7 +1,8 @@
 import { Activity } from '@ghostfolio/api/app/order/interfaces/activities.interface';
 import {
   activityDummyData,
-  symbolProfileDummyData
+  symbolProfileDummyData,
+  userDummyData
 } from '@ghostfolio/api/app/portfolio/calculator/portfolio-calculator-test-utils';
 import {
   PerformanceCalculationType,
@@ -11,6 +12,7 @@ import { CurrentRateService } from '@ghostfolio/api/app/portfolio/current-rate.s
 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 { parseDate } from '@ghostfolio/common/helper';
 
@@ -35,12 +37,15 @@ jest.mock('@ghostfolio/api/app/redis-cache/redis-cache.service', () => {
 });
 
 describe('PortfolioCalculator', () => {
+  let configurationService: ConfigurationService;
   let currentRateService: CurrentRateService;
   let exchangeRateDataService: ExchangeRateDataService;
   let factory: PortfolioCalculatorFactory;
   let redisCacheService: RedisCacheService;
 
   beforeEach(() => {
+    configurationService = new ConfigurationService();
+
     currentRateService = new CurrentRateService(null, null, null, null);
 
     exchangeRateDataService = new ExchangeRateDataService(
@@ -53,6 +58,7 @@ describe('PortfolioCalculator', () => {
     redisCacheService = new RedisCacheService(null, null);
 
     factory = new PortfolioCalculatorFactory(
+      configurationService,
       currentRateService,
       exchangeRateDataService,
       redisCacheService
@@ -101,7 +107,8 @@ describe('PortfolioCalculator', () => {
       const portfolioCalculator = factory.createCalculator({
         activities,
         calculationType: PerformanceCalculationType.TWR,
-        currency: 'CHF'
+        currency: 'CHF',
+        userId: userDummyData.id
       });
 
       const chartData = await portfolioCalculator.getChartData({

apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-novn-buy-and-sell.spec.ts

@@ -1,7 +1,8 @@
 import { Activity } from '@ghostfolio/api/app/order/interfaces/activities.interface';
 import {
   activityDummyData,
-  symbolProfileDummyData
+  symbolProfileDummyData,
+  userDummyData
 } from '@ghostfolio/api/app/portfolio/calculator/portfolio-calculator-test-utils';
 import {
   PerformanceCalculationType,
@@ -11,6 +12,7 @@ import { CurrentRateService } from '@ghostfolio/api/app/portfolio/current-rate.s
 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 { parseDate } from '@ghostfolio/common/helper';
 
@@ -35,12 +37,15 @@ jest.mock('@ghostfolio/api/app/redis-cache/redis-cache.service', () => {
 });
 
 describe('PortfolioCalculator', () => {
+  let configurationService: ConfigurationService;
   let currentRateService: CurrentRateService;
   let exchangeRateDataService: ExchangeRateDataService;
   let factory: PortfolioCalculatorFactory;
   let redisCacheService: RedisCacheService;
 
   beforeEach(() => {
+    configurationService = new ConfigurationService();
+
     currentRateService = new CurrentRateService(null, null, null, null);
 
     exchangeRateDataService = new ExchangeRateDataService(
@@ -53,6 +58,7 @@ describe('PortfolioCalculator', () => {
     redisCacheService = new RedisCacheService(null, null);
 
     factory = new PortfolioCalculatorFactory(
+      configurationService,
       currentRateService,
       exchangeRateDataService,
       redisCacheService
@@ -101,7 +107,8 @@ describe('PortfolioCalculator', () => {
       const portfolioCalculator = factory.createCalculator({
         activities,
         calculationType: PerformanceCalculationType.TWR,
-        currency: 'CHF'
+        currency: 'CHF',
+        userId: userDummyData.id
       });
 
       const chartData = await portfolioCalculator.getChartData({

apps/api/src/app/portfolio/calculator/twr/portfolio-calculator.spec.ts

@@ -1,15 +1,19 @@
 import { PortfolioCalculatorFactory } from '@ghostfolio/api/app/portfolio/calculator/portfolio-calculator.factory';
 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';
 
 describe('PortfolioCalculator', () => {
+  let configurationService: ConfigurationService;
   let currentRateService: CurrentRateService;
   let exchangeRateDataService: ExchangeRateDataService;
   let factory: PortfolioCalculatorFactory;
   let redisCacheService: RedisCacheService;
 
   beforeEach(() => {
+    configurationService = new ConfigurationService();
+
     currentRateService = new CurrentRateService(null, null, null, null);
 
     exchangeRateDataService = new ExchangeRateDataService(
@@ -22,6 +26,7 @@ describe('PortfolioCalculator', () => {
     redisCacheService = new RedisCacheService(null, null);
 
     factory = new PortfolioCalculatorFactory(
+      configurationService,
       currentRateService,
       exchangeRateDataService,
       redisCacheService

apps/api/src/app/portfolio/calculator/twr/portfolio-calculator.ts

@@ -1,10 +1,9 @@
 import { PortfolioCalculator } from '@ghostfolio/api/app/portfolio/calculator/portfolio-calculator';
 import { PortfolioOrderItem } from '@ghostfolio/api/app/portfolio/interfaces/portfolio-order-item.interface';
-import { PortfolioSnapshot } from '@ghostfolio/api/app/portfolio/interfaces/portfolio-snapshot.interface';
 import { getFactor } from '@ghostfolio/api/helper/portfolio.helper';
 import { DATE_FORMAT } from '@ghostfolio/common/helper';
 import { SymbolMetrics, UniqueAsset } from '@ghostfolio/common/interfaces';
-import { TimelinePosition } from '@ghostfolio/common/models';
+import { PortfolioSnapshot, TimelinePosition } from '@ghostfolio/common/models';
 
 import { Logger } from '@nestjs/common';
 import { Big } from 'big.js';

apps/api/src/app/portfolio/interfaces/portfolio-snapshot.interface.ts

@@ -1,25 +0,0 @@
-import { ResponseError } from '@ghostfolio/common/interfaces';
-import { TimelinePosition } from '@ghostfolio/common/models';
-
-import { Big } from 'big.js';
-
-export interface PortfolioSnapshot extends ResponseError {
-  currentValueInBaseCurrency: Big;
-  grossPerformance: Big;
-  grossPerformanceWithCurrencyEffect: Big;
-  grossPerformancePercentage: Big;
-  grossPerformancePercentageWithCurrencyEffect: Big;
-  netAnnualizedPerformance?: Big;
-  netAnnualizedPerformanceWithCurrencyEffect?: Big;
-  netPerformance: Big;
-  netPerformanceWithCurrencyEffect: Big;
-  netPerformancePercentage: Big;
-  netPerformancePercentageWithCurrencyEffect: Big;
-  positions: TimelinePosition[];
-  totalFeesWithCurrencyEffect: Big;
-  totalInterestWithCurrencyEffect: Big;
-  totalInvestment: Big;
-  totalInvestmentWithCurrencyEffect: Big;
-  totalLiabilitiesWithCurrencyEffect: Big;
-  totalValuablesWithCurrencyEffect: Big;
-}

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

@@ -277,6 +277,7 @@ export class PortfolioService {
 
     const portfolioCalculator = this.calculatorFactory.createCalculator({
       activities,
+      userId,
       calculationType: PerformanceCalculationType.TWR,
       currency: this.request.user.Settings.settings.baseCurrency
     });
@@ -352,6 +353,7 @@ export class PortfolioService {
     const portfolioCalculator = this.calculatorFactory.createCalculator({
       activities,
       dateRange,
+      userId,
       calculationType: PerformanceCalculationType.TWR,
       currency: userCurrency
     });
@@ -648,6 +650,7 @@ export class PortfolioService {
     ]);
 
     const portfolioCalculator = this.calculatorFactory.createCalculator({
+      userId,
       activities: orders.filter((order) => {
         return ['BUY', 'DIVIDEND', 'ITEM', 'SELL'].includes(order.type);
       }),
@@ -919,6 +922,7 @@ export class PortfolioService {
     const portfolioCalculator = this.calculatorFactory.createCalculator({
       activities,
       dateRange,
+      userId,
       calculationType: PerformanceCalculationType.TWR,
       currency: this.request.user.Settings.settings.baseCurrency
     });
@@ -1108,6 +1112,7 @@ export class PortfolioService {
       accountBalanceItems,
       activities,
       dateRange,
+      userId,
       calculationType: PerformanceCalculationType.TWR,
       currency: userCurrency
     });
@@ -1202,6 +1207,7 @@ export class PortfolioService {
 
     const portfolioCalculator = this.calculatorFactory.createCalculator({
       activities,
+      userId,
       calculationType: PerformanceCalculationType.TWR,
       currency: this.request.user.Settings.settings.baseCurrency
     });

apps/api/src/app/redis-cache/redis-cache.service.mock.ts

@@ -1 +1,13 @@
-export const RedisCacheServiceMock = {};
+import { RedisCacheService } from './redis-cache.service';
+
+export const RedisCacheServiceMock = {
+  get: (key: string): Promise<string> => {
+    return Promise.resolve(null);
+  },
+  getPortfolioSnapshotKey: (userId: string): string => {
+    return `portfolio-snapshot-${userId}`;
+  },
+  set: (key: string, value: string, ttlInSeconds?: number): Promise<string> => {
+    return Promise.resolve(value);
+  }
+};

apps/api/src/app/redis-cache/redis-cache.service.ts

@@ -24,6 +24,10 @@ export class RedisCacheService {
     return this.cache.get(key);
   }
 
+  public getPortfolioSnapshotKey(userId: string) {
+    return `portfolio-snapshot-${userId}`;
+  }
+
   public getQuoteKey({ dataSource, symbol }: UniqueAsset) {
     return `quote-${getAssetProfileIdentifier({ dataSource, symbol })}`;
   }

apps/api/src/events/events.module.ts

@@ -1,8 +1,11 @@
+import { RedisCacheModule } from '@ghostfolio/api/app/redis-cache/redis-cache.module';
+
 import { Module } from '@nestjs/common';
 
 import { PortfolioChangedListener } from './portfolio-changed.listener';
 
 @Module({
+  imports: [RedisCacheModule],
   providers: [PortfolioChangedListener]
 })
 export class EventsModule {}

apps/api/src/events/portfolio-changed.listener.ts

@@ -1,3 +1,5 @@
+import { RedisCacheService } from '@ghostfolio/api/app/redis-cache/redis-cache.service';
+
 import { Injectable, Logger } from '@nestjs/common';
 import { OnEvent } from '@nestjs/event-emitter';
 
@@ -5,11 +7,17 @@ import { PortfolioChangedEvent } from './portfolio-changed.event';
 
 @Injectable()
 export class PortfolioChangedListener {
+  public constructor(private readonly redisCacheService: RedisCacheService) {}
+
   @OnEvent(PortfolioChangedEvent.getName())
   handlePortfolioChangedEvent(event: PortfolioChangedEvent) {
     Logger.log(
       `Portfolio of user with id ${event.getUserId()} has changed`,
       'PortfolioChangedListener'
     );
+
+    this.redisCacheService.remove(
+      this.redisCacheService.getPortfolioSnapshotKey(event.getUserId())
+    );
   }
 }

libs/common/src/lib/models/index.ts

@@ -1,3 +1,4 @@
+import { PortfolioSnapshot } from './portfolio-snapshot';
 import { TimelinePosition } from './timeline-position';
 
-export { TimelinePosition };
+export { PortfolioSnapshot, TimelinePosition };

libs/common/src/lib/models/portfolio-snapshot.ts

@@ -0,0 +1,89 @@
+import { transformToBig } from '@ghostfolio/common/class-transformer';
+import { UniqueAsset } from '@ghostfolio/common/interfaces';
+import { TimelinePosition } from '@ghostfolio/common/models';
+
+import { Big } from 'big.js';
+import { Transform, Type, plainToClass } from 'class-transformer';
+
+export class PortfolioSnapshot {
+  @Transform(transformToBig, { toClassOnly: true })
+  @Type(() => Big)
+  currentValueInBaseCurrency: Big;
+  errors?: UniqueAsset[];
+
+  @Transform(transformToBig, { toClassOnly: true })
+  @Type(() => Big)
+  grossPerformance: Big;
+
+  @Transform(transformToBig, { toClassOnly: true })
+  @Type(() => Big)
+  grossPerformanceWithCurrencyEffect: Big;
+
+  @Transform(transformToBig, { toClassOnly: true })
+  @Type(() => Big)
+  grossPerformancePercentage: Big;
+
+  @Transform(transformToBig, { toClassOnly: true })
+  @Type(() => Big)
+  grossPerformancePercentageWithCurrencyEffect: Big;
+
+  hasErrors: boolean;
+
+  @Transform(transformToBig, { toClassOnly: true })
+  @Type(() => Big)
+  netAnnualizedPerformance?: Big;
+
+  @Transform(transformToBig, { toClassOnly: true })
+  @Type(() => Big)
+  netAnnualizedPerformanceWithCurrencyEffect?: Big;
+
+  @Transform(transformToBig, { toClassOnly: true })
+  @Type(() => Big)
+  netPerformance: Big;
+
+  @Transform(transformToBig, { toClassOnly: true })
+  @Type(() => Big)
+  netPerformanceWithCurrencyEffect: Big;
+
+  @Transform(transformToBig, { toClassOnly: true })
+  @Type(() => Big)
+  netPerformancePercentage: Big;
+
+  @Transform(transformToBig, { toClassOnly: true })
+  @Type(() => Big)
+  netPerformancePercentageWithCurrencyEffect: Big;
+
+  /*@Transform(
+    ({ value }) =>
+      value.map((position: any) => {
+        return plainToClass(TimelinePosition, position);
+      }),
+    { toClassOnly: true }
+  )*/
+  @Type(() => TimelinePosition)
+  positions: TimelinePosition[];
+
+  @Transform(transformToBig, { toClassOnly: true })
+  @Type(() => Big)
+  totalFeesWithCurrencyEffect: Big;
+
+  @Transform(transformToBig, { toClassOnly: true })
+  @Type(() => Big)
+  totalInterestWithCurrencyEffect: Big;
+
+  @Transform(transformToBig, { toClassOnly: true })
+  @Type(() => Big)
+  totalInvestment: Big;
+
+  @Transform(transformToBig, { toClassOnly: true })
+  @Type(() => Big)
+  totalInvestmentWithCurrencyEffect: Big;
+
+  @Transform(transformToBig, { toClassOnly: true })
+  @Type(() => Big)
+  totalLiabilitiesWithCurrencyEffect: Big;
+
+  @Transform(transformToBig, { toClassOnly: true })
+  @Type(() => Big)
+  totalValuablesWithCurrencyEffect: Big;
+}