Skip to content

Open Source Wealth Management Software. Angular + NestJS + Prisma + Nx + TypeScript 🤍

Task/extend rule settings interface by locale (#5802)

Dibyendu Sahoob915c9554e6b
diff --git a/apps/api/src/models/interfaces/rule-settings.interface.ts b/apps/api/src/models/interfaces/rule-settings.interface.ts
index 377bab52b5..ff22650ca6 100644
--- a/apps/api/src/models/interfaces/rule-settings.interface.ts
+++ b/apps/api/src/models/interfaces/rule-settings.interface.ts
@@ -1,3 +1,4 @@
export interface RuleSettings {
isActive: boolean;
+ locale: string;
}
diff --git a/apps/api/src/models/rules/account-cluster-risk/current-investment.ts b/apps/api/src/models/rules/account-cluster-risk/current-investment.ts
index 0601eea9a7..51c808b255 100644
--- a/apps/api/src/models/rules/account-cluster-risk/current-investment.ts
+++ b/apps/api/src/models/rules/account-cluster-risk/current-investment.ts
@@ -121,9 +121,14 @@ export class AccountClusterRiskCurrentInvestment extends Rule<Settings> {
});
}
- public getSettings({ baseCurrency, xRayRules }: UserSettings): Settings {
+ public getSettings({
+ baseCurrency,
+ locale,
+ xRayRules
+ }: UserSettings): Settings {
return {
baseCurrency,
+ locale,
isActive: xRayRules?.[this.getKey()]?.isActive ?? true,
thresholdMax: xRayRules?.[this.getKey()]?.thresholdMax ?? 0.5
};
diff --git a/apps/api/src/models/rules/account-cluster-risk/single-account.ts b/apps/api/src/models/rules/account-cluster-risk/single-account.ts
index 8890bb7679..0e07a9dc68 100644
--- a/apps/api/src/models/rules/account-cluster-risk/single-account.ts
+++ b/apps/api/src/models/rules/account-cluster-risk/single-account.ts
@@ -72,8 +72,9 @@ export class AccountClusterRiskSingleAccount extends Rule<RuleSettings> {
});
}
- public getSettings({ xRayRules }: UserSettings): RuleSettings {
+ public getSettings({ locale, xRayRules }: UserSettings): RuleSettings {
return {
+ locale,
isActive: xRayRules?.[this.getKey()]?.isActive ?? true
};
}
diff --git a/apps/api/src/models/rules/asset-class-cluster-risk/equity.ts b/apps/api/src/models/rules/asset-class-cluster-risk/equity.ts
index dab55413e6..9a6f9dacb3 100644
--- a/apps/api/src/models/rules/asset-class-cluster-risk/equity.ts
+++ b/apps/api/src/models/rules/asset-class-cluster-risk/equity.ts
@@ -109,9 +109,14 @@ export class AssetClassClusterRiskEquity extends Rule<Settings> {
});
}
- public getSettings({ baseCurrency, xRayRules }: UserSettings): Settings {
+ public getSettings({
+ baseCurrency,
+ locale,
+ xRayRules
+ }: UserSettings): Settings {
return {
baseCurrency,
+ locale,
isActive: xRayRules?.[this.getKey()]?.isActive ?? true,
thresholdMax: xRayRules?.[this.getKey()]?.thresholdMax ?? 0.82,
thresholdMin: xRayRules?.[this.getKey()]?.thresholdMin ?? 0.78
diff --git a/apps/api/src/models/rules/asset-class-cluster-risk/fixed-income.ts b/apps/api/src/models/rules/asset-class-cluster-risk/fixed-income.ts
index f793ec16f0..70cdb63c87 100644
--- a/apps/api/src/models/rules/asset-class-cluster-risk/fixed-income.ts
+++ b/apps/api/src/models/rules/asset-class-cluster-risk/fixed-income.ts
@@ -109,9 +109,14 @@ export class AssetClassClusterRiskFixedIncome extends Rule<Settings> {
});
}
- public getSettings({ baseCurrency, xRayRules }: UserSettings): Settings {
+ public getSettings({
+ baseCurrency,
+ locale,
+ xRayRules
+ }: UserSettings): Settings {
return {
baseCurrency,
+ locale,
isActive: xRayRules?.[this.getKey()]?.isActive ?? true,
thresholdMax: xRayRules?.[this.getKey()]?.thresholdMax ?? 0.22,
thresholdMin: xRayRules?.[this.getKey()]?.thresholdMin ?? 0.18
diff --git a/apps/api/src/models/rules/currency-cluster-risk/base-currency-current-investment.ts b/apps/api/src/models/rules/currency-cluster-risk/base-currency-current-investment.ts
index 2c2b6c4d6b..273c98e359 100644
--- a/apps/api/src/models/rules/currency-cluster-risk/base-currency-current-investment.ts
+++ b/apps/api/src/models/rules/currency-cluster-risk/base-currency-current-investment.ts
@@ -97,9 +97,14 @@ export class CurrencyClusterRiskBaseCurrencyCurrentInvestment extends Rule<Setti
});
}
- public getSettings({ baseCurrency, xRayRules }: UserSettings): Settings {
+ public getSettings({
+ baseCurrency,
+ locale,
+ xRayRules
+ }: UserSettings): Settings {
return {
baseCurrency,
+ locale,
isActive: xRayRules?.[this.getKey()]?.isActive ?? true
};
}
diff --git a/apps/api/src/models/rules/currency-cluster-risk/current-investment.ts b/apps/api/src/models/rules/currency-cluster-risk/current-investment.ts
index 7a3693daf5..b09b7f3ef6 100644
--- a/apps/api/src/models/rules/currency-cluster-risk/current-investment.ts
+++ b/apps/api/src/models/rules/currency-cluster-risk/current-investment.ts
@@ -98,9 +98,14 @@ export class CurrencyClusterRiskCurrentInvestment extends Rule<Settings> {
});
}
- public getSettings({ baseCurrency, xRayRules }: UserSettings): Settings {
+ public getSettings({
+ baseCurrency,
+ locale,
+ xRayRules
+ }: UserSettings): Settings {
return {
baseCurrency,
+ locale,
isActive: xRayRules?.[this.getKey()]?.isActive ?? true,
thresholdMax: xRayRules?.[this.getKey()]?.thresholdMax ?? 0.5
};
diff --git a/apps/api/src/models/rules/economic-market-cluster-risk/developed-markets.ts b/apps/api/src/models/rules/economic-market-cluster-risk/developed-markets.ts
index 7ca7a2d769..fa4f80d404 100644
--- a/apps/api/src/models/rules/economic-market-cluster-risk/developed-markets.ts
+++ b/apps/api/src/models/rules/economic-market-cluster-risk/developed-markets.ts
@@ -104,9 +104,14 @@ export class EconomicMarketClusterRiskDevelopedMarkets extends Rule<Settings> {
});
}
- public getSettings({ baseCurrency, xRayRules }: UserSettings): Settings {
+ public getSettings({
+ baseCurrency,
+ locale,
+ xRayRules
+ }: UserSettings): Settings {
return {
baseCurrency,
+ locale,
isActive: xRayRules?.[this.getKey()]?.isActive ?? true,
thresholdMax: xRayRules?.[this.getKey()]?.thresholdMax ?? 0.72,
thresholdMin: xRayRules?.[this.getKey()]?.thresholdMin ?? 0.68
diff --git a/apps/api/src/models/rules/economic-market-cluster-risk/emerging-markets.ts b/apps/api/src/models/rules/economic-market-cluster-risk/emerging-markets.ts
index cbf9f98b7c..1414b53ed8 100644
--- a/apps/api/src/models/rules/economic-market-cluster-risk/emerging-markets.ts
+++ b/apps/api/src/models/rules/economic-market-cluster-risk/emerging-markets.ts
@@ -104,9 +104,14 @@ export class EconomicMarketClusterRiskEmergingMarkets extends Rule<Settings> {
});
}
- public getSettings({ baseCurrency, xRayRules }: UserSettings): Settings {
+ public getSettings({
+ baseCurrency,
+ locale,
+ xRayRules
+ }: UserSettings): Settings {
return {
baseCurrency,
+ locale,
isActive: xRayRules?.[this.getKey()]?.isActive ?? true,
thresholdMax: xRayRules?.[this.getKey()]?.thresholdMax ?? 0.32,
thresholdMin: xRayRules?.[this.getKey()]?.thresholdMin ?? 0.28
diff --git a/apps/api/src/models/rules/emergency-fund/emergency-fund-setup.ts b/apps/api/src/models/rules/emergency-fund/emergency-fund-setup.ts
index d97805fa67..2129f438ba 100644
--- a/apps/api/src/models/rules/emergency-fund/emergency-fund-setup.ts
+++ b/apps/api/src/models/rules/emergency-fund/emergency-fund-setup.ts
@@ -59,9 +59,14 @@ export class EmergencyFundSetup extends Rule<Settings> {
});
}
- public getSettings({ baseCurrency, xRayRules }: UserSettings): Settings {
+ public getSettings({
+ baseCurrency,
+ locale,
+ xRayRules
+ }: UserSettings): Settings {
return {
baseCurrency,
+ locale,
isActive: xRayRules?.[this.getKey()]?.isActive ?? true
};
}
diff --git a/apps/api/src/models/rules/fees/fee-ratio-initial-investment.ts b/apps/api/src/models/rules/fees/fee-ratio-initial-investment.ts
index 93c9aafd3f..c5448a2771 100644
--- a/apps/api/src/models/rules/fees/fee-ratio-initial-investment.ts
+++ b/apps/api/src/models/rules/fees/fee-ratio-initial-investment.ts
@@ -82,9 +82,14 @@ export class FeeRatioInitialInvestment extends Rule<Settings> {
});
}
- public getSettings({ baseCurrency, xRayRules }: UserSettings): Settings {
+ public getSettings({
+ baseCurrency,
+ locale,
+ xRayRules
+ }: UserSettings): Settings {
return {
baseCurrency,
+ locale,
isActive: xRayRules?.[this.getKey()]?.isActive ?? true,
thresholdMax: xRayRules?.[this.getKey()]?.thresholdMax ?? 0.01
};
diff --git a/apps/api/src/models/rules/liquidity/buying-power.ts b/apps/api/src/models/rules/liquidity/buying-power.ts
index 539d0a7285..70393278d4 100644
--- a/apps/api/src/models/rules/liquidity/buying-power.ts
+++ b/apps/api/src/models/rules/liquidity/buying-power.ts
@@ -86,9 +86,14 @@ export class BuyingPower extends Rule<Settings> {
});
}
- public getSettings({ baseCurrency, xRayRules }: UserSettings): Settings {
+ public getSettings({
+ baseCurrency,
+ locale,
+ xRayRules
+ }: UserSettings): Settings {
return {
baseCurrency,
+ locale,
isActive: xRayRules?.[this.getKey()]?.isActive ?? true,
thresholdMin: xRayRules?.[this.getKey()]?.thresholdMin ?? 0
};
diff --git a/apps/api/src/models/rules/regional-market-cluster-risk/asia-pacific.ts b/apps/api/src/models/rules/regional-market-cluster-risk/asia-pacific.ts
index 5d6cc999ac..1242df759d 100644
--- a/apps/api/src/models/rules/regional-market-cluster-risk/asia-pacific.ts
+++ b/apps/api/src/models/rules/regional-market-cluster-risk/asia-pacific.ts
@@ -94,9 +94,14 @@ export class RegionalMarketClusterRiskAsiaPacific extends Rule<Settings> {
});
}
- public getSettings({ baseCurrency, xRayRules }: UserSettings): Settings {
+ public getSettings({
+ baseCurrency,
+ locale,
+ xRayRules
+ }: UserSettings): Settings {
return {
baseCurrency,
+ locale,
isActive: xRayRules?.[this.getKey()]?.isActive ?? true,
thresholdMax: xRayRules?.[this.getKey()]?.thresholdMax ?? 0.03,
thresholdMin: xRayRules?.[this.getKey()]?.thresholdMin ?? 0.02
diff --git a/apps/api/src/models/rules/regional-market-cluster-risk/emerging-markets.ts b/apps/api/src/models/rules/regional-market-cluster-risk/emerging-markets.ts
index fa13a9e572..8486d843bb 100644
--- a/apps/api/src/models/rules/regional-market-cluster-risk/emerging-markets.ts
+++ b/apps/api/src/models/rules/regional-market-cluster-risk/emerging-markets.ts
@@ -96,9 +96,14 @@ export class RegionalMarketClusterRiskEmergingMarkets extends Rule<Settings> {
});
}
- public getSettings({ baseCurrency, xRayRules }: UserSettings): Settings {
+ public getSettings({
+ baseCurrency,
+ locale,
+ xRayRules
+ }: UserSettings): Settings {
return {
baseCurrency,
+ locale,
isActive: xRayRules?.[this.getKey()]?.isActive ?? true,
thresholdMax: xRayRules?.[this.getKey()]?.thresholdMax ?? 0.12,
thresholdMin: xRayRules?.[this.getKey()]?.thresholdMin ?? 0.08
diff --git a/apps/api/src/models/rules/regional-market-cluster-risk/europe.ts b/apps/api/src/models/rules/regional-market-cluster-risk/europe.ts
index 3bbe7af844..459848db43 100644
--- a/apps/api/src/models/rules/regional-market-cluster-risk/europe.ts
+++ b/apps/api/src/models/rules/regional-market-cluster-risk/europe.ts
@@ -94,9 +94,14 @@ export class RegionalMarketClusterRiskEurope extends Rule<Settings> {
});
}
- public getSettings({ baseCurrency, xRayRules }: UserSettings): Settings {
+ public getSettings({
+ baseCurrency,
+ locale,
+ xRayRules
+ }: UserSettings): Settings {
return {
baseCurrency,
+ locale,
isActive: xRayRules?.[this.getKey()]?.isActive ?? true,
thresholdMax: xRayRules?.[this.getKey()]?.thresholdMax ?? 0.15,
thresholdMin: xRayRules?.[this.getKey()]?.thresholdMin ?? 0.11
diff --git a/apps/api/src/models/rules/regional-market-cluster-risk/japan.ts b/apps/api/src/models/rules/regional-market-cluster-risk/japan.ts
index 952e147952..d9c1cff6b6 100644
--- a/apps/api/src/models/rules/regional-market-cluster-risk/japan.ts
+++ b/apps/api/src/models/rules/regional-market-cluster-risk/japan.ts
@@ -94,9 +94,14 @@ export class RegionalMarketClusterRiskJapan extends Rule<Settings> {
});
}
- public getSettings({ baseCurrency, xRayRules }: UserSettings): Settings {
+ public getSettings({
+ baseCurrency,
+ locale,
+ xRayRules
+ }: UserSettings): Settings {
return {
baseCurrency,
+ locale,
isActive: xRayRules?.[this.getKey()]?.isActive ?? true,
thresholdMax: xRayRules?.[this.getKey()]?.thresholdMax ?? 0.06,
thresholdMin: xRayRules?.[this.getKey()]?.thresholdMin ?? 0.04
diff --git a/apps/api/src/models/rules/regional-market-cluster-risk/north-america.ts b/apps/api/src/models/rules/regional-market-cluster-risk/north-america.ts
index f022ecff95..6180a2cc5f 100644
--- a/apps/api/src/models/rules/regional-market-cluster-risk/north-america.ts
+++ b/apps/api/src/models/rules/regional-market-cluster-risk/north-america.ts
@@ -94,9 +94,14 @@ export class RegionalMarketClusterRiskNorthAmerica extends Rule<Settings> {
});
}
- public getSettings({ baseCurrency, xRayRules }: UserSettings): Settings {
+ public getSettings({
+ baseCurrency,
+ locale,
+ xRayRules
+ }: UserSettings): Settings {
return {
baseCurrency,
+ locale,
isActive: xRayRules?.[this.getKey()]?.isActive ?? true,
thresholdMax: xRayRules?.[this.getKey()]?.thresholdMax ?? 0.69,
thresholdMin: xRayRules?.[this.getKey()]?.thresholdMin ?? 0.65