Fix emergency fund for user with impersonation id

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

@@ -6,6 +6,7 @@ import { PortfolioOrder } from '@ghostfolio/api/app/portfolio/interfaces/portfol
 import { TimelineSpecification } from '@ghostfolio/api/app/portfolio/interfaces/timeline-specification.interface';
 import { TransactionPoint } from '@ghostfolio/api/app/portfolio/interfaces/transaction-point.interface';
 import { UserSettings } from '@ghostfolio/api/app/user/interfaces/user-settings.interface';
+import { UserService } from '@ghostfolio/api/app/user/user.service';
 import { AccountClusterRiskCurrentInvestment } from '@ghostfolio/api/models/rules/account-cluster-risk/current-investment';
 import { AccountClusterRiskInitialInvestment } from '@ghostfolio/api/models/rules/account-cluster-risk/initial-investment';
 import { AccountClusterRiskSingleAccount } from '@ghostfolio/api/models/rules/account-cluster-risk/single-account';
@@ -81,7 +82,8 @@ export class PortfolioServiceNew {
     private readonly orderService: OrderService,
     @Inject(REQUEST) private readonly request: RequestWithUser,
     private readonly rulesService: RulesService,
-    private readonly symbolProfileService: SymbolProfileService
+    private readonly symbolProfileService: SymbolProfileService,
+    private readonly userService: UserService
   ) {}
 
   public async getAccounts(aUserId: string): Promise<AccountWithValue[]> {
@@ -301,9 +303,10 @@ export class PortfolioServiceNew {
   ): Promise<PortfolioDetails & { hasErrors: boolean }> {
     const userId = await this.getUserId(aImpersonationId, aUserId);
 
+    const user = await this.userService.user({ id: userId });
+
     const emergencyFund = new Big(
-      (this.request.user?.Settings?.settings as UserSettings)?.emergencyFund ??
+      (user.Settings?.settings as UserSettings)?.emergencyFund ?? 0
-        0
     );
     const userCurrency = this.request.user?.Settings?.currency ?? baseCurrency;
 
@@ -1012,6 +1015,7 @@ export class PortfolioServiceNew {
       }
     }
 
+    if (emergencyFund.gt(0)) {
       cashPositions[ASSET_SUB_CLASS_EMERGENCY_FUND] = {
         ...cashPositions[userCurrency],
         assetSubClass: ASSET_SUB_CLASS_EMERGENCY_FUND,
@@ -1020,6 +1024,7 @@ export class PortfolioServiceNew {
         symbol: ASSET_SUB_CLASS_EMERGENCY_FUND,
         value: emergencyFund.toNumber()
       };
+
       cashPositions[userCurrency].investment = new Big(
         cashPositions[userCurrency].investment
       )
@@ -1030,6 +1035,7 @@ export class PortfolioServiceNew {
       )
         .minus(emergencyFund)
         .toNumber();
+    }
 
     for (const symbol of Object.keys(cashPositions)) {
       // Calculate allocations for each currency

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

@@ -7,6 +7,7 @@ import { TimelineSpecification } from '@ghostfolio/api/app/portfolio/interfaces/
 import { TransactionPoint } from '@ghostfolio/api/app/portfolio/interfaces/transaction-point.interface';
 import { PortfolioCalculator } from '@ghostfolio/api/app/portfolio/portfolio-calculator';
 import { UserSettings } from '@ghostfolio/api/app/user/interfaces/user-settings.interface';
+import { UserService } from '@ghostfolio/api/app/user/user.service';
 import { AccountClusterRiskCurrentInvestment } from '@ghostfolio/api/models/rules/account-cluster-risk/current-investment';
 import { AccountClusterRiskInitialInvestment } from '@ghostfolio/api/models/rules/account-cluster-risk/initial-investment';
 import { AccountClusterRiskSingleAccount } from '@ghostfolio/api/models/rules/account-cluster-risk/single-account';
@@ -22,9 +23,9 @@ import { MarketState } from '@ghostfolio/api/services/interfaces/interfaces';
 import { EnhancedSymbolProfile } from '@ghostfolio/api/services/interfaces/symbol-profile.interface';
 import { SymbolProfileService } from '@ghostfolio/api/services/symbol-profile.service';
 import {
+  ASSET_SUB_CLASS_EMERGENCY_FUND,
   UNKNOWN_KEY,
-  baseCurrency,
+  baseCurrency
-  ASSET_SUB_CLASS_EMERGENCY_FUND
 } from '@ghostfolio/common/config';
 import { DATE_FORMAT, parseDate } from '@ghostfolio/common/helper';
 import {
@@ -80,7 +81,8 @@ export class PortfolioService {
     private readonly orderService: OrderService,
     @Inject(REQUEST) private readonly request: RequestWithUser,
     private readonly rulesService: RulesService,
-    private readonly symbolProfileService: SymbolProfileService
+    private readonly symbolProfileService: SymbolProfileService,
+    private readonly userService: UserService
   ) {}
 
   public async getAccounts(aUserId: string): Promise<AccountWithValue[]> {
@@ -292,9 +294,10 @@ export class PortfolioService {
   ): Promise<PortfolioDetails & { hasErrors: boolean }> {
     const userId = await this.getUserId(aImpersonationId, aUserId);
 
+    const user = await this.userService.user({ id: userId });
+
     const emergencyFund = new Big(
-      (this.request.user?.Settings?.settings as UserSettings)?.emergencyFund ??
+      (user.Settings?.settings as UserSettings)?.emergencyFund ?? 0
-        0
     );
     const userCurrency = this.request.user?.Settings?.currency ?? baseCurrency;
     const portfolioCalculator = new PortfolioCalculator(
@@ -976,6 +979,7 @@ export class PortfolioService {
       }
     }
 
+    if (emergencyFund.gt(0)) {
       cashPositions[ASSET_SUB_CLASS_EMERGENCY_FUND] = {
         ...cashPositions[userCurrency],
         assetSubClass: ASSET_SUB_CLASS_EMERGENCY_FUND,
@@ -995,6 +999,7 @@ export class PortfolioService {
       )
         .minus(emergencyFund)
         .toNumber();
+    }
 
     for (const symbol of Object.keys(cashPositions)) {
       // Calculate allocations for each currency

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

@@ -15,7 +15,7 @@ import {
 } from '@ghostfolio/common/permissions';
 import { SubscriptionType } from '@ghostfolio/common/types/subscription.type';
 import { Injectable } from '@nestjs/common';
-import { Prisma, Provider, Role, User, ViewMode } from '@prisma/client';
+import { Prisma, Role, User, ViewMode } from '@prisma/client';
 
 import { UserSettingsParams } from './interfaces/user-settings-params.interface';
 import { UserSettings } from './interfaces/user-settings.interface';