Merge branch 'main' of gitea.suda.codes:giteauser/ghostfolio-mirror

.husky/pre-commit

@@ -1,6 +1,6 @@
 # Run linting and stop the commit process if any errors are found
 # --quiet suppresses warnings (temporary until all warnings are fixed)
-npm run lint --quiet || exit 1
+npm run affected:lint --base=main --head=HEAD --parallel=2 --quiet || exit 1
 
 # Check formatting on modified and uncommitted files, stop the commit if issues are found
 npm run format:check --uncommitted || exit 1

CHANGELOG.md

@@ -5,10 +5,11 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## Unreleased
+## 2.118.0 - 2024-10-23
 
 ### Added
 
+- Added a new static portfolio analysis rule: Allocation Cluster Risk (Developed Markets)
 - Added a new static portfolio analysis rule: Allocation Cluster Risk (Emerging Markets)
 - Added support for mutual funds in the _EOD Historical Data_ service
 
@@ -16,6 +17,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Improved the font colors of the chart of the holdings tab on the home page (experimental)
 - Optimized the dialog sizes for mobile (full screen)
+- Optimized the git-hook via `husky` to lint only affected projects before a commit
 - Upgraded `angular` from version `18.1.1` to `18.2.8`
 - Upgraded `Nx` from version `19.5.6` to `20.0.3`
 

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

@@ -7,6 +7,7 @@ import { UserService } from '@ghostfolio/api/app/user/user.service';
 import { getFactor } from '@ghostfolio/api/helper/portfolio.helper';
 import { AccountClusterRiskCurrentInvestment } from '@ghostfolio/api/models/rules/account-cluster-risk/current-investment';
 import { AccountClusterRiskSingleAccount } from '@ghostfolio/api/models/rules/account-cluster-risk/single-account';
+import { AllocationClusterRiskDevelopedMarkets } from '@ghostfolio/api/models/rules/allocation-cluster-risk/developed-markets';
 import { AllocationClusterRiskEmergingMarkets } from '@ghostfolio/api/models/rules/allocation-cluster-risk/emerging-markets';
 import { CurrencyClusterRiskBaseCurrencyCurrentInvestment } from '@ghostfolio/api/models/rules/currency-cluster-risk/base-currency-current-investment';
 import { CurrencyClusterRiskCurrentInvestment } from '@ghostfolio/api/models/rules/currency-cluster-risk/current-investment';
@@ -1190,6 +1191,11 @@ export class PortfolioService {
           summary.ordersCount > 0
             ? await this.rulesService.evaluate(
                 [
+                  new AllocationClusterRiskDevelopedMarkets(
+                    this.exchangeRateDataService,
+                    summary.currentValueInBaseCurrency,
+                    markets.developedMarkets.valueInBaseCurrency
+                  ),
                   new AllocationClusterRiskEmergingMarkets(
                     this.exchangeRateDataService,
                     summary.currentValueInBaseCurrency,

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

@@ -4,6 +4,7 @@ import { environment } from '@ghostfolio/api/environments/environment';
 import { PortfolioChangedEvent } from '@ghostfolio/api/events/portfolio-changed.event';
 import { AccountClusterRiskCurrentInvestment } from '@ghostfolio/api/models/rules/account-cluster-risk/current-investment';
 import { AccountClusterRiskSingleAccount } from '@ghostfolio/api/models/rules/account-cluster-risk/single-account';
+import { AllocationClusterRiskDevelopedMarkets } from '@ghostfolio/api/models/rules/allocation-cluster-risk/developed-markets';
 import { AllocationClusterRiskEmergingMarkets } from '@ghostfolio/api/models/rules/allocation-cluster-risk/emerging-markets';
 import { CurrencyClusterRiskBaseCurrencyCurrentInvestment } from '@ghostfolio/api/models/rules/currency-cluster-risk/base-currency-current-investment';
 import { CurrencyClusterRiskCurrentInvestment } from '@ghostfolio/api/models/rules/currency-cluster-risk/current-investment';
@@ -216,6 +217,12 @@ export class UserService {
         undefined,
         {}
       ).getSettings(user.Settings.settings),
+      AllocationClusterRiskDevelopedMarkets:
+        new AllocationClusterRiskDevelopedMarkets(
+          undefined,
+          undefined,
+          undefined
+        ).getSettings(user.Settings.settings),
       AllocationClusterRiskEmergingMarkets:
         new AllocationClusterRiskEmergingMarkets(
           undefined,

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

@@ -0,0 +1,84 @@
+import { RuleSettings } from '@ghostfolio/api/models/interfaces/rule-settings.interface';
+import { Rule } from '@ghostfolio/api/models/rule';
+import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.service';
+import { UserSettings } from '@ghostfolio/common/interfaces';
+
+export class AllocationClusterRiskDevelopedMarkets extends Rule<Settings> {
+  private currentValueInBaseCurrency: number;
+  private developedMarketsValueInBaseCurrency: number;
+
+  public constructor(
+    protected exchangeRateDataService: ExchangeRateDataService,
+    currentValueInBaseCurrency: number,
+    developedMarketsValueInBaseCurrency: number
+  ) {
+    super(exchangeRateDataService, {
+      key: AllocationClusterRiskDevelopedMarkets.name,
+      name: 'Developed Markets'
+    });
+
+    this.currentValueInBaseCurrency = currentValueInBaseCurrency;
+    this.developedMarketsValueInBaseCurrency =
+      developedMarketsValueInBaseCurrency;
+  }
+
+  public evaluate(ruleSettings: Settings) {
+    const developedMarketsValueRatio = this.currentValueInBaseCurrency
+      ? this.developedMarketsValueInBaseCurrency /
+        this.currentValueInBaseCurrency
+      : 0;
+
+    if (developedMarketsValueRatio > ruleSettings.thresholdMax) {
+      return {
+        evaluation: `The developed markets contribution of your current investment (${(developedMarketsValueRatio * 100).toPrecision(3)}%) exceeds ${(
+          ruleSettings.thresholdMax * 100
+        ).toPrecision(3)}%`,
+        value: false
+      };
+    } else if (developedMarketsValueRatio < ruleSettings.thresholdMin) {
+      return {
+        evaluation: `The developed markets contribution of your current investment (${(developedMarketsValueRatio * 100).toPrecision(3)}%) is below ${(
+          ruleSettings.thresholdMin * 100
+        ).toPrecision(3)}%`,
+        value: false
+      };
+    }
+
+    return {
+      evaluation: `The developed markets contribution of your current investment (${(developedMarketsValueRatio * 100).toPrecision(3)}%) is within the range of ${(
+        ruleSettings.thresholdMin * 100
+      ).toPrecision(
+        3
+      )}% and ${(ruleSettings.thresholdMax * 100).toPrecision(3)}%`,
+      value: true
+    };
+  }
+
+  public getConfiguration() {
+    return {
+      threshold: {
+        max: 1,
+        min: 0,
+        step: 0.01,
+        unit: '%'
+      },
+      thresholdMax: true,
+      thresholdMin: true
+    };
+  }
+
+  public getSettings({ baseCurrency, xRayRules }: UserSettings): Settings {
+    return {
+      baseCurrency,
+      isActive: xRayRules?.[this.getKey()]?.isActive ?? true,
+      thresholdMax: xRayRules?.[this.getKey()]?.thresholdMax ?? 0.72,
+      thresholdMin: xRayRules?.[this.getKey()]?.thresholdMin ?? 0.68
+    };
+  }
+}
+
+interface Settings extends RuleSettings {
+  baseCurrency: string;
+  thresholdMin: number;
+  thresholdMax: number;
+}

libs/common/src/lib/types/x-ray-rules-settings.type.ts

@@ -1,6 +1,7 @@
 export type XRayRulesSettings = {
   AccountClusterRiskCurrentInvestment?: RuleSettings;
   AccountClusterRiskSingleAccount?: RuleSettings;
+  AllocationClusterRiskDevelopedMarkets?: RuleSettings;
   AllocationClusterRiskEmergingMarkets?: RuleSettings;
   CurrencyClusterRiskBaseCurrencyCurrentInvestment?: RuleSettings;
   CurrencyClusterRiskCurrentInvestment?: RuleSettings;

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ghostfolio",
-  "version": "2.117.0",
+  "version": "2.118.0",
   "homepage": "https://ghostfol.io",
   "license": "AGPL-3.0",
   "repository": "https://github.com/ghostfolio/ghostfolio",