cleanup & fixes after merge

apps/api/src/aop/logging.interceptor.ts

@@ -1,44 +0,0 @@
-import { Logger } from '@nestjs/common';
-import {
-  Injectable,
-  NestInterceptor,
-  ExecutionContext,
-  CallHandler
-} from '@nestjs/common';
-import { Observable } from 'rxjs';
-import { tap } from 'rxjs/operators';
-
-@Injectable()
-export class LoggingInterceptor implements NestInterceptor {
-  intercept(context: ExecutionContext, next: CallHandler): Observable<any> {
-    const methodName =
-      context.getClass().name + ':' + context.getHandler().name;
-    Logger.debug(`Before ${methodName}...`);
-
-    const now = Date.now();
-    return next
-      .handle()
-      .pipe(
-        tap(() => Logger.debug(`After ${methodName}... ${Date.now() - now}ms`))
-      );
-  }
-}
-
-export function LogPerformance(
-  target: any,
-  propertyKey: string,
-  descriptor: PropertyDescriptor
-) {
-  const originalMethod = descriptor.value;
-  descriptor.value = function (...args: any[]) {
-    const time = Date.now();
-    const result = originalMethod.apply(this, args);
-    const now = Date.now();
-    if (now - time > 100) {
-      Logger.debug(`${propertyKey} returned within: ${now - time} ms`);
-    }
-    return result;
-  };
-
-  return descriptor;
-}

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

@@ -1,4 +1,3 @@
-import { LogPerformance } from '@ghostfolio/api/aop/logging.interceptor';
 import { AccountBalanceService } from '@ghostfolio/api/app/account-balance/account-balance.service';
 import { PortfolioChangedEvent } from '@ghostfolio/api/events/portfolio-changed.event';
 import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.service';
@@ -14,6 +13,7 @@ import { format } from 'date-fns';
 import { groupBy } from 'lodash';
 
 import { CashDetails } from './interfaces/cash-details.interface';
+import { LogPerformance } from '@ghostfolio/api/interceptors/performance-logging/performance-logging.interceptor';
 
 @Injectable()
 export class AccountService {

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

@@ -1,4 +1,3 @@
-import { LogPerformance } from '@ghostfolio/api/aop/logging.interceptor';
 import { AccountService } from '@ghostfolio/api/app/account/account.service';
 import { PortfolioChangedEvent } from '@ghostfolio/api/events/portfolio-changed.event';
 import { LogPerformance } from '@ghostfolio/api/interceptors/performance-logging/performance-logging.interceptor';

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

@@ -1,11 +1,12 @@
-import { LogPerformance } from '@ghostfolio/api/aop/logging.interceptor';
 import { Activity } from '@ghostfolio/api/app/order/interfaces/activities.interface';
 import { OrderService } from '@ghostfolio/api/app/order/order.service';
 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 { IDataGatheringItem } from '@ghostfolio/api/services/interfaces/interfaces';
+import { PortfolioSnapshotService } from '@ghostfolio/api/services/queues/portfolio-snapshot/portfolio-snapshot.service';
 import { getIntervalFromDateRange } from '@ghostfolio/common/calculation-helper';
 import { DATE_FORMAT, parseDate, resetHours } from '@ghostfolio/common/helper';
 import { Filter, HistoricalDataItem } from '@ghostfolio/common/interfaces';
@@ -41,6 +42,7 @@ export class CPRPortfolioCalculator extends TWRPortfolioCalculator {
       currency,
       currentRateService,
       exchangeRateDataService,
+      portfolioSnapshotService,
       redisCacheService,
       userId,
       filters
@@ -51,6 +53,7 @@ export class CPRPortfolioCalculator extends TWRPortfolioCalculator {
       currency: string;
       currentRateService: CurrentRateService;
       exchangeRateDataService: ExchangeRateDataService;
+      portfolioSnapshotService: PortfolioSnapshotService;
       redisCacheService: RedisCacheService;
       filters: Filter[];
       userId: string;
@@ -66,6 +69,7 @@ export class CPRPortfolioCalculator extends TWRPortfolioCalculator {
       filters,
       currentRateService,
       exchangeRateDataService,
+      portfolioSnapshotService,
       redisCacheService,
       userId
     });

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

@@ -1,7 +1,7 @@
-import { LogPerformance } from '@ghostfolio/api/aop/logging.interceptor';
 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 { 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 { PortfolioSnapshotService } from '@ghostfolio/api/services/queues/portfolio-snapshot/portfolio-snapshot.service';
@@ -28,7 +28,8 @@ export class PortfolioCalculatorFactory {
     private readonly currentRateService: CurrentRateService,
     private readonly exchangeRateDataService: ExchangeRateDataService,
     private readonly portfolioSnapshotService: PortfolioSnapshotService,
-    private readonly redisCacheService: RedisCacheService
+    private readonly redisCacheService: RedisCacheService,
+    private readonly orderService: OrderService
   ) {}
 
   @LogPerformance
@@ -62,31 +63,37 @@ export class PortfolioCalculatorFactory {
           redisCacheService: this.redisCacheService
         });
       case PerformanceCalculationType.TWR:
-        return new CPRPortfolioCalculator({
+        return new CPRPortfolioCalculator(
-          accountBalanceItems,
+          {
-          activities,
+            accountBalanceItems,
-          currency,
+            activities,
-          currentRateService: this.currentRateService,
+            currency,
-          userId,
+            currentRateService: this.currentRateService,
-          configurationService: this.configurationService,
+            userId,
-          exchangeRateDataService: this.exchangeRateDataService,
+            configurationService: this.configurationService,
-          portfolioSnapshotService: this.portfolioSnapshotService,
+            exchangeRateDataService: this.exchangeRateDataService,
-          redisCacheService: this.redisCacheService,
+            portfolioSnapshotService: this.portfolioSnapshotService,
-          filters
+            redisCacheService: this.redisCacheService,
-        });
+            filters
+          },
+          this.orderService
+        );
       case PerformanceCalculationType.CPR:
-        return new CPRPortfolioCalculator({
+        return new CPRPortfolioCalculator(
-          accountBalanceItems,
+          {
-          activities,
+            accountBalanceItems,
-          currency,
+            activities,
-          currentRateService: this.currentRateService,
+            currency,
-          userId,
+            currentRateService: this.currentRateService,
-          configurationService: this.configurationService,
+            userId,
-          exchangeRateDataService: this.exchangeRateDataService,
+            configurationService: this.configurationService,
-          portfolioSnapshotService: this.portfolioSnapshotService,
+            exchangeRateDataService: this.exchangeRateDataService,
-          redisCacheService: this.redisCacheService,
+            portfolioSnapshotService: this.portfolioSnapshotService,
-          filters
+            redisCacheService: this.redisCacheService,
-        });
+            filters
+          },
+          this.orderService
+        );
       default:
         throw new Error('Invalid calculation type');
     }

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

@@ -80,7 +80,8 @@ describe('PortfolioCalculator', () => {
       currentRateService,
       exchangeRateDataService,
       portfolioSnapshotService,
-      redisCacheService
+      redisCacheService,
+      null
     );
   });
 

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

@@ -80,7 +80,8 @@ describe('PortfolioCalculator', () => {
       currentRateService,
       exchangeRateDataService,
       portfolioSnapshotService,
-      redisCacheService
+      redisCacheService,
+      null
     );
   });
 

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

@@ -80,7 +80,8 @@ describe('PortfolioCalculator', () => {
       currentRateService,
       exchangeRateDataService,
       portfolioSnapshotService,
-      redisCacheService
+      redisCacheService,
+      null
     );
   });
 

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

@@ -93,7 +93,8 @@ describe('PortfolioCalculator', () => {
       currentRateService,
       exchangeRateDataService,
       portfolioSnapshotService,
-      redisCacheService
+      redisCacheService,
+      null
     );
   });
 

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

@@ -80,7 +80,8 @@ describe('PortfolioCalculator', () => {
       currentRateService,
       exchangeRateDataService,
       portfolioSnapshotService,
-      redisCacheService
+      redisCacheService,
+      null
     );
   });
 

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

@@ -93,7 +93,8 @@ describe('PortfolioCalculator', () => {
       currentRateService,
       exchangeRateDataService,
       portfolioSnapshotService,
-      redisCacheService
+      redisCacheService,
+      null
     );
   });
 

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

@@ -80,7 +80,8 @@ describe('PortfolioCalculator', () => {
       currentRateService,
       exchangeRateDataService,
       portfolioSnapshotService,
-      redisCacheService
+      redisCacheService,
+      null
     );
   });
 

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

@@ -79,7 +79,8 @@ describe('PortfolioCalculator', () => {
       currentRateService,
       exchangeRateDataService,
       portfolioSnapshotService,
-      redisCacheService
+      redisCacheService,
+      null
     );
   });
 

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

@@ -93,7 +93,8 @@ describe('PortfolioCalculator', () => {
       currentRateService,
       exchangeRateDataService,
       portfolioSnapshotService,
-      redisCacheService
+      redisCacheService,
+      null
     );
   });
 

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

@@ -74,7 +74,8 @@ describe('PortfolioCalculator', () => {
       currentRateService,
       exchangeRateDataService,
       portfolioSnapshotService,
-      redisCacheService
+      redisCacheService,
+      null
     );
   });
 

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

@@ -80,7 +80,8 @@ describe('PortfolioCalculator', () => {
       currentRateService,
       exchangeRateDataService,
       portfolioSnapshotService,
-      redisCacheService
+      redisCacheService,
+      null
     );
   });
 

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

@@ -80,7 +80,8 @@ describe('PortfolioCalculator', () => {
       currentRateService,
       exchangeRateDataService,
       portfolioSnapshotService,
-      redisCacheService
+      redisCacheService,
+      null
     );
   });
 

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

@@ -34,7 +34,8 @@ describe('PortfolioCalculator', () => {
       currentRateService,
       exchangeRateDataService,
       portfolioSnapshotService,
-      redisCacheService
+      redisCacheService,
+      null
     );
   });
 

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

@@ -1,4 +1,3 @@
-import { LogPerformance } from '@ghostfolio/api/aop/logging.interceptor';
 import { AccessService } from '@ghostfolio/api/app/access/access.service';
 import { OrderService } from '@ghostfolio/api/app/order/order.service';
 import { HasPermission } from '@ghostfolio/api/decorators/has-permission.decorator';
@@ -7,7 +6,10 @@ import {
   hasNotDefinedValuesInObject,
   nullifyValuesInObject
 } from '@ghostfolio/api/helper/object.helper';
-import { PerformanceLoggingInterceptor } from '@ghostfolio/api/interceptors/performance-logging/performance-logging.interceptor';
+import {
+  LogPerformance,
+  PerformanceLoggingInterceptor
+} from '@ghostfolio/api/interceptors/performance-logging/performance-logging.interceptor';
 import { RedactValuesInResponseInterceptor } from '@ghostfolio/api/interceptors/redact-values-in-response/redact-values-in-response.interceptor';
 import { TransformDataSourceInRequestInterceptor } from '@ghostfolio/api/interceptors/transform-data-source-in-request/transform-data-source-in-request.interceptor';
 import { TransformDataSourceInResponseInterceptor } from '@ghostfolio/api/interceptors/transform-data-source-in-response/transform-data-source-in-response.interceptor';

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

@@ -1,4 +1,3 @@
-import { LogPerformance } from '@ghostfolio/api/aop/logging.interceptor';
 import { AccountBalanceService } from '@ghostfolio/api/app/account-balance/account-balance.service';
 import { AccountService } from '@ghostfolio/api/app/account/account.service';
 import { CashDetails } from '@ghostfolio/api/app/account/interfaces/cash-details.interface';
@@ -6,6 +5,7 @@ import { Activity } from '@ghostfolio/api/app/order/interfaces/activities.interf
 import { OrderService } from '@ghostfolio/api/app/order/order.service';
 import { UserService } from '@ghostfolio/api/app/user/user.service';
 import { getFactor } from '@ghostfolio/api/helper/portfolio.helper';
+import { LogPerformance } from '@ghostfolio/api/interceptors/performance-logging/performance-logging.interceptor';
 import { AccountClusterRiskCurrentInvestment } from '@ghostfolio/api/models/rules/account-cluster-risk/current-investment';
 import { AccountClusterRiskSingleAccount } from '@ghostfolio/api/models/rules/account-cluster-risk/single-account';
 import { CurrencyClusterRiskBaseCurrencyCurrentInvestment } from '@ghostfolio/api/models/rules/currency-cluster-risk/base-currency-current-investment';
@@ -801,7 +801,7 @@ export class PortfolioService {
         });
 
       const stakeRewards = getSum(
-        orders
+        activities
           .filter(({ type }) => {
             return type === 'STAKE';
           })
@@ -1725,8 +1725,7 @@ export class PortfolioService {
 
     const { performance } = await this.getPerformance({
       impersonationId,
-      userId,
+      userId
-      portfolioCalculator
     });
 
     const {

apps/api/src/main.ts

@@ -10,7 +10,6 @@ import type { NestExpressApplication } from '@nestjs/platform-express';
 import { json } from 'body-parser';
 import helmet from 'helmet';
 
-import { LoggingInterceptor } from './aop/logging.interceptor';
 import { AppModule } from './app/app.module';
 import { environment } from './environments/environment';
 import { HtmlTemplateMiddleware } from './middlewares/html-template.middleware';
@@ -40,7 +39,6 @@ async function bootstrap() {
     type: VersioningType.URI
   });
   app.setGlobalPrefix('api', { exclude: ['sitemap.xml'] });
-  app.useGlobalInterceptors(new LoggingInterceptor());
   app.useGlobalPipes(
     new ValidationPipe({
       forbidNonWhitelisted: true,

apps/api/src/services/data-provider/data-provider.service.ts

@@ -1,6 +1,6 @@
-import { LogPerformance } from '@ghostfolio/api/aop/logging.interceptor';
 import { RedisCacheService } from '@ghostfolio/api/app/redis-cache/redis-cache.service';
 import { LookupItem } from '@ghostfolio/api/app/symbol/interfaces/lookup-item.interface';
+import { LogPerformance } from '@ghostfolio/api/interceptors/performance-logging/performance-logging.interceptor';
 import { ConfigurationService } from '@ghostfolio/api/services/configuration/configuration.service';
 import { DataProviderInterface } from '@ghostfolio/api/services/data-provider/interfaces/data-provider.interface';
 import {

apps/api/src/services/symbol-profile/symbol-profile.service.ts

@@ -1,4 +1,4 @@
-import { LogPerformance } from '@ghostfolio/api/aop/logging.interceptor';
+import { LogPerformance } from '@ghostfolio/api/interceptors/performance-logging/performance-logging.interceptor';
 import { PrismaService } from '@ghostfolio/api/services/prisma/prisma.service';
 import { UNKNOWN_KEY } from '@ghostfolio/common/config';
 import {