Refactor analytics and report from platforms to accounts

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

@@ -7,7 +7,7 @@ import { Injectable } from '@nestjs/common';
 import { Currency, Type } from '@prisma/client';
 import { parseISO } from 'date-fns';
 
-import { OrderWithPlatform } from '../order/interfaces/order-with-platform.type';
+import { OrderWithAccount } from '../order/interfaces/order-with-account.type';
 import { CreateOrderDto } from './create-order.dto';
 import { Data } from './interfaces/data.interface';
 
@@ -33,7 +33,7 @@ export class ExperimentalService {
     aDate: Date,
     aBaseCurrency: Currency
   ): Promise<Data> {
-    const ordersWithPlatform: OrderWithPlatform[] = aOrders.map((order) => {
+    const ordersWithPlatform: OrderWithAccount[] = aOrders.map((order) => {
       return {
         ...order,
         accountId: undefined,

apps/api/src/app/order/interfaces/order-with-account.type.ts

@@ -0,0 +1,3 @@
+import { Account, Order } from '@prisma/client';
+
+export type OrderWithAccount = Order & { Account?: Account };

apps/api/src/app/order/interfaces/order-with-platform.type.ts

@@ -1,3 +0,0 @@
-import { Order, Platform } from '@prisma/client';
-
-export type OrderWithPlatform = Order & { Platform?: Platform };

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

@@ -5,7 +5,7 @@ import { Order, Prisma } from '@prisma/client';
 
 import { CacheService } from '../cache/cache.service';
 import { RedisCacheService } from '../redis-cache/redis-cache.service';
-import { OrderWithPlatform } from './interfaces/order-with-platform.type';
+import { OrderWithAccount } from './interfaces/order-with-account.type';
 
 @Injectable()
 export class OrderService {
@@ -31,7 +31,7 @@ export class OrderService {
     cursor?: Prisma.OrderWhereUniqueInput;
     where?: Prisma.OrderWhereInput;
     orderBy?: Prisma.OrderOrderByInput;
-  }): Promise<OrderWithPlatform[]> {
+  }): Promise<OrderWithAccount[]> {
     const { include, skip, take, cursor, where, orderBy } = params;
 
     return this.prisma.order.findMany({

apps/api/src/app/portfolio/interfaces/portfolio-position.interface.ts

@@ -2,6 +2,9 @@ import { MarketState } from '@ghostfolio/api/services/interfaces/interfaces';
 import { Currency } from '@prisma/client';
 
 export interface PortfolioPosition {
+  accounts: {
+    [name: string]: { current: number; original: number };
+  };
   currency: Currency;
   exchange?: string;
   grossPerformance: number;
@@ -13,9 +16,6 @@ export interface PortfolioPosition {
   marketPrice: number;
   marketState: MarketState;
   name: string;
-  platforms: {
-    [name: string]: { current: number; original: number };
-  };
   quantity: number;
   sector?: string;
   shareCurrent: number;

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

@@ -185,11 +185,11 @@ export class PortfolioController {
         portfolioPosition.investment =
           portfolioPosition.investment / totalInvestment;
 
-        for (const [platform, { current, original }] of Object.entries(
+        for (const [account, { current, original }] of Object.entries(
-          portfolioPosition.platforms
+          portfolioPosition.accounts
         )) {
-          portfolioPosition.platforms[platform].current = current / totalValue;
+          portfolioPosition.accounts[account].current = current / totalValue;
-          portfolioPosition.platforms[platform].original =
+          portfolioPosition.accounts[account].original =
             original / totalInvestment;
         }
 

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

@@ -73,7 +73,7 @@ export class PortfolioService {
       // Get portfolio from database
       const orders = await this.orderService.orders({
         include: {
-          Platform: true
+          Account: true
         },
         orderBy: { date: 'asc' },
         where: { userId: aUserId }

apps/api/src/models/order.ts

@@ -1,27 +1,27 @@
-import { Currency, Platform } from '@prisma/client';
+import { Account, Currency, Platform } from '@prisma/client';
 import { v4 as uuidv4 } from 'uuid';
 
 import { IOrder } from '../services/interfaces/interfaces';
 import { OrderType } from './order-type';
 
 export class Order {
+  private account: Account;
   private currency: Currency;
   private fee: number;
   private date: string;
   private id: string;
   private quantity: number;
-  private platform: Platform;
   private symbol: string;
   private total: number;
   private type: OrderType;
   private unitPrice: number;
 
   public constructor(data: IOrder) {
+    this.account = data.account;
     this.currency = data.currency;
     this.fee = data.fee;
     this.date = data.date;
     this.id = data.id || uuidv4();
-    this.platform = data.platform;
     this.quantity = data.quantity;
     this.symbol = data.symbol;
     this.type = data.type;
@@ -30,6 +30,10 @@ export class Order {
     this.total = this.quantity * data.unitPrice;
   }
 
+  public getAccount() {
+    return this.account;
+  }
+
   public getCurrency() {
     return this.currency;
   }
@@ -46,10 +50,6 @@ export class Order {
     return this.id;
   }
 
-  public getPlatform() {
-    return this.platform;
-  }
-
   public getQuantity() {
     return this.quantity;
   }

apps/api/src/models/portfolio.ts

@@ -23,7 +23,7 @@ import { cloneDeep, isEmpty } from 'lodash';
 import * as roundTo from 'round-to';
 
 import { UserWithSettings } from '../app/interfaces/user-with-settings';
-import { OrderWithPlatform } from '../app/order/interfaces/order-with-platform.type';
+import { OrderWithAccount } from '../app/order/interfaces/order-with-account.type';
 import { DateRange } from '../app/portfolio/interfaces/date-range.type';
 import { PortfolioPerformance } from '../app/portfolio/interfaces/portfolio-performance.interface';
 import { PortfolioPosition } from '../app/portfolio/interfaces/portfolio-position.interface';
@@ -34,14 +34,14 @@ import { IOrder } from '../services/interfaces/interfaces';
 import { RulesService } from '../services/rules.service';
 import { PortfolioInterface } from './interfaces/portfolio.interface';
 import { Order } from './order';
+import { AccountClusterRiskCurrentInvestment } from './rules/account-cluster-risk/current-investment';
+import { AccountClusterRiskInitialInvestment } from './rules/account-cluster-risk/initial-investment';
+import { AccountClusterRiskSingleAccount } from './rules/account-cluster-risk/single-account';
 import { CurrencyClusterRiskBaseCurrencyCurrentInvestment } from './rules/currency-cluster-risk/base-currency-current-investment';
 import { CurrencyClusterRiskBaseCurrencyInitialInvestment } from './rules/currency-cluster-risk/base-currency-initial-investment';
 import { CurrencyClusterRiskCurrentInvestment } from './rules/currency-cluster-risk/current-investment';
 import { CurrencyClusterRiskInitialInvestment } from './rules/currency-cluster-risk/initial-investment';
 import { FeeRatioInitialInvestment } from './rules/fees/fee-ratio-initial-investment';
-import { PlatformClusterRiskCurrentInvestment } from './rules/platform-cluster-risk/current-investment';
-import { PlatformClusterRiskInitialInvestment } from './rules/platform-cluster-risk/initial-investment';
-import { PlatformClusterRiskSinglePlatform } from './rules/platform-cluster-risk/single-platform';
 
 export class Portfolio implements PortfolioInterface {
   private orders: Order[] = [];
@@ -119,11 +119,11 @@ export class Portfolio implements PortfolioInterface {
   }): Portfolio {
     orders.forEach(
       ({
+        account,
         currency,
         fee,
         date,
         id,
-        platform,
         quantity,
         symbol,
         type,
@@ -131,11 +131,11 @@ export class Portfolio implements PortfolioInterface {
       }) => {
         this.orders.push(
           new Order({
+            account,
             currency,
             fee,
             date,
             id,
-            platform,
             quantity,
             symbol,
             type,
@@ -202,7 +202,7 @@ export class Portfolio implements PortfolioInterface {
     const data = await this.dataProviderService.get(symbols);
 
     symbols.forEach((symbol) => {
-      const platforms: PortfolioPosition['platforms'] = {};
+      const accounts: PortfolioPosition['accounts'] = {};
       const [portfolioItem] = portfolioItems;
 
       const ordersBySymbol = this.getOrders().filter((order) => {
@@ -227,15 +227,15 @@ export class Portfolio implements PortfolioInterface {
           originalValueOfSymbol *= -1;
         }
 
-        if (platforms[orderOfSymbol.getPlatform()?.name || 'Other']?.current) {
+        if (accounts[orderOfSymbol.getAccount()?.name || 'Other']?.current) {
-          platforms[
+          accounts[
-            orderOfSymbol.getPlatform()?.name || 'Other'
+            orderOfSymbol.getAccount()?.name || 'Other'
           ].current += currentValueOfSymbol;
-          platforms[
+          accounts[
-            orderOfSymbol.getPlatform()?.name || 'Other'
+            orderOfSymbol.getAccount()?.name || 'Other'
           ].original += originalValueOfSymbol;
         } else {
-          platforms[orderOfSymbol.getPlatform()?.name || 'Other'] = {
+          accounts[orderOfSymbol.getAccount()?.name || 'Other'] = {
             current: currentValueOfSymbol,
             original: originalValueOfSymbol
           };
@@ -276,7 +276,7 @@ export class Portfolio implements PortfolioInterface {
 
       details[symbol] = {
         ...data[symbol],
-        platforms,
+        accounts,
         symbol,
         grossPerformance: roundTo(
           portfolioItemsNow.positions[symbol].quantity * (now - before),
@@ -396,32 +396,32 @@ export class Portfolio implements PortfolioInterface {
 
     return {
       rules: {
-        currencyClusterRisk: await this.rulesService.evaluate(
+        accountClusterRisk: await this.rulesService.evaluate(
           this,
           [
-            new CurrencyClusterRiskBaseCurrencyInitialInvestment(
+            new AccountClusterRiskCurrentInvestment(
               this.exchangeRateDataService
             ),
-            new CurrencyClusterRiskBaseCurrencyCurrentInvestment(
+            new AccountClusterRiskInitialInvestment(
               this.exchangeRateDataService
             ),
-            new CurrencyClusterRiskInitialInvestment(
+            new AccountClusterRiskSingleAccount(this.exchangeRateDataService)
-              this.exchangeRateDataService
-            ),
-            new CurrencyClusterRiskCurrentInvestment(
-              this.exchangeRateDataService
-            )
           ],
           { baseCurrency: this.user.Settings.currency }
         ),
-        platformClusterRisk: await this.rulesService.evaluate(
+        currencyClusterRisk: await this.rulesService.evaluate(
           this,
           [
-            new PlatformClusterRiskSinglePlatform(this.exchangeRateDataService),
+            new CurrencyClusterRiskBaseCurrencyInitialInvestment(
-            new PlatformClusterRiskInitialInvestment(
+              this.exchangeRateDataService
+            ),
+            new CurrencyClusterRiskBaseCurrencyCurrentInvestment(
               this.exchangeRateDataService
             ),
-            new PlatformClusterRiskCurrentInvestment(
+            new CurrencyClusterRiskInitialInvestment(
+              this.exchangeRateDataService
+            ),
+            new CurrencyClusterRiskCurrentInvestment(
               this.exchangeRateDataService
             )
           ],
@@ -522,17 +522,17 @@ export class Portfolio implements PortfolioInterface {
     return isFinite(value) ? value : null;
   }
 
-  public async setOrders(aOrders: OrderWithPlatform[]) {
+  public async setOrders(aOrders: OrderWithAccount[]) {
     this.orders = [];
 
     // Map data
     aOrders.forEach((order) => {
       this.orders.push(
         new Order({
+          account: order.Account,
           currency: <any>order.currency,
           date: order.date.toISOString(),
           fee: order.fee,
-          platform: order.Platform,
           quantity: order.quantity,
           symbol: order.symbol,
           type: <any>order.type,

apps/api/src/models/rules/platform-cluster-risk/current-investment.ts → apps/api/src/models/rules/account-cluster-risk/current-investment.ts

@@ -3,7 +3,7 @@ import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-
 
 import { Rule } from '../../rule';
 
-export class PlatformClusterRiskCurrentInvestment extends Rule {
+export class AccountClusterRiskCurrentInvestment extends Rule {
   public constructor(public exchangeRateDataService: ExchangeRateDataService) {
     super(exchangeRateDataService, {
       name: 'Current Investment'
@@ -18,24 +18,22 @@ export class PlatformClusterRiskCurrentInvestment extends Rule {
     }
   ) {
     const ruleSettings =
-      aRuleSettingsMap[PlatformClusterRiskCurrentInvestment.name];
+      aRuleSettingsMap[AccountClusterRiskCurrentInvestment.name];
 
-    const platforms: {
+    const accounts: {
       [symbol: string]: Pick<PortfolioPosition, 'name'> & {
         investment: number;
       };
     } = {};
 
     Object.values(aPositions).forEach((position) => {
-      for (const [platform, { current }] of Object.entries(
+      for (const [account, { current }] of Object.entries(position.accounts)) {
-        position.platforms
+        if (accounts[account]?.investment) {
-      )) {
+          accounts[account].investment += current;
-        if (platforms[platform]?.investment) {
-          platforms[platform].investment += current;
         } else {
-          platforms[platform] = {
+          accounts[account] = {
             investment: current,
-            name: platform
+            name: account
           };
         }
       }
@@ -44,17 +42,17 @@ export class PlatformClusterRiskCurrentInvestment extends Rule {
     let maxItem;
     let totalInvestment = 0;
 
-    Object.values(platforms).forEach((platform) => {
+    Object.values(accounts).forEach((account) => {
       if (!maxItem) {
-        maxItem = platform;
+        maxItem = account;
       }
 
       // Calculate total investment
-      totalInvestment += platform.investment;
+      totalInvestment += account.investment;
 
       // Find maximum
-      if (platform.investment > maxItem?.investment) {
+      if (account.investment > maxItem?.investment) {
-        maxItem = platform;
+        maxItem = account;
       }
     });
 

apps/api/src/models/rules/platform-cluster-risk/initial-investment.ts → apps/api/src/models/rules/account-cluster-risk/initial-investment.ts

@@ -3,7 +3,7 @@ import { ExchangeRateDataService } from 'apps/api/src/services/exchange-rate-dat
 
 import { Rule } from '../../rule';
 
-export class PlatformClusterRiskInitialInvestment extends Rule {
+export class AccountClusterRiskInitialInvestment extends Rule {
   public constructor(public exchangeRateDataService: ExchangeRateDataService) {
     super(exchangeRateDataService, {
       name: 'Initial Investment'
@@ -18,7 +18,7 @@ export class PlatformClusterRiskInitialInvestment extends Rule {
     }
   ) {
     const ruleSettings =
-      aRuleSettingsMap[PlatformClusterRiskInitialInvestment.name];
+      aRuleSettingsMap[AccountClusterRiskInitialInvestment.name];
 
     const platforms: {
       [symbol: string]: Pick<PortfolioPosition, 'name'> & {
@@ -27,15 +27,13 @@ export class PlatformClusterRiskInitialInvestment extends Rule {
     } = {};
 
     Object.values(aPositions).forEach((position) => {
-      for (const [platform, { original }] of Object.entries(
+      for (const [account, { original }] of Object.entries(position.accounts)) {
-        position.platforms
+        if (platforms[account]?.investment) {
-      )) {
+          platforms[account].investment += original;
-        if (platforms[platform]?.investment) {
-          platforms[platform].investment += original;
         } else {
-          platforms[platform] = {
+          platforms[account] = {
             investment: original,
-            name: platform
+            name: account
           };
         }
       }

apps/api/src/models/rules/platform-cluster-risk/single-platform.ts → apps/api/src/models/rules/account-cluster-risk/single-account.ts

@@ -3,33 +3,33 @@ import { ExchangeRateDataService } from 'apps/api/src/services/exchange-rate-dat
 
 import { Rule } from '../../rule';
 
-export class PlatformClusterRiskSinglePlatform extends Rule {
+export class AccountClusterRiskSingleAccount extends Rule {
   public constructor(public exchangeRateDataService: ExchangeRateDataService) {
     super(exchangeRateDataService, {
-      name: 'Single Platform'
+      name: 'Single Account'
     });
   }
 
   public evaluate(positions: { [symbol: string]: PortfolioPosition }) {
-    const platforms: string[] = [];
+    const accounts: string[] = [];
 
     Object.values(positions).forEach((position) => {
-      for (const [platform] of Object.entries(position.platforms)) {
+      for (const [account] of Object.entries(position.accounts)) {
-        if (!platforms.includes(platform)) {
+        if (!accounts.includes(account)) {
-          platforms.push(platform);
+          accounts.push(account);
         }
       }
     });
 
-    if (platforms.length === 1) {
+    if (accounts.length === 1) {
       return {
-        evaluation: `All your investment is managed by a single platform`,
+        evaluation: `All your investment is managed by a single account`,
         value: false
       };
     }
 
     return {
-      evaluation: `Your investment is managed by ${platforms.length} platforms`,
+      evaluation: `Your investment is managed by ${accounts.length} accounts`,
       value: true
     };
   }

apps/api/src/services/interfaces/interfaces.ts

@@ -1,4 +1,4 @@
-import { Currency, DataSource, Platform } from '@prisma/client';
+import { Account, Currency, DataSource, Platform } from '@prisma/client';
 
 import { OrderType } from '../../models/order-type';
 
@@ -33,11 +33,11 @@ export const Type = {
 };
 
 export interface IOrder {
+  account: Account;
   currency: Currency;
   date: string;
   fee: number;
   id?: string;
-  platform: Platform;
   quantity: number;
   symbol: string;
   type: OrderType;

apps/api/src/services/rules.service.ts

@@ -2,14 +2,14 @@ import { Injectable } from '@nestjs/common';
 
 import { Portfolio } from '../models/portfolio';
 import { Rule } from '../models/rule';
+import { AccountClusterRiskCurrentInvestment } from '../models/rules/account-cluster-risk/current-investment';
+import { AccountClusterRiskInitialInvestment } from '../models/rules/account-cluster-risk/initial-investment';
+import { AccountClusterRiskSingleAccount } from '../models/rules/account-cluster-risk/single-account';
 import { CurrencyClusterRiskBaseCurrencyCurrentInvestment } from '../models/rules/currency-cluster-risk/base-currency-current-investment';
 import { CurrencyClusterRiskBaseCurrencyInitialInvestment } from '../models/rules/currency-cluster-risk/base-currency-initial-investment';
 import { CurrencyClusterRiskCurrentInvestment } from '../models/rules/currency-cluster-risk/current-investment';
 import { CurrencyClusterRiskInitialInvestment } from '../models/rules/currency-cluster-risk/initial-investment';
 import { FeeRatioInitialInvestment } from '../models/rules/fees/fee-ratio-initial-investment';
-import { PlatformClusterRiskCurrentInvestment } from '../models/rules/platform-cluster-risk/current-investment';
-import { PlatformClusterRiskInitialInvestment } from '../models/rules/platform-cluster-risk/initial-investment';
-import { PlatformClusterRiskSinglePlatform } from '../models/rules/platform-cluster-risk/single-platform';
 
 @Injectable()
 export class RulesService {
@@ -39,6 +39,17 @@ export class RulesService {
 
   private getDefaultRuleSettings(aUserSettings: { baseCurrency: string }) {
     return {
+      [AccountClusterRiskCurrentInvestment.name]: {
+        baseCurrency: aUserSettings.baseCurrency,
+        isActive: true,
+        threshold: 0.5
+      },
+      [AccountClusterRiskInitialInvestment.name]: {
+        baseCurrency: aUserSettings.baseCurrency,
+        isActive: true,
+        threshold: 0.5
+      },
+      [AccountClusterRiskSingleAccount.name]: { isActive: true },
       [CurrencyClusterRiskBaseCurrencyInitialInvestment.name]: {
         baseCurrency: aUserSettings.baseCurrency,
         isActive: true
@@ -61,18 +72,7 @@ export class RulesService {
         baseCurrency: aUserSettings.baseCurrency,
         isActive: true,
         threshold: 0.01
-      },
+      }
-      [PlatformClusterRiskCurrentInvestment.name]: {
-        baseCurrency: aUserSettings.baseCurrency,
-        isActive: true,
-        threshold: 0.5
-      },
-      [PlatformClusterRiskInitialInvestment.name]: {
-        baseCurrency: aUserSettings.baseCurrency,
-        isActive: true,
-        threshold: 0.5
-      },
-      [PlatformClusterRiskSinglePlatform.name]: { isActive: true }
     };
   }
 }

apps/client/src/app/pages/analysis/analysis-page.component.ts

@@ -16,6 +16,9 @@ import { takeUntil } from 'rxjs/operators';
   styleUrls: ['./analysis-page.scss']
 })
 export class AnalysisPageComponent implements OnDestroy, OnInit {
+  public accounts: {
+    [symbol: string]: Pick<PortfolioPosition, 'name'> & { value: number };
+  };
   public deviceType: string;
   public period = 'current';
   public periodOptions: ToggleOption[] = [
@@ -23,9 +26,6 @@ export class AnalysisPageComponent implements OnDestroy, OnInit {
     { label: 'Current', value: 'current' }
   ];
   public hasImpersonationId: boolean;
-  public platforms: {
-    [symbol: string]: Pick<PortfolioPosition, 'name'> & { value: number };
-  };
   public portfolioItems: PortfolioItem[];
   public portfolioPositions: { [symbol: string]: PortfolioPosition };
   public positions: { [symbol: string]: any };
@@ -95,7 +95,7 @@ export class AnalysisPageComponent implements OnDestroy, OnInit {
     },
     aPeriod: string
   ) {
-    this.platforms = {};
+    this.accounts = {};
     this.positions = {};
     this.positionsArray = [];
 
@@ -113,16 +113,16 @@ export class AnalysisPageComponent implements OnDestroy, OnInit {
       };
       this.positionsArray.push(position);
 
-      for (const [platform, { current, original }] of Object.entries(
+      for (const [account, { current, original }] of Object.entries(
-        position.platforms
+        position.accounts
       )) {
-        if (this.platforms[platform]?.value) {
+        if (this.accounts[account]?.value) {
-          this.platforms[platform].value +=
+          this.accounts[account].value +=
             aPeriod === 'original' ? original : current;
         } else {
-          this.platforms[platform] = {
+          this.accounts[account] = {
             value: aPeriod === 'original' ? original : current,
-            name: platform
+            name: account
           };
         }
       }

apps/client/src/app/pages/analysis/analysis-page.html

@@ -50,29 +50,7 @@
             [baseCurrency]="user?.settings?.baseCurrency"
             [isInPercent]="hasImpersonationId"
             [locale]="user?.settings?.locale"
-            [positions]="platforms"
+            [positions]="accounts"
-          ></gf-portfolio-proportion-chart>
-        </mat-card-content>
-      </mat-card>
-    </div>
-    <div class="col-md-6">
-      <mat-card class="mb-3">
-        <mat-card-header class="w-100">
-          <mat-card-title class="text-muted" i18n>By Platform</mat-card-title>
-          <gf-toggle
-            [defaultValue]="period"
-            [isLoading]="false"
-            [options]="periodOptions"
-            (change)="onChangePeriod($event.value)"
-          ></gf-toggle>
-        </mat-card-header>
-        <mat-card-content>
-          <gf-portfolio-proportion-chart
-            key="name"
-            [baseCurrency]="user?.settings?.baseCurrency"
-            [isInPercent]="hasImpersonationId"
-            [locale]="user?.settings?.locale"
-            [positions]="platforms"
           ></gf-portfolio-proportion-chart>
         </mat-card-content>
       </mat-card>

apps/client/src/app/pages/report/report-page.component.ts

@@ -10,9 +10,9 @@ import { takeUntil } from 'rxjs/operators';
   styleUrls: ['./report-page.scss']
 })
 export class ReportPageComponent implements OnInit {
+  public accountClusterRiskRules: PortfolioReportRule[];
   public currencyClusterRiskRules: PortfolioReportRule[];
   public feeRules: PortfolioReportRule[];
-  public platformClusterRiskRules: PortfolioReportRule[];
 
   private unsubscribeSubject = new Subject<void>();
 
@@ -32,11 +32,11 @@ export class ReportPageComponent implements OnInit {
       .fetchPortfolioReport()
       .pipe(takeUntil(this.unsubscribeSubject))
       .subscribe((portfolioReport) => {
+        this.accountClusterRiskRules =
+          portfolioReport.rules['accountClusterRisk'] || null;
         this.currencyClusterRiskRules =
           portfolioReport.rules['currencyClusterRisk'] || null;
         this.feeRules = portfolioReport.rules['fees'] || null;
-        this.platformClusterRiskRules =
-          portfolioReport.rules['platformClusterRisk'] || null;
 
         this.cd.markForCheck();
       });

apps/client/src/app/pages/report/report-page.html

@@ -18,8 +18,8 @@
         <gf-rules [rules]="currencyClusterRiskRules"></gf-rules>
       </div>
       <div class="mb-4">
-        <h4 class="m-0" i18n>Platform Cluster Risks</h4>
+        <h4 class="m-0" i18n>Account Cluster Risks</h4>
-        <gf-rules [rules]="platformClusterRiskRules"></gf-rules>
+        <gf-rules [rules]="accountClusterRiskRules"></gf-rules>
       </div>
       <div>
         <h4 class="m-0" i18n>Fees</h4>