Skip to content

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

Task/refactor deprecated portfolio position attributes in X-ray rules (#6776)

Thomas Kaul21ed03f5ba6b
diff --git a/apps/api/src/models/rule.ts b/apps/api/src/models/rule.ts
index 5603964c5a..66cda1d78f 100644
--- a/apps/api/src/models/rule.ts
+++ b/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,10 @@ export abstract class Rule<T extends RuleSettings> implements RuleInterface<T> {
public groupCurrentHoldingsByAttribute(
holdings: PortfolioPosition[],
- attribute: keyof PortfolioPosition,
+ attribute: `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 +59,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
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 372b0bb066..12303fd927 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
@@ -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 =
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 404b4cd323..fd7c00f11b 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
@@ -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 =
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 83c72eeb87..6890fecd60 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
@@ -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
);
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 e52a315043..00727dcd7b 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
@@ -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
);
diff --git a/libs/common/src/lib/helper.ts b/libs/common/src/lib/helper.ts
index 4db1fcf2d0..2d8cd90e41 100644
--- a/libs/common/src/lib/helper.ts
+++ b/libs/common/src/lib/helper.ts
@@ -342,20 +342,6 @@ export function getYesterday() {
return subDays(new Date(Date.UTC(year, month, day)), 1);
}
-export function groupBy<T, K extends keyof T>(
- key: K,
- arr: T[]
-): Map<T[K], T[]> {
- const map = new Map<T[K], T[]>();
- arr.forEach((t) => {
- if (!map.has(t[key])) {
- map.set(t[key], []);
- }
- map.get(t[key])!.push(t);
- });
- return map;
-}
-
export function interpolate(template: string, context: any) {
return template?.replace(/[$]{([^}]+)}/g, (_, objectPath) => {
const properties = objectPath.split('.');