Refactor deprecated portfolio position attributes to asset profile

apps/api/src/models/rule.ts

@@ -1,6 +1,5 @@
 import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.service';
 import { DEFAULT_LANGUAGE_CODE } from '@ghostfolio/common/config';
-import { groupBy } from '@ghostfolio/common/helper';
 import {
   PortfolioPosition,
   PortfolioReportRule,
@@ -9,6 +8,7 @@ import {
 } from '@ghostfolio/common/interfaces';
 
 import { Big } from 'big.js';
+import { groupBy } from 'lodash';
 
 import { EvaluationResult } from './interfaces/evaluation-result.interface';
 import { RuleInterface } from './interfaces/rule.interface';
@@ -41,10 +41,12 @@ export abstract class Rule<T extends RuleSettings> implements RuleInterface<T> {
 
   public groupCurrentHoldingsByAttribute(
     holdings: PortfolioPosition[],
-    attribute: keyof PortfolioPosition,
+    attribute:
+      | keyof PortfolioPosition
+      | `assetProfile.${Extract<keyof PortfolioPosition['assetProfile'], string>}`,
     baseCurrency: string
   ) {
-    return Array.from(groupBy(attribute, holdings).entries()).map(
+    return Object.entries(groupBy(holdings, attribute)).map(
       ([attributeValue, objs]) => ({
         groupKey: attributeValue,
         investment: objs.reduce(
@@ -59,7 +61,7 @@ export abstract class Rule<T extends RuleSettings> implements RuleInterface<T> {
               new Big(currentValue.quantity)
                 .mul(currentValue.marketPrice ?? 0)
                 .toNumber(),
-              currentValue.currency,
+              currentValue.assetProfile.currency,
               baseCurrency
             ),
           0

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

@@ -27,9 +27,10 @@ export class AssetClassClusterRiskEquity extends Rule<Settings> {
   public evaluate(ruleSettings: Settings) {
     const holdingsGroupedByAssetClass = this.groupCurrentHoldingsByAttribute(
       this.holdings,
-      'assetClass',
+      'assetProfile.assetClass',
       ruleSettings.baseCurrency
     );
+
     let totalValue = 0;
 
     const equityValueInBaseCurrency =

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

@@ -27,9 +27,10 @@ export class AssetClassClusterRiskFixedIncome extends Rule<Settings> {
   public evaluate(ruleSettings: Settings) {
     const holdingsGroupedByAssetClass = this.groupCurrentHoldingsByAttribute(
       this.holdings,
-      'assetClass',
+      'assetProfile.assetClass',
       ruleSettings.baseCurrency
     );
+
     let totalValue = 0;
 
     const fixedIncomeValueInBaseCurrency =

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

@@ -27,7 +27,7 @@ export class CurrencyClusterRiskBaseCurrencyCurrentInvestment extends Rule<Setti
   public evaluate(ruleSettings: Settings) {
     const holdingsGroupedByCurrency = this.groupCurrentHoldingsByAttribute(
       this.holdings,
-      'currency',
+      'assetProfile.currency',
       ruleSettings.baseCurrency
     );
 

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

@@ -27,7 +27,7 @@ export class CurrencyClusterRiskCurrentInvestment extends Rule<Settings> {
   public evaluate(ruleSettings: Settings) {
     const holdingsGroupedByCurrency = this.groupCurrentHoldingsByAttribute(
       this.holdings,
-      'currency',
+      'assetProfile.currency',
       ruleSettings.baseCurrency
     );