Code Review

apps/api/src/app/endpoints/benchmarks/benchmarks.module.ts

@@ -36,8 +36,8 @@ import { BenchmarksService } from './benchmarks.service';
     ConfigurationModule,
     DataProviderModule,
     ExchangeRateDataModule,
-    ImpersonationModule,
     I18nModule,
+    ImpersonationModule,
     MarketDataModule,
     OrderModule,
     PortfolioSnapshotQueueModule,

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

@@ -40,8 +40,8 @@ import { RulesService } from './rules.service';
     DataGatheringModule,
     DataProviderModule,
     ExchangeRateDataModule,
-    ImpersonationModule,
     I18nModule,
+    ImpersonationModule,
     MarketDataModule,
     OrderModule,
     PerformanceLoggingModule,

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

@@ -106,8 +106,8 @@ export class PortfolioService {
     private readonly calculatorFactory: PortfolioCalculatorFactory,
     private readonly dataProviderService: DataProviderService,
     private readonly exchangeRateDataService: ExchangeRateDataService,
-    private readonly impersonationService: ImpersonationService,
     private readonly i18nService: I18nService,
+    private readonly impersonationService: ImpersonationService,
     private readonly orderService: OrderService,
     @Inject(REQUEST) private readonly request: RequestWithUser,
     private readonly rulesService: RulesService,
@@ -1335,10 +1335,10 @@ export class PortfolioService {
         [
           new FeeRatioInitialInvestment(
             this.exchangeRateDataService,
+            this.i18nService,
             userSettings.language,
             summary.committedFunds,
-            summary.fees,
-            this.i18nService
+            summary.fees
           )
         ],
         userSettings

apps/api/src/models/rule.ts

@@ -57,7 +57,7 @@ export abstract class Rule<T extends RuleSettings> implements RuleInterface<T> {
             previousValue +
             this.exchangeRateDataService.toCurrency(
               new Big(currentValue.quantity)
-                .mul(currentValue.marketPrice ?? 0)
+                .mul(currentValue.marketPrice)
                 .toNumber(),
               currentValue.currency,
               baseCurrency

apps/api/src/models/rules/fees/fee-ratio-initial-investment.ts

@@ -10,10 +10,10 @@ export class FeeRatioInitialInvestment extends Rule<Settings> {
 
   public constructor(
     protected exchangeRateDataService: ExchangeRateDataService,
+    private i18nService: I18nService,
     languageCode: string,
     totalInvestment: number,
-    fees: number,
-    private i18nService: I18nService
+    fees: number
   ) {
     super(exchangeRateDataService, {
       languageCode,

apps/api/src/services/i18n/i18n.module.ts

@@ -3,7 +3,7 @@ import { Module } from '@nestjs/common';
 import { I18nService } from './i18n.service';
 
 @Module({
-  providers: [I18nService],
-  exports: [I18nService]
+  exports: [I18nService],
+  providers: [I18nService]
 })
 export class I18nModule {}