Centralize X-ray rule settings

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

@@ -20,7 +20,7 @@ export class RulesService {
         userSettings: aUserSettings
       });
 
-      if (settings?.isActive) {
+      if (settings.isActive) {
         const { evaluation, value } = rule.evaluate(settings);
 
         return {

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

@@ -13,8 +13,8 @@ export class CurrencyClusterRiskBaseCurrencyCurrentInvestment extends Rule<Setti
     languageCode: string
   ) {
     super(exchangeRateDataService, {
-      key: 'CurrencyClusterRiskBaseCurrencyCurrentInvestment',
+      languageCode,
-      languageCode
+      key: 'CurrencyClusterRiskBaseCurrencyCurrentInvestment'
     });
 
     this.holdings = holdings;

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

@@ -13,8 +13,8 @@ export class CurrencyClusterRiskCurrentInvestment extends Rule<Settings> {
     languageCode: string
   ) {
     super(exchangeRateDataService, {
-      key: 'CurrencyClusterRiskCurrentInvestment',
+      languageCode,
-      languageCode
+      key: 'CurrencyClusterRiskCurrentInvestment'
     });
 
     this.holdings = holdings;