Use a single object parameter for the Rule constructor

apps/api/src/models/rule.ts

@@ -13,19 +13,21 @@ import { EvaluationResult } from './interfaces/evaluation-result.interface';
 import { RuleInterface } from './interfaces/rule.interface';
 
 export abstract class Rule<T extends RuleSettings> implements RuleInterface<T> {
+  protected exchangeRateDataService: ExchangeRateDataService;
+
   private key: XRayRuleKey;
   private languageCode: string;
 
-  public constructor(
+  public constructor({
-    protected exchangeRateDataService: ExchangeRateDataService,
+    exchangeRateDataService,
-    {
+    key,
-      key,
+    languageCode
-      languageCode
+  }: {
-    }: {
+    exchangeRateDataService: ExchangeRateDataService;
-      key: XRayRuleKey;
+    key: XRayRuleKey;
-      languageCode: string;
+    languageCode: string;
-    }
+  }) {
-  ) {
+    this.exchangeRateDataService = exchangeRateDataService;
     this.key = key;
     this.languageCode = languageCode;
   }

apps/api/src/models/rules/account-cluster-risk/current-investment.ts

@@ -20,7 +20,8 @@ export class AccountClusterRiskCurrentInvestment extends Rule<Settings> {
     i18nService: I18nService;
     languageCode: string;
   }) {
-    super(exchangeRateDataService, {
+    super({
+      exchangeRateDataService,
       languageCode,
       key: 'AccountClusterRiskCurrentInvestment'
     });

apps/api/src/models/rules/account-cluster-risk/single-account.ts

@@ -18,7 +18,8 @@ export class AccountClusterRiskSingleAccount extends Rule<RuleSettings> {
     i18nService: I18nService;
     languageCode: string;
   }) {
-    super(exchangeRateDataService, {
+    super({
+      exchangeRateDataService,
       languageCode,
       key: 'AccountClusterRiskSingleAccount'
     });

apps/api/src/models/rules/asset-class-cluster-risk/equity.ts

@@ -18,7 +18,8 @@ export class AssetClassClusterRiskEquity extends Rule<Settings> {
     i18nService: I18nService;
     languageCode: string;
   }) {
-    super(exchangeRateDataService, {
+    super({
+      exchangeRateDataService,
       languageCode,
       key: 'AssetClassClusterRiskEquity'
     });

apps/api/src/models/rules/asset-class-cluster-risk/fixed-income.ts

@@ -18,7 +18,8 @@ export class AssetClassClusterRiskFixedIncome extends Rule<Settings> {
     i18nService: I18nService;
     languageCode: string;
   }) {
-    super(exchangeRateDataService, {
+    super({
+      exchangeRateDataService,
       languageCode,
       key: 'AssetClassClusterRiskFixedIncome'
     });

apps/api/src/models/rules/currency-cluster-risk/base-currency-current-investment.ts

@@ -18,7 +18,8 @@ export class CurrencyClusterRiskBaseCurrencyCurrentInvestment extends Rule<Setti
     i18nService: I18nService;
     languageCode: string;
   }) {
-    super(exchangeRateDataService, {
+    super({
+      exchangeRateDataService,
       languageCode,
       key: 'CurrencyClusterRiskBaseCurrencyCurrentInvestment'
     });

apps/api/src/models/rules/currency-cluster-risk/current-investment.ts

@@ -18,7 +18,8 @@ export class CurrencyClusterRiskCurrentInvestment extends Rule<Settings> {
     i18nService: I18nService;
     languageCode: string;
   }) {
-    super(exchangeRateDataService, {
+    super({
+      exchangeRateDataService,
       languageCode,
       key: 'CurrencyClusterRiskCurrentInvestment'
     });

apps/api/src/models/rules/economic-market-cluster-risk/developed-markets.ts

@@ -21,7 +21,8 @@ export class EconomicMarketClusterRiskDevelopedMarkets extends Rule<Settings> {
     i18nService: I18nService;
     languageCode: string;
   }) {
-    super(exchangeRateDataService, {
+    super({
+      exchangeRateDataService,
       languageCode,
       key: 'EconomicMarketClusterRiskDevelopedMarkets'
     });

apps/api/src/models/rules/economic-market-cluster-risk/emerging-markets.ts

@@ -21,7 +21,8 @@ export class EconomicMarketClusterRiskEmergingMarkets extends Rule<Settings> {
     i18nService: I18nService;
     languageCode: string;
   }) {
-    super(exchangeRateDataService, {
+    super({
+      exchangeRateDataService,
       languageCode,
       key: 'EconomicMarketClusterRiskEmergingMarkets'
     });

apps/api/src/models/rules/emergency-fund/emergency-fund-coverage.ts

@@ -26,7 +26,8 @@ export class EmergencyFundCoverage extends Rule<Settings> {
     i18nService: I18nService;
     languageCode: string;
   }) {
-    super(exchangeRateDataService, {
+    super({
+      exchangeRateDataService,
       languageCode,
       key: 'EmergencyFundCoverage'
     });

apps/api/src/models/rules/emergency-fund/emergency-fund-setup.ts

@@ -18,10 +18,7 @@ export class EmergencyFundSetup extends Rule<Settings> {
     i18nService: I18nService;
     languageCode: string;
   }) {
-    super(exchangeRateDataService, {
+    super({ exchangeRateDataService, languageCode, key: 'EmergencyFundSetup' });
-      languageCode,
-      key: 'EmergencyFundSetup'
-    });
 
     this.emergencyFund = emergencyFund;
     this.i18nService = i18nService;

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

@@ -21,7 +21,8 @@ export class FeeRatioTotalInvestmentVolume extends Rule<Settings> {
     languageCode: string;
     totalInvestmentVolumeInBaseCurrency: number;
   }) {
-    super(exchangeRateDataService, {
+    super({
+      exchangeRateDataService,
       languageCode,
       key: 'FeeRatioTotalInvestmentVolume'
     });

apps/api/src/models/rules/liquidity/buying-power.ts

@@ -18,10 +18,7 @@ export class BuyingPower extends Rule<Settings> {
     i18nService: I18nService;
     languageCode: string;
   }) {
-    super(exchangeRateDataService, {
+    super({ exchangeRateDataService, languageCode, key: 'BuyingPower' });
-      languageCode,
-      key: 'BuyingPower'
-    });
 
     this.buyingPower = buyingPower;
     this.i18nService = i18nService;

apps/api/src/models/rules/regional-market-cluster-risk/asia-pacific.ts

@@ -22,7 +22,8 @@ export class RegionalMarketClusterRiskAsiaPacific extends Rule<Settings> {
     i18nService: I18nService;
     languageCode: string;
   }) {
-    super(exchangeRateDataService, {
+    super({
+      exchangeRateDataService,
       languageCode,
       key: 'RegionalMarketClusterRiskAsiaPacific'
     });

apps/api/src/models/rules/regional-market-cluster-risk/emerging-markets.ts

@@ -22,7 +22,8 @@ export class RegionalMarketClusterRiskEmergingMarkets extends Rule<Settings> {
     i18nService: I18nService;
     languageCode: string;
   }) {
-    super(exchangeRateDataService, {
+    super({
+      exchangeRateDataService,
       languageCode,
       key: 'RegionalMarketClusterRiskEmergingMarkets'
     });

apps/api/src/models/rules/regional-market-cluster-risk/europe.ts

@@ -22,7 +22,8 @@ export class RegionalMarketClusterRiskEurope extends Rule<Settings> {
     i18nService: I18nService;
     languageCode: string;
   }) {
-    super(exchangeRateDataService, {
+    super({
+      exchangeRateDataService,
       languageCode,
       key: 'RegionalMarketClusterRiskEurope'
     });

apps/api/src/models/rules/regional-market-cluster-risk/japan.ts

@@ -22,7 +22,8 @@ export class RegionalMarketClusterRiskJapan extends Rule<Settings> {
     japanValueInBaseCurrency: number;
     languageCode: string;
   }) {
-    super(exchangeRateDataService, {
+    super({
+      exchangeRateDataService,
       languageCode,
       key: 'RegionalMarketClusterRiskJapan'
     });

apps/api/src/models/rules/regional-market-cluster-risk/north-america.ts

@@ -22,7 +22,8 @@ export class RegionalMarketClusterRiskNorthAmerica extends Rule<Settings> {
     languageCode: string;
     northAmericaValueInBaseCurrency: number;
   }) {
-    super(exchangeRateDataService, {
+    super({
+      exchangeRateDataService,
       languageCode,
       key: 'RegionalMarketClusterRiskNorthAmerica'
     });