Skip to content

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

Bugfix/add missing guards in getSettings() of static portfolio analysis rules (#5368)

Thomas Kaul7d1300bea128
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 dbf3fee4d4..0601eea9a7 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
@@ -124,7 +124,7 @@ export class AccountClusterRiskCurrentInvestment extends Rule<Settings> {
public getSettings({ baseCurrency, xRayRules }: UserSettings): Settings {
return {
baseCurrency,
- isActive: xRayRules?.[this.getKey()].isActive ?? true,
+ 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 6045e58927..8890bb7679 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
@@ -74,7 +74,7 @@ export class AccountClusterRiskSingleAccount extends Rule<RuleSettings> {
public getSettings({ xRayRules }: UserSettings): RuleSettings {
return {
- isActive: xRayRules?.[this.getKey()].isActive ?? true
+ isActive: xRayRules?.[this.getKey()]?.isActive ?? true
};
}
}
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 c427a842ed..2c2b6c4d6b 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
@@ -100,7 +100,7 @@ export class CurrencyClusterRiskBaseCurrencyCurrentInvestment extends Rule<Setti
public getSettings({ baseCurrency, xRayRules }: UserSettings): Settings {
return {
baseCurrency,
- isActive: xRayRules?.[this.getKey()].isActive ?? true
+ 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 ace38100fa..7a3693daf5 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
@@ -101,7 +101,7 @@ export class CurrencyClusterRiskCurrentInvestment extends Rule<Settings> {
public getSettings({ baseCurrency, xRayRules }: UserSettings): Settings {
return {
baseCurrency,
- isActive: xRayRules?.[this.getKey()].isActive ?? true,
+ isActive: xRayRules?.[this.getKey()]?.isActive ?? true,
thresholdMax: xRayRules?.[this.getKey()]?.thresholdMax ?? 0.5
};
}
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 1de51d0e76..d97805fa67 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
@@ -62,7 +62,7 @@ export class EmergencyFundSetup extends Rule<Settings> {
public getSettings({ baseCurrency, xRayRules }: UserSettings): Settings {
return {
baseCurrency,
- isActive: xRayRules?.[this.getKey()].isActive ?? true
+ 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 805b86fd42..93c9aafd3f 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
@@ -85,7 +85,7 @@ export class FeeRatioInitialInvestment extends Rule<Settings> {
public getSettings({ baseCurrency, xRayRules }: UserSettings): Settings {
return {
baseCurrency,
- isActive: xRayRules?.[this.getKey()].isActive ?? true,
+ 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 a8b74f3545..c4884c0663 100644
--- a/apps/api/src/models/rules/liquidity/buying-power.ts
+++ b/apps/api/src/models/rules/liquidity/buying-power.ts
@@ -78,7 +78,7 @@ export class BuyingPower extends Rule<Settings> {
public getSettings({ baseCurrency, xRayRules }: UserSettings): Settings {
return {
baseCurrency,
- isActive: xRayRules?.[this.getKey()].isActive ?? true,
+ isActive: xRayRules?.[this.getKey()]?.isActive ?? true,
thresholdMin: xRayRules?.[this.getKey()]?.thresholdMin ?? 0
};
}