Resolve package-lock.json conflict with upstream

.vscode/launch.json

@@ -18,12 +18,20 @@
       "autoAttachChildProcesses": true,
       "console": "integratedTerminal",
       "cwd": "${workspaceFolder}/apps/api",
-      "envFile": "${workspaceFolder}/.env",
+      "env": {
+        "GHOSTFOLIO_ENV_FILE": "${workspaceFolder}/.env"
+      },
       "name": "Debug API",
       "outFiles": ["${workspaceFolder}/dist/apps/api/**/*.js"],
       "program": "${workspaceFolder}/apps/api/src/main.ts",
       "request": "launch",
-      "runtimeArgs": ["--nolazy", "-r", "ts-node/register"],
+      "runtimeArgs": [
+        "--nolazy",
+        "-r",
+        "ts-node/register",
+        "-r",
+        "${workspaceFolder}/tools/load-env.ts"
+      ],
       "skipFiles": [
         "${workspaceFolder}/node_modules/**/*.js",
         "<node_internals>/**/*.js"

CHANGELOG.md

@@ -9,7 +9,62 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 
+- Prefilled the form in the account balance management with the current cash balance
+
+## 3.8.0 - 2026-06-07
+
+### Added
+
+- Added an automatic refresh every 30 seconds to the users table in the admin control panel
+
+### Changed
+
+- Harmonized the sector names across the data providers
+- Localized the country names
+- Localized the sector names
+- Centralized the asset profile override logic for manual adjustments
+- Improved the styling in the user detail dialog of the admin control panel’s users section
+- Prevented the deletion of asset profiles that are currently in use
+- Ensured market data is correctly removed when an asset profile with no remaining activities is deleted
+- Refactored the backend logging to use the instance-based `Logger`
+- Improved the language localization for German (`de`)
+- Improved the language localization for Ukrainian (`uk`)
+
+### Fixed
+
+- Prevented the floating action button from overlapping the paginator on mobile
+- Fixed an issue where the asset profile override (asset class and asset sub class) was not applied to the data enhancers when gathering asset profiles
+- Fixed a layout issue in the asset profile dialog of the admin control panel by truncating long titles
+
+## 3.7.0 - 2026-06-02
+
+### Added
+
+- Added support for routing selected requests through the _OpenRouter_ `web_fetch` tool in the `FetchService`
+
+### Changed
+
+- Extended the countries mapping in the data enhancer for asset profile data via _Trackinsight_
+- Removed the deprecated attributes (`assetClass`, `assetClassLabel`, `assetSubClass`, `assetSubClassLabel`, `countries`, `currency`, `dataSource`, `holdings`, `name`, `sectors`, `symbol` and `url`) from the holdings of the portfolio details endpoint response
+- Upgraded `Nx` from version `22.7.2` to `22.7.5`
+
+### Fixed
+
+- Resolved an issue in the impersonation mode where the values did not match the owner’s currency
+- Fixed the environment variable expansion in the `.env` file when debugging via _Visual Studio Code_
+
+## 3.6.0 - 2026-05-28
+
+### Added
+
+- Added `HTTP_PROXY`, `HTTPS_PROXY`, and `NO_PROXY` environment variable support to outbound HTTP requests
+- Added the `FetchService` to centralize outbound HTTP requests
+
+### Changed
+
+- Extracted the floating action buttons (FAB) to a reusable component
 - Upgraded `nestjs` from version `11.1.19` to `11.1.21`
+- Upgraded `yahoo-finance2` from version `3.14.0` to `3.14.2`
 
 ## 3.5.0 - 2026-05-24
 

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

@@ -1,5 +1,6 @@
 import { AccountBalanceService } from '@ghostfolio/api/app/account-balance/account-balance.service';
 import { PortfolioService } from '@ghostfolio/api/app/portfolio/portfolio.service';
+import { UserService } from '@ghostfolio/api/app/user/user.service';
 import { HasPermission } from '@ghostfolio/api/decorators/has-permission.decorator';
 import { HasPermissionGuard } from '@ghostfolio/api/guards/has-permission.guard';
 import { RedactValuesInResponseInterceptor } from '@ghostfolio/api/interceptors/redact-values-in-response/redact-values-in-response.interceptor';
@@ -50,7 +51,8 @@ export class AccountController {
     private readonly apiService: ApiService,
     private readonly impersonationService: ImpersonationService,
     private readonly portfolioService: PortfolioService,
-    @Inject(REQUEST) private readonly request: RequestWithUser
+    @Inject(REQUEST) private readonly request: RequestWithUser,
+    private readonly userService: UserService
   ) {}
 
   @Delete(':id')
@@ -137,11 +139,14 @@ export class AccountController {
   ): Promise<AccountBalancesResponse> {
     const impersonationUserId =
       await this.impersonationService.validateImpersonationId(impersonationId);
+    const userId = impersonationUserId || this.request.user.id;
+
+    const { settings } = await this.userService.user({ id: userId });
 
     return this.accountBalanceService.getAccountBalances({
+      userId,
       filters: [{ id, type: 'ACCOUNT' }],
-      userCurrency: this.request.user.settings.settings.baseCurrency,
+      userCurrency: settings.settings.baseCurrency
-      userId: impersonationUserId || this.request.user.id
     });
   }
 

apps/api/src/app/account/account.module.ts

@@ -1,5 +1,6 @@
 import { AccountBalanceModule } from '@ghostfolio/api/app/account-balance/account-balance.module';
 import { PortfolioModule } from '@ghostfolio/api/app/portfolio/portfolio.module';
+import { UserModule } from '@ghostfolio/api/app/user/user.module';
 import { RedactValuesInResponseModule } from '@ghostfolio/api/interceptors/redact-values-in-response/redact-values-in-response.module';
 import { ApiModule } from '@ghostfolio/api/services/api/api.module';
 import { ConfigurationModule } from '@ghostfolio/api/services/configuration/configuration.module';
@@ -23,7 +24,8 @@ import { AccountService } from './account.service';
     ImpersonationModule,
     PortfolioModule,
     PrismaModule,
-    RedactValuesInResponseModule
+    RedactValuesInResponseModule,
+    UserModule
   ],
   providers: [AccountService]
 })

apps/api/src/app/activities/activities.module.ts

@@ -6,9 +6,11 @@ import { RedactValuesInResponseModule } from '@ghostfolio/api/interceptors/redac
 import { TransformDataSourceInRequestModule } from '@ghostfolio/api/interceptors/transform-data-source-in-request/transform-data-source-in-request.module';
 import { TransformDataSourceInResponseModule } from '@ghostfolio/api/interceptors/transform-data-source-in-response/transform-data-source-in-response.module';
 import { ApiModule } from '@ghostfolio/api/services/api/api.module';
+import { BenchmarkModule } from '@ghostfolio/api/services/benchmark/benchmark.module';
 import { DataProviderModule } from '@ghostfolio/api/services/data-provider/data-provider.module';
 import { ExchangeRateDataModule } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.module';
 import { ImpersonationModule } from '@ghostfolio/api/services/impersonation/impersonation.module';
+import { MarketDataModule } from '@ghostfolio/api/services/market-data/market-data.module';
 import { PrismaModule } from '@ghostfolio/api/services/prisma/prisma.module';
 import { DataGatheringQueueModule } from '@ghostfolio/api/services/queues/data-gathering/data-gathering.module';
 import { SymbolProfileModule } from '@ghostfolio/api/services/symbol-profile/symbol-profile.module';
@@ -23,11 +25,13 @@ import { ActivitiesService } from './activities.service';
   exports: [ActivitiesService],
   imports: [
     ApiModule,
+    BenchmarkModule,
     CacheModule,
     DataGatheringQueueModule,
     DataProviderModule,
     ExchangeRateDataModule,
     ImpersonationModule,
+    MarketDataModule,
     PrismaModule,
     RedactValuesInResponseModule,
     RedisCacheModule,

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

@@ -4,8 +4,10 @@ import { CashDetails } from '@ghostfolio/api/app/account/interfaces/cash-details
 import { AssetProfileChangedEvent } from '@ghostfolio/api/events/asset-profile-changed.event';
 import { PortfolioChangedEvent } from '@ghostfolio/api/events/portfolio-changed.event';
 import { LogPerformance } from '@ghostfolio/api/interceptors/performance-logging/performance-logging.interceptor';
+import { BenchmarkService } from '@ghostfolio/api/services/benchmark/benchmark.service';
 import { DataProviderService } from '@ghostfolio/api/services/data-provider/data-provider.service';
 import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.service';
+import { MarketDataService } from '@ghostfolio/api/services/market-data/market-data.service';
 import { PrismaService } from '@ghostfolio/api/services/prisma/prisma.service';
 import { DataGatheringService } from '@ghostfolio/api/services/queues/data-gathering/data-gathering.service';
 import { SymbolProfileService } from '@ghostfolio/api/services/symbol-profile/symbol-profile.service';
@@ -16,7 +18,10 @@ import {
   ghostfolioPrefix,
   TAG_ID_EXCLUDE_FROM_ANALYSIS
 } from '@ghostfolio/common/config';
-import { getAssetProfileIdentifier } from '@ghostfolio/common/helper';
+import {
+  canDeleteAssetProfile,
+  getAssetProfileIdentifier
+} from '@ghostfolio/common/helper';
 import {
   ActivitiesResponse,
   Activity,
@@ -48,10 +53,12 @@ export class ActivitiesService {
   public constructor(
     private readonly accountBalanceService: AccountBalanceService,
     private readonly accountService: AccountService,
+    private readonly benchmarkService: BenchmarkService,
     private readonly dataGatheringService: DataGatheringService,
     private readonly dataProviderService: DataProviderService,
     private readonly eventEmitter: EventEmitter2,
     private readonly exchangeRateDataService: ExchangeRateDataService,
+    private readonly marketDataService: MarketDataService,
     private readonly prismaService: PrismaService,
     private readonly symbolProfileService: SymbolProfileService
   ) {}
@@ -262,7 +269,26 @@ export class ActivitiesService {
         activity.symbolProfileId
       ]);
 
-    if (symbolProfile.activitiesCount === 0) {
+    const benchmarkAssetProfiles =
+      await this.benchmarkService.getBenchmarkAssetProfiles();
+
+    const isBenchmark = benchmarkAssetProfiles.some(({ id }) => {
+      return id === symbolProfile.id;
+    });
+
+    if (
+      canDeleteAssetProfile({
+        isBenchmark,
+        activitiesCount: symbolProfile.activitiesCount,
+        symbol: symbolProfile.symbol,
+        watchedByCount: symbolProfile.watchedByCount
+      })
+    ) {
+      await this.marketDataService.deleteMany({
+        dataSource: symbolProfile.dataSource,
+        symbol: symbolProfile.symbol
+      });
+
       await this.symbolProfileService.deleteById(activity.symbolProfileId);
     }
 
@@ -308,8 +334,31 @@ export class ActivitiesService {
         })
       );
 
-    for (const { activitiesCount, id } of symbolProfiles) {
+    const benchmarkAssetProfiles =
-      if (activitiesCount === 0) {
+      await this.benchmarkService.getBenchmarkAssetProfiles();
+
+    for (const {
+      activitiesCount,
+      dataSource,
+      id,
+      symbol,
+      watchedByCount
+    } of symbolProfiles) {
+      const isBenchmark = benchmarkAssetProfiles.some(
+        (benchmarkAssetProfile) => {
+          return benchmarkAssetProfile.id === id;
+        }
+      );
+
+      if (
+        canDeleteAssetProfile({
+          activitiesCount,
+          isBenchmark,
+          symbol,
+          watchedByCount
+        })
+      ) {
+        await this.marketDataService.deleteMany({ dataSource, symbol });
         await this.symbolProfileService.deleteById(id);
       }
     }

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

@@ -2,9 +2,11 @@ import { HasPermission } from '@ghostfolio/api/decorators/has-permission.decorat
 import { HasPermissionGuard } from '@ghostfolio/api/guards/has-permission.guard';
 import { TransformDataSourceInRequestInterceptor } from '@ghostfolio/api/interceptors/transform-data-source-in-request/transform-data-source-in-request.interceptor';
 import { ApiService } from '@ghostfolio/api/services/api/api.service';
+import { BenchmarkService } from '@ghostfolio/api/services/benchmark/benchmark.service';
 import { ManualService } from '@ghostfolio/api/services/data-provider/manual/manual.service';
 import { DemoService } from '@ghostfolio/api/services/demo/demo.service';
 import { DataGatheringService } from '@ghostfolio/api/services/queues/data-gathering/data-gathering.service';
+import { SymbolProfileService } from '@ghostfolio/api/services/symbol-profile/symbol-profile.service';
 import { getIntervalFromDateRange } from '@ghostfolio/common/calculation-helper';
 import {
   DATA_GATHERING_QUEUE_PRIORITY_HIGH,
@@ -16,7 +18,10 @@ import {
   UpdateAssetProfileDto,
   UpdatePropertyDto
 } from '@ghostfolio/common/dtos';
-import { getAssetProfileIdentifier } from '@ghostfolio/common/helper';
+import {
+  canDeleteAssetProfile,
+  getAssetProfileIdentifier
+} from '@ghostfolio/common/helper';
 import {
   AdminData,
   AdminMarketData,
@@ -58,13 +63,17 @@ import { AdminService } from './admin.service';
 
 @Controller('admin')
 export class AdminController {
+  private readonly logger = new Logger(AdminController.name);
+
   public constructor(
     private readonly adminService: AdminService,
     private readonly apiService: ApiService,
+    private readonly benchmarkService: BenchmarkService,
     private readonly dataGatheringService: DataGatheringService,
     private readonly demoService: DemoService,
     private readonly manualService: ManualService,
-    @Inject(REQUEST) private readonly request: RequestWithUser
+    @Inject(REQUEST) private readonly request: RequestWithUser,
+    private readonly symbolProfileService: SymbolProfileService
   ) {}
 
   @Get()
@@ -260,7 +269,7 @@ export class AdminController {
         `Could not parse the market price for ${symbol} (${dataSource})`
       );
     } catch (error) {
-      Logger.error(error, 'AdminController');
+      this.logger.error(error);
 
       throw new HttpException(error.message, StatusCodes.BAD_REQUEST);
     }
@@ -288,6 +297,33 @@ export class AdminController {
     @Param('dataSource') dataSource: DataSource,
     @Param('symbol') symbol: string
   ): Promise<void> {
+    const [assetProfile] = await this.symbolProfileService.getSymbolProfiles([
+      { dataSource, symbol }
+    ]);
+
+    if (assetProfile) {
+      const benchmarkAssetProfiles =
+        await this.benchmarkService.getBenchmarkAssetProfiles();
+
+      const isBenchmark = benchmarkAssetProfiles.some(({ id }) => {
+        return id === assetProfile.id;
+      });
+
+      if (
+        !canDeleteAssetProfile({
+          isBenchmark,
+          activitiesCount: assetProfile.activitiesCount,
+          symbol: assetProfile.symbol,
+          watchedByCount: assetProfile.watchedByCount
+        })
+      ) {
+        throw new HttpException(
+          getReasonPhrase(StatusCodes.FORBIDDEN),
+          StatusCodes.FORBIDDEN
+        );
+      }
+    }
+
     return this.adminService.deleteProfileData({ dataSource, symbol });
   }
 

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

@@ -14,6 +14,7 @@ import {
   PROPERTY_IS_USER_SIGNUP_ENABLED
 } from '@ghostfolio/common/config';
 import {
+  applyAssetProfileOverrides,
   getAssetProfileIdentifier,
   getCurrencyFromSymbol,
   isCurrency
@@ -29,7 +30,6 @@ import {
   EnhancedSymbolProfile,
   Filter
 } from '@ghostfolio/common/interfaces';
-import { Sector } from '@ghostfolio/common/interfaces/sector.interface';
 import { MarketDataPreset } from '@ghostfolio/common/types';
 
 import {
@@ -349,87 +349,61 @@ export class AdminService {
     }
 
     let marketData: AdminMarketDataItem[] = await Promise.all(
-      assetProfiles.map(
+      assetProfiles.map(async (assetProfile) => {
-        async ({
+        const {
           _count,
           activities,
-          assetClass,
-          assetSubClass,
           comment,
-          countries,
           currency,
           dataSource,
           id,
           isActive,
           isUsedByUsersWithSubscription,
-          name,
+          symbol
-          sectors,
+        } = assetProfile;
-          symbol,
-          SymbolProfileOverrides
-        }) => {
-          let countriesCount = countries ? Object.keys(countries).length : 0;
 
-          const lastMarketPrice = lastMarketPriceMap.get(
+        const { assetClass, assetSubClass, countries, name, sectors } =
-            getAssetProfileIdentifier({ dataSource, symbol })
+          applyAssetProfileOverrides(
+            assetProfile,
+            assetProfile.SymbolProfileOverrides
           );
 
-          const marketDataItemCount =
+        const countriesCount = countries ? Object.keys(countries).length : 0;
-            marketDataItems.find((marketDataItem) => {
-              return (
-                marketDataItem.dataSource === dataSource &&
-                marketDataItem.symbol === symbol
-              );
-            })?._count ?? 0;
-
-          let sectorsCount = sectors ? Object.keys(sectors).length : 0;
-
-          if (SymbolProfileOverrides) {
-            assetClass = SymbolProfileOverrides.assetClass ?? assetClass;
-            assetSubClass =
-              SymbolProfileOverrides.assetSubClass ?? assetSubClass;
-
-            if (
-              (SymbolProfileOverrides.countries as unknown as Prisma.JsonArray)
-                ?.length > 0
-            ) {
-              countriesCount = (
-                SymbolProfileOverrides.countries as unknown as Prisma.JsonArray
-              ).length;
-            }
 
-            name = SymbolProfileOverrides.name ?? name;
+        const lastMarketPrice = lastMarketPriceMap.get(
+          getAssetProfileIdentifier({ dataSource, symbol })
+        );
 
-            if (
+        const marketDataItemCount =
-              (SymbolProfileOverrides.sectors as unknown as Sector[])?.length >
+          marketDataItems.find((marketDataItem) => {
-              0
+            return (
-            ) {
+              marketDataItem.dataSource === dataSource &&
-              sectorsCount = (
+              marketDataItem.symbol === symbol
-                SymbolProfileOverrides.sectors as unknown as Prisma.JsonArray
+            );
-              ).length;
+          })?._count ?? 0;
-            }
-          }
 
-          return {
+        const sectorsCount = sectors ? Object.keys(sectors).length : 0;
-            assetClass,
+
-            assetSubClass,
+        return {
-            comment,
+          assetClass,
-            countriesCount,
+          assetSubClass,
-            currency,
+          comment,
-            dataSource,
+          countriesCount,
-            id,
+          currency,
-            isActive,
+          dataSource,
-            lastMarketPrice,
+          id,
-            marketDataItemCount,
+          isActive,
-            name,
+          lastMarketPrice,
-            sectorsCount,
+          marketDataItemCount,
-            symbol,
+          name,
-            activitiesCount: _count.activities,
+          sectorsCount,
-            date: activities?.[0]?.date,
+          symbol,
-            isUsedByUsersWithSubscription: await isUsedByUsersWithSubscription,
+          activitiesCount: _count.activities,
-            watchedByCount: _count.watchedBy
+          date: activities?.[0]?.date,
-          };
+          isUsedByUsersWithSubscription: await isUsedByUsersWithSubscription,
-        }
+          watchedByCount: _count.watchedBy
-      )
+        };
+      })
     );
 
     if (presetId) {

apps/api/src/app/auth/auth.module.ts

@@ -5,6 +5,8 @@ import { UserModule } from '@ghostfolio/api/app/user/user.module';
 import { ApiKeyService } from '@ghostfolio/api/services/api-key/api-key.service';
 import { ConfigurationModule } from '@ghostfolio/api/services/configuration/configuration.module';
 import { ConfigurationService } from '@ghostfolio/api/services/configuration/configuration.service';
+import { FetchModule } from '@ghostfolio/api/services/fetch/fetch.module';
+import { FetchService } from '@ghostfolio/api/services/fetch/fetch.service';
 import { PrismaModule } from '@ghostfolio/api/services/prisma/prisma.module';
 import { PropertyModule } from '@ghostfolio/api/services/property/property.module';
 
@@ -23,6 +25,7 @@ import { OidcStrategy } from './oidc.strategy';
   controllers: [AuthController],
   imports: [
     ConfigurationModule,
+    FetchModule,
     JwtModule.register({
       secret: process.env.JWT_SECRET_KEY,
       signOptions: { expiresIn: '180 days' }
@@ -40,12 +43,15 @@ import { OidcStrategy } from './oidc.strategy';
     GoogleStrategy,
     JwtStrategy,
     {
-      inject: [AuthService, ConfigurationService],
+      inject: [AuthService, ConfigurationService, FetchService],
       provide: OidcStrategy,
       useFactory: async (
         authService: AuthService,
-        configurationService: ConfigurationService
+        configurationService: ConfigurationService,
+        fetchService: FetchService
       ) => {
+        const logger = new Logger('OidcStrategy');
+
         const isOidcEnabled = configurationService.get(
           'ENABLE_FEATURE_AUTH_OIDC'
         );
@@ -81,7 +87,7 @@ import { OidcStrategy } from './oidc.strategy';
         } else {
           // Fetch OIDC configuration from discovery endpoint
           try {
-            const response = await fetch(
+            const response = await fetchService.fetch(
               `${issuer}/.well-known/openid-configuration`
             );
 
@@ -97,7 +103,7 @@ import { OidcStrategy } from './oidc.strategy';
             tokenURL = manualTokenUrl || config.token_endpoint;
             userInfoURL = manualUserInfoUrl || config.userinfo_endpoint;
           } catch (error) {
-            Logger.error(error, 'OidcStrategy');
+            logger.error(error);
             throw new Error('Failed to fetch OIDC configuration from issuer');
           }
         }

apps/api/src/app/auth/google.strategy.ts

@@ -10,6 +10,8 @@ import { AuthService } from './auth.service';
 
 @Injectable()
 export class GoogleStrategy extends PassportStrategy(Strategy, 'google') {
+  private readonly logger = new Logger(GoogleStrategy.name);
+
   public constructor(
     private readonly authService: AuthService,
     configurationService: ConfigurationService
@@ -40,7 +42,7 @@ export class GoogleStrategy extends PassportStrategy(Strategy, 'google') {
 
       done(null, { jwt });
     } catch (error) {
-      Logger.error(error, 'GoogleStrategy');
+      this.logger.error(error);
       done(error, false);
     }
   }

apps/api/src/app/auth/oidc.strategy.ts

@@ -15,6 +15,8 @@ import { OidcStateStore } from './oidc-state.store';
 
 @Injectable()
 export class OidcStrategy extends PassportStrategy(Strategy, 'oidc') {
+  private readonly logger = new Logger(OidcStrategy.name);
+
   private static readonly stateStore = new OidcStateStore();
 
   public constructor(
@@ -52,9 +54,8 @@ export class OidcStrategy extends PassportStrategy(Strategy, 'oidc') {
       });
 
       if (!thirdPartyId) {
-        Logger.error(
+        this.logger.error(
-          `Missing subject identifier in OIDC response from ${issuer}`,
+          `Missing subject identifier in OIDC response from ${issuer}`
-          'OidcStrategy'
         );
 
         throw new Error('Missing subject identifier in OIDC response');
@@ -62,7 +63,7 @@ export class OidcStrategy extends PassportStrategy(Strategy, 'oidc') {
 
       return { jwt };
     } catch (error) {
-      Logger.error(error, 'OidcStrategy');
+      this.logger.error(error);
       throw error;
     }
   }

apps/api/src/app/auth/web-auth.service.ts

@@ -33,6 +33,8 @@ import ms from 'ms';
 
 @Injectable()
 export class WebAuthService {
+  private readonly logger = new Logger(WebAuthService.name);
+
   public constructor(
     private readonly configurationService: ConfigurationService,
     private readonly deviceService: AuthDeviceService,
@@ -103,7 +105,7 @@ export class WebAuthService {
 
       verification = await verifyRegistrationResponse(opts);
     } catch (error) {
-      Logger.error(error, 'WebAuthService');
+      this.logger.error(error);
       throw new InternalServerErrorException(error.message);
     }
 
@@ -210,7 +212,7 @@ export class WebAuthService {
 
       verification = await verifyAuthenticationResponse(opts);
     } catch (error) {
-      Logger.error(error, 'WebAuthService');
+      this.logger.error(error);
       throw new InternalServerErrorException({ error: error.message });
     }
 

apps/api/src/app/endpoints/benchmarks/benchmarks.service.ts

@@ -17,6 +17,8 @@ import { isNumber } from 'lodash';
 
 @Injectable()
 export class BenchmarksService {
+  private readonly logger = new Logger(BenchmarksService.name);
+
   public constructor(
     private readonly benchmarkService: BenchmarkService,
     private readonly exchangeRateDataService: ExchangeRateDataService,
@@ -96,12 +98,11 @@ export class BenchmarksService {
     })?.marketPrice;
 
     if (!marketPriceAtStartDate) {
-      Logger.error(
+      this.logger.error(
         `No historical market data has been found for ${symbol} (${dataSource}) at ${format(
           startDate,
           DATE_FORMAT
-        )}`,
+        )}`
-        'BenchmarkService'
       );
 
       return { marketData };

apps/api/src/app/endpoints/data-providers/ghostfolio/ghostfolio.module.ts

@@ -12,6 +12,7 @@ import { GoogleSheetsService } from '@ghostfolio/api/services/data-provider/goog
 import { ManualService } from '@ghostfolio/api/services/data-provider/manual/manual.service';
 import { RapidApiService } from '@ghostfolio/api/services/data-provider/rapid-api/rapid-api.service';
 import { YahooFinanceService } from '@ghostfolio/api/services/data-provider/yahoo-finance/yahoo-finance.service';
+import { FetchModule } from '@ghostfolio/api/services/fetch/fetch.module';
 import { MarketDataModule } from '@ghostfolio/api/services/market-data/market-data.module';
 import { PrismaModule } from '@ghostfolio/api/services/prisma/prisma.module';
 import { PropertyModule } from '@ghostfolio/api/services/property/property.module';
@@ -27,6 +28,7 @@ import { GhostfolioService } from './ghostfolio.service';
   imports: [
     CryptocurrencyModule,
     DataProviderModule,
+    FetchModule,
     MarketDataModule,
     PrismaModule,
     PropertyModule,

apps/api/src/app/endpoints/data-providers/ghostfolio/ghostfolio.service.ts

@@ -8,6 +8,7 @@ import {
   GetQuotesParams,
   GetSearchParams
 } from '@ghostfolio/api/services/data-provider/interfaces/data-provider.interface';
+import { FetchService } from '@ghostfolio/api/services/fetch/fetch.service';
 import { PrismaService } from '@ghostfolio/api/services/prisma/prisma.service';
 import { PropertyService } from '@ghostfolio/api/services/property/property.service';
 import {
@@ -33,9 +34,12 @@ import { Big } from 'big.js';
 
 @Injectable()
 export class GhostfolioService {
+  private readonly logger = new Logger(GhostfolioService.name);
+
   public constructor(
     private readonly configurationService: ConfigurationService,
     private readonly dataProviderService: DataProviderService,
+    private readonly fetchService: FetchService,
     private readonly prismaService: PrismaService,
     private readonly propertyService: PropertyService
   ) {}
@@ -97,7 +101,7 @@ export class GhostfolioService {
 
       return result;
     } catch (error) {
-      Logger.error(error, 'GhostfolioService');
+      this.logger.error(error);
 
       throw error;
     }
@@ -139,7 +143,7 @@ export class GhostfolioService {
 
       return result;
     } catch (error) {
-      Logger.error(error, 'GhostfolioService');
+      this.logger.error(error);
 
       throw error;
     }
@@ -181,7 +185,7 @@ export class GhostfolioService {
 
       return result;
     } catch (error) {
-      Logger.error(error, 'GhostfolioService');
+      this.logger.error(error);
 
       throw error;
     }
@@ -269,7 +273,7 @@ export class GhostfolioService {
 
       return results;
     } catch (error) {
-      Logger.error(error, 'GhostfolioService');
+      this.logger.error(error);
 
       throw error;
     }
@@ -346,7 +350,7 @@ export class GhostfolioService {
 
       return results;
     } catch (error) {
-      Logger.error(error, 'GhostfolioService');
+      this.logger.error(error);
 
       throw error;
     }
@@ -355,6 +359,7 @@ export class GhostfolioService {
   private getDataProviderInfo(): DataProviderInfo {
     const ghostfolioDataProviderService = new GhostfolioDataProviderService(
       this.configurationService,
+      this.fetchService,
       this.propertyService
     );
 

apps/api/src/app/endpoints/market-data/market-data.controller.ts

@@ -120,10 +120,10 @@ export class MarketDataController {
 
     if (!canReadAllAssetProfiles && !canReadOwnAssetProfile) {
       throw new HttpException(
-        assetProfile.userId
+        assetProfile?.userId
           ? getReasonPhrase(StatusCodes.NOT_FOUND)
           : getReasonPhrase(StatusCodes.FORBIDDEN),
-        assetProfile.userId ? StatusCodes.NOT_FOUND : StatusCodes.FORBIDDEN
+        assetProfile?.userId ? StatusCodes.NOT_FOUND : StatusCodes.FORBIDDEN
       );
     }
 

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

@@ -24,6 +24,8 @@ import { HealthService } from './health.service';
 
 @Controller('health')
 export class HealthController {
+  private readonly logger = new Logger(HealthController.name);
+
   public constructor(
     private readonly aiService: AiService,
     private readonly healthService: HealthService
@@ -61,7 +63,7 @@ export class HealthController {
           .json({ status: getReasonPhrase(StatusCodes.OK) });
       }
     } catch (error) {
-      Logger.error(error, 'HealthController');
+      this.logger.error(error);
     }
 
     return response

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

@@ -31,6 +31,8 @@ import { ImportService } from './import.service';
 
 @Controller('import')
 export class ImportController {
+  private readonly logger = new Logger(ImportController.name);
+
   public constructor(
     private readonly configurationService: ConfigurationService,
     private readonly importService: ImportService,
@@ -81,7 +83,7 @@ export class ImportController {
 
       return { activities };
     } catch (error) {
-      Logger.error(error, ImportController);
+      this.logger.error(error);
 
       throw new HttpException(
         {

apps/api/src/app/logo/logo.module.ts

@@ -1,5 +1,6 @@
 import { TransformDataSourceInRequestModule } from '@ghostfolio/api/interceptors/transform-data-source-in-request/transform-data-source-in-request.module';
 import { ConfigurationModule } from '@ghostfolio/api/services/configuration/configuration.module';
+import { FetchModule } from '@ghostfolio/api/services/fetch/fetch.module';
 import { SymbolProfileModule } from '@ghostfolio/api/services/symbol-profile/symbol-profile.module';
 
 import { Module } from '@nestjs/common';
@@ -11,6 +12,7 @@ import { LogoService } from './logo.service';
   controllers: [LogoController],
   imports: [
     ConfigurationModule,
+    FetchModule,
     SymbolProfileModule,
     TransformDataSourceInRequestModule
   ],

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

@@ -1,4 +1,5 @@
 import { ConfigurationService } from '@ghostfolio/api/services/configuration/configuration.service';
+import { FetchService } from '@ghostfolio/api/services/fetch/fetch.service';
 import { SymbolProfileService } from '@ghostfolio/api/services/symbol-profile/symbol-profile.service';
 import { AssetProfileIdentifier } from '@ghostfolio/common/interfaces';
 
@@ -10,6 +11,7 @@ import { StatusCodes, getReasonPhrase } from 'http-status-codes';
 export class LogoService {
   public constructor(
     private readonly configurationService: ConfigurationService,
+    private readonly fetchService: FetchService,
     private readonly symbolProfileService: SymbolProfileService
   ) {}
 
@@ -43,15 +45,17 @@ export class LogoService {
   }
 
   private async getBuffer(aUrl: string) {
-    const blob = await fetch(
+    const blob = await this.fetchService
-      `https://t0.gstatic.com/faviconV2?client=SOCIAL&type=FAVICON&fallback_opts=TYPE,SIZE,URL&url=${aUrl}&size=64`,
+      .fetch(
-      {
+        `https://t0.gstatic.com/faviconV2?client=SOCIAL&type=FAVICON&fallback_opts=TYPE,SIZE,URL&url=${aUrl}&size=64`,
-        headers: { 'User-Agent': 'request' },
+        {
-        signal: AbortSignal.timeout(
+          headers: { 'User-Agent': 'request' },
-          this.configurationService.get('REQUEST_TIMEOUT')
+          signal: AbortSignal.timeout(
-        )
+            this.configurationService.get('REQUEST_TIMEOUT')
-      }
+          )
-    ).then((res) => res.blob());
+        }
+      )
+      .then((res) => res.blob());
 
     return {
       buffer: await blob.arrayBuffer().then((arrayBuffer) => {

apps/api/src/app/portfolio/calculator/portfolio-calculator.ts

@@ -62,6 +62,8 @@ import { isNumber, sortBy, sum, uniqBy } from 'lodash';
 export abstract class PortfolioCalculator {
   protected static readonly ENABLE_LOGGING = false;
 
+  protected readonly logger = new Logger(PortfolioCalculator.name);
+
   protected accountBalanceItems: HistoricalDataItem[];
   protected activities: PortfolioOrder[];
 
@@ -1119,12 +1121,11 @@ export abstract class PortfolioCalculator {
     if (cachedPortfolioSnapshot) {
       this.snapshot = cachedPortfolioSnapshot;
 
-      Logger.debug(
+      this.logger.debug(
         `Fetched portfolio snapshot from cache in ${(
           (performance.now() - startTimeTotal) /
           1000
-        ).toFixed(3)} seconds`,
+        ).toFixed(3)} seconds`
-        'PortfolioCalculator'
       );
 
       if (isCachedPortfolioSnapshotExpired) {

apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-cash.spec.ts

@@ -116,10 +116,12 @@ describe('PortfolioCalculator', () => {
       accountBalanceService,
       accountService,
       null,
+      null,
       dataProviderService,
       null,
       exchangeRateDataService,
       null,
+      null,
       null
     );
 

apps/api/src/app/portfolio/calculator/roai/portfolio-calculator.ts

@@ -11,7 +11,6 @@ import { PortfolioSnapshot, TimelinePosition } from '@ghostfolio/common/models';
 import { DateRange } from '@ghostfolio/common/types';
 import { PerformanceCalculationType } from '@ghostfolio/common/types/performance-calculation-type.type';
 
-import { Logger } from '@nestjs/common';
 import { Big } from 'big.js';
 import {
   addMilliseconds,
@@ -96,9 +95,8 @@ export class RoaiPortfolioCalculator extends PortfolioCalculator {
             currentPosition.timeWeightedInvestmentWithCurrencyEffect
           );
       } else if (!currentPosition.quantity.eq(0)) {
-        Logger.warn(
+        this.logger.warn(
-          `Missing historical market data for ${currentPosition.symbol} (${currentPosition.dataSource})`,
+          `Missing historical market data for ${currentPosition.symbol} (${currentPosition.dataSource})`
-          'PortfolioCalculator'
         );
 
         hasErrors = true;

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

@@ -1,4 +1,5 @@
 import { ActivitiesService } from '@ghostfolio/api/app/activities/activities.service';
+import { UserService } from '@ghostfolio/api/app/user/user.service';
 import { HasPermission } from '@ghostfolio/api/decorators/has-permission.decorator';
 import { HasPermissionGuard } from '@ghostfolio/api/guards/has-permission.guard';
 import {
@@ -70,7 +71,8 @@ export class PortfolioController {
     private readonly configurationService: ConfigurationService,
     private readonly impersonationService: ImpersonationService,
     private readonly portfolioService: PortfolioService,
-    @Inject(REQUEST) private readonly request: RequestWithUser
+    @Inject(REQUEST) private readonly request: RequestWithUser,
+    private readonly userService: UserService
   ) {}
 
   @Get('details')
@@ -144,10 +146,10 @@ export class PortfolioController {
         .reduce((a, b) => a + b, 0);
 
       const totalValue = Object.values(holdings)
-        .filter(({ assetClass, assetSubClass }) => {
+        .filter(({ assetProfile }) => {
           return (
-            assetClass !== AssetClass.LIQUIDITY &&
+            assetProfile.assetClass !== AssetClass.LIQUIDITY &&
-            assetSubClass !== AssetSubClass.CASH
+            assetProfile.assetSubClass !== AssetSubClass.CASH
           );
         })
         .map(({ valueInBaseCurrency }) => {
@@ -217,37 +219,41 @@ export class PortfolioController {
     for (const [symbol, portfolioPosition] of Object.entries(holdings)) {
       holdings[symbol] = {
         ...portfolioPosition,
-        assetClass:
-          hasDetails || portfolioPosition.assetClass === AssetClass.LIQUIDITY
-            ? portfolioPosition.assetClass
-            : undefined,
         assetProfile: {
           ...portfolioPosition.assetProfile,
+          assetClass:
+            hasDetails ||
+            portfolioPosition.assetProfile.assetClass === AssetClass.LIQUIDITY
+              ? portfolioPosition.assetProfile.assetClass
+              : undefined,
+          assetClassLabel:
+            hasDetails ||
+            portfolioPosition.assetProfile.assetClass === AssetClass.LIQUIDITY
+              ? portfolioPosition.assetProfile.assetClassLabel
+              : undefined,
+          assetSubClass:
+            hasDetails ||
+            portfolioPosition.assetProfile.assetSubClass === AssetSubClass.CASH
+              ? portfolioPosition.assetProfile.assetSubClass
+              : undefined,
+          assetSubClassLabel:
+            hasDetails ||
+            portfolioPosition.assetProfile.assetSubClass === AssetSubClass.CASH
+              ? portfolioPosition.assetProfile.assetSubClassLabel
+              : undefined,
           ...(hasDetails
             ? {}
             : {
-                assetClass: undefined,
-                assetClassLabel: undefined,
-                assetSubClass: undefined,
-                assetSubClassLabel: undefined,
                 countries: [],
                 currency: undefined,
                 holdings: [],
                 sectors: []
               })
         },
-        assetSubClass:
-          hasDetails || portfolioPosition.assetSubClass === AssetSubClass.CASH
-            ? portfolioPosition.assetSubClass
-            : undefined,
-        countries: hasDetails ? portfolioPosition.countries : [],
-        currency: hasDetails ? portfolioPosition.currency : undefined,
-        holdings: hasDetails ? portfolioPosition.holdings : [],
         markets: hasDetails ? portfolioPosition.markets : undefined,
         marketsAdvanced: hasDetails
           ? portfolioPosition.marketsAdvanced
-          : undefined,
+          : undefined
-        sectors: hasDetails ? portfolioPosition.sectors : []
       };
     }
 
@@ -336,7 +342,10 @@ export class PortfolioController {
 
     const impersonationUserId =
       await this.impersonationService.validateImpersonationId(impersonationId);
-    const userCurrency = this.request.user.settings.settings.baseCurrency;
+    const userId = impersonationUserId || this.request.user.id;
+
+    const { settings } = await this.userService.user({ id: userId });
+    const userCurrency = settings.settings.baseCurrency;
 
     const { endDate, startDate } = getIntervalFromDateRange({ dateRange });
 
@@ -345,7 +354,7 @@ export class PortfolioController {
       filters,
       startDate,
       userCurrency,
-      userId: impersonationUserId || this.request.user.id,
+      userId,
       types: ['DIVIDEND']
     });
 

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

@@ -0,0 +1,274 @@
+import { AccountService } from '@ghostfolio/api/app/account/account.service';
+import { CashDetails } from '@ghostfolio/api/app/account/interfaces/cash-details.interface';
+import { ActivitiesService } from '@ghostfolio/api/app/activities/activities.service';
+import { userDummyData } from '@ghostfolio/api/app/portfolio/calculator/portfolio-calculator-test-utils';
+import { PortfolioCalculatorFactory } from '@ghostfolio/api/app/portfolio/calculator/portfolio-calculator.factory';
+import { UserService } from '@ghostfolio/api/app/user/user.service';
+import { ConfigurationService } from '@ghostfolio/api/services/configuration/configuration.service';
+import { DataProviderService } from '@ghostfolio/api/services/data-provider/data-provider.service';
+import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.service';
+import { ImpersonationService } from '@ghostfolio/api/services/impersonation/impersonation.service';
+import { SymbolProfileService } from '@ghostfolio/api/services/symbol-profile/symbol-profile.service';
+import { parseDate } from '@ghostfolio/common/helper';
+
+import { Account, DataSource } from '@prisma/client';
+import { Big } from 'big.js';
+import { randomUUID } from 'node:crypto';
+
+import { PortfolioService } from './portfolio.service';
+
+describe('PortfolioService', () => {
+  let accountService: AccountService;
+  let activitiesService: ActivitiesService;
+  let configurationService: ConfigurationService;
+  let dataProviderService: DataProviderService;
+  let exchangeRateDataService: ExchangeRateDataService;
+  let impersonationService: ImpersonationService;
+  let portfolioCalculatorFactory: PortfolioCalculatorFactory;
+  let portfolioService: PortfolioService;
+  let symbolProfileService: SymbolProfileService;
+  let userService: UserService;
+
+  beforeEach(() => {
+    configurationService = new ConfigurationService();
+
+    dataProviderService = new DataProviderService(
+      configurationService,
+      null,
+      null,
+      null,
+      null,
+      null
+    );
+
+    exchangeRateDataService = new ExchangeRateDataService(
+      null,
+      null,
+      null,
+      null
+    );
+
+    accountService = new AccountService(
+      null,
+      null,
+      exchangeRateDataService,
+      null
+    );
+
+    activitiesService = new ActivitiesService(
+      null,
+      accountService,
+      null,
+      null,
+      dataProviderService,
+      null,
+      exchangeRateDataService,
+      null,
+      null,
+      null
+    );
+
+    impersonationService = new ImpersonationService(null, null);
+
+    portfolioCalculatorFactory = new PortfolioCalculatorFactory(
+      configurationService,
+      null,
+      exchangeRateDataService,
+      null,
+      null
+    );
+
+    symbolProfileService = new SymbolProfileService(null);
+
+    userService = new UserService(
+      null,
+      null,
+      null,
+      null,
+      null,
+      null,
+      null,
+      null
+    );
+
+    portfolioService = new PortfolioService(
+      null,
+      accountService,
+      activitiesService,
+      null,
+      portfolioCalculatorFactory,
+      dataProviderService,
+      exchangeRateDataService,
+      null,
+      impersonationService,
+      null,
+      null,
+      symbolProfileService,
+      userService
+    );
+  });
+
+  describe('getCashSymbolProfiles', () => {
+    it('should use the exchange-rate data source so the symbol-profile join in getDetails matches the calculator positions', () => {
+      jest
+        .spyOn(dataProviderService, 'getDataSourceForExchangeRates')
+        .mockReturnValue(DataSource.YAHOO);
+
+      const cashDetails: CashDetails = {
+        accounts: [
+          {
+            balance: 2000,
+            comment: null,
+            createdAt: parseDate('2024-01-01'),
+            currency: 'USD',
+            id: randomUUID(),
+            isExcluded: false,
+            name: 'USD',
+            platformId: null,
+            updatedAt: parseDate('2024-01-01'),
+            userId: userDummyData.id
+          }
+        ],
+        balanceInBaseCurrency: 1820
+      };
+
+      const assetProfiles = (
+        portfolioService as unknown as {
+          getCashSymbolProfiles: (
+            aCashDetails: CashDetails
+          ) => { dataSource: DataSource; symbol: string }[];
+        }
+      ).getCashSymbolProfiles(cashDetails);
+
+      expect(assetProfiles).toHaveLength(1);
+      expect(assetProfiles[0].dataSource).toBe(DataSource.YAHOO);
+      expect(assetProfiles[0].symbol).toBe('USD');
+    });
+  });
+
+  describe('getDetails', () => {
+    it('should return cash holdings when the calculator emits cash positions with the exchange-rate data source', async () => {
+      const accountId = randomUUID();
+
+      const cashAccount: Account = {
+        balance: 2000,
+        comment: null,
+        createdAt: parseDate('2024-01-01'),
+        currency: 'USD',
+        id: accountId,
+        isExcluded: false,
+        name: 'USD',
+        platformId: null,
+        updatedAt: parseDate('2024-01-01'),
+        userId: userDummyData.id
+      };
+
+      jest.spyOn(accountService, 'getCashDetails').mockResolvedValue({
+        accounts: [cashAccount],
+        balanceInBaseCurrency: 1820
+      });
+
+      jest
+        .spyOn(activitiesService, 'getActivitiesForPortfolioCalculator')
+        .mockResolvedValue({ activities: [], count: 0 });
+
+      jest
+        .spyOn(dataProviderService, 'getDataSourceForExchangeRates')
+        .mockReturnValue(DataSource.YAHOO);
+
+      jest
+        .spyOn(impersonationService, 'validateImpersonationId')
+        .mockResolvedValue(null);
+
+      jest
+        .spyOn(symbolProfileService, 'getSymbolProfiles')
+        .mockResolvedValue([]);
+
+      jest.spyOn(userService, 'user').mockResolvedValue({
+        accessesGet: [],
+        accounts: [],
+        activityCount: 0,
+        dataProviderGhostfolioDailyRequests: 0,
+        id: userDummyData.id,
+        settings: {
+          settings: {
+            baseCurrency: 'CHF'
+          }
+        }
+      } as unknown as Awaited<ReturnType<typeof userService.user>>);
+
+      const usdPosition = {
+        activitiesCount: 1,
+        averagePrice: new Big(1),
+        currency: 'USD',
+        dataSource: DataSource.YAHOO,
+        dateOfFirstActivity: '2024-01-01',
+        dividend: new Big(0),
+        dividendInBaseCurrency: new Big(0),
+        fee: new Big(0),
+        feeInBaseCurrency: new Big(0),
+        grossPerformance: new Big(0),
+        grossPerformancePercentage: new Big(0),
+        grossPerformancePercentageWithCurrencyEffect: new Big(0),
+        grossPerformanceWithCurrencyEffect: new Big(0),
+        investment: new Big(1820),
+        investmentWithCurrencyEffect: new Big(1820),
+        marketPrice: 1,
+        marketPriceInBaseCurrency: 0.91,
+        netPerformance: new Big(0),
+        netPerformancePercentage: new Big(0),
+        netPerformancePercentageWithCurrencyEffectMap: {},
+        netPerformanceWithCurrencyEffectMap: {},
+        quantity: new Big(2000),
+        symbol: 'USD',
+        tags: [],
+        timeWeightedInvestment: new Big(0),
+        timeWeightedInvestmentWithCurrencyEffect: new Big(0),
+        valueInBaseCurrency: new Big(1820)
+      };
+
+      jest
+        .spyOn(portfolioCalculatorFactory, 'createCalculator')
+        .mockReturnValue({
+          getSnapshot: jest.fn().mockResolvedValue({
+            activitiesCount: 1,
+            createdAt: parseDate('2024-01-01'),
+            currentValueInBaseCurrency: new Big(1820),
+            errors: [],
+            hasErrors: false,
+            historicalData: [],
+            positions: [usdPosition],
+            totalFeesWithCurrencyEffect: new Big(0),
+            totalInterestWithCurrencyEffect: new Big(0),
+            totalInvestment: new Big(1820),
+            totalInvestmentWithCurrencyEffect: new Big(1820),
+            totalLiabilitiesWithCurrencyEffect: new Big(0)
+          })
+        } as unknown as ReturnType<
+          typeof portfolioCalculatorFactory.createCalculator
+        >);
+
+      jest
+        .spyOn(
+          portfolioService as unknown as {
+            getValueOfAccountsAndPlatforms: () => Promise<{
+              accounts: object;
+              platforms: object;
+            }>;
+          },
+          'getValueOfAccountsAndPlatforms'
+        )
+        .mockResolvedValue({ accounts: {}, platforms: {} });
+
+      const { holdings } = await portfolioService.getDetails({
+        filters: [],
+        impersonationId: userDummyData.id,
+        userId: userDummyData.id
+      });
+
+      expect(holdings['USD']).toBeDefined();
+      expect(holdings['USD'].assetProfile.dataSource).toBe(DataSource.YAHOO);
+      expect(holdings['USD'].assetProfile.symbol).toBe('USD');
+    });
+  });
+});

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

@@ -108,6 +108,8 @@ const europeMarkets = require('../../assets/countries/europe-markets.json');
 
 @Injectable()
 export class PortfolioService {
+  private readonly logger = new Logger(PortfolioService.name);
+
   public constructor(
     private readonly accountBalanceService: AccountBalanceService,
     private readonly accountService: AccountService,
@@ -164,7 +166,7 @@ export class PortfolioService {
       };
     }
 
-    const [accounts, details] = await Promise.all([
+    const [accounts, details, user] = await Promise.all([
       this.accountService.accounts({
         where,
         include: {
@@ -178,10 +180,11 @@ export class PortfolioService {
         withExcludedAccounts,
         impersonationId: userId,
         userId: this.request.user.id
-      })
+      }),
+      this.userService.user({ id: userId })
     ]);
 
-    const userCurrency = this.request.user.settings.settings.baseCurrency;
+    const userCurrency = this.getUserCurrency(user);
 
     return Promise.all(
       accounts.map(async (account) => {
@@ -584,7 +587,6 @@ export class PortfolioService {
 
     for (const {
       activitiesCount,
-      currency,
       dataSource,
       dateOfFirstActivity,
       dividend,
@@ -619,9 +621,8 @@ export class PortfolioService {
         symbolProfileMap[getAssetProfileIdentifier({ dataSource, symbol })];
 
       if (!assetProfile) {
-        Logger.warn(
+        this.logger.warn(
-          `Asset profile not found for ${symbol} (${dataSource})`,
+          `Asset profile not found for ${symbol} (${dataSource})`
-          'PortfolioService'
         );
 
         continue;
@@ -638,16 +639,13 @@ export class PortfolioService {
 
       holdings[symbol] = {
         activitiesCount,
-        currency,
         markets,
         marketsAdvanced,
         marketPrice,
-        symbol,
         tags,
         allocationInPercentage: filteredValueInBaseCurrency.eq(0)
           ? 0
           : valueInBaseCurrency.div(filteredValueInBaseCurrency).toNumber(),
-        assetClass: assetProfile.assetClass,
         assetProfile: {
           assetClass: assetProfile.assetClass,
           assetSubClass: assetProfile.assetSubClass,
@@ -670,9 +668,6 @@ export class PortfolioService {
           symbol: assetProfile.symbol,
           url: assetProfile.url
         },
-        assetSubClass: assetProfile.assetSubClass,
-        countries: assetProfile.countries,
-        dataSource: assetProfile.dataSource,
         dateOfFirstActivity: parseDate(dateOfFirstActivity),
         dividend: dividend?.toNumber() ?? 0,
         grossPerformance: grossPerformance?.toNumber() ?? 0,
@@ -681,19 +676,7 @@ export class PortfolioService {
           grossPerformancePercentageWithCurrencyEffect?.toNumber() ?? 0,
         grossPerformanceWithCurrencyEffect:
           grossPerformanceWithCurrencyEffect?.toNumber() ?? 0,
-        holdings: assetProfile.holdings.map(
-          ({ allocationInPercentage, name }) => {
-            return {
-              allocationInPercentage,
-              name,
-              valueInBaseCurrency: valueInBaseCurrency
-                .mul(allocationInPercentage)
-                .toNumber()
-            };
-          }
-        ),
         investment: investment.toNumber(),
-        name: assetProfile.name,
         netPerformance: netPerformance?.toNumber() ?? 0,
         netPerformancePercent: netPerformancePercentage?.toNumber() ?? 0,
         netPerformancePercentWithCurrencyEffect:
@@ -703,8 +686,6 @@ export class PortfolioService {
         netPerformanceWithCurrencyEffect:
           netPerformanceWithCurrencyEffectMap?.[dateRange]?.toNumber() ?? 0,
         quantity: quantity.toNumber(),
-        sectors: assetProfile.sectors,
-        url: assetProfile.url,
         valueInBaseCurrency: valueInBaseCurrency.toNumber()
       };
     }
@@ -1472,8 +1453,8 @@ export class PortfolioService {
     for (const [, position] of Object.entries(holdings)) {
       const value = position.valueInBaseCurrency;
 
-      if (position.assetClass !== AssetClass.LIQUIDITY) {
+      if (position.assetProfile.assetClass !== AssetClass.LIQUIDITY) {
-        if (position.countries.length > 0) {
+        if (position.assetProfile.countries.length > 0) {
           markets.developedMarkets.valueInBaseCurrency +=
             position.markets.developedMarkets * value;
           markets.emergingMarkets.valueInBaseCurrency +=
@@ -1719,11 +1700,8 @@ export class PortfolioService {
     currency: string;
   }): PortfolioPosition {
     return {
-      currency,
       activitiesCount: 0,
       allocationInPercentage: 0,
-      assetClass: AssetClass.LIQUIDITY,
-      assetSubClass: AssetSubClass.CASH,
       assetProfile: {
         currency,
         assetClass: AssetClass.LIQUIDITY,
@@ -1735,25 +1713,19 @@ export class PortfolioService {
         sectors: [],
         symbol: currency
       },
-      countries: [],
-      dataSource: undefined,
       dateOfFirstActivity: undefined,
       dividend: 0,
       grossPerformance: 0,
       grossPerformancePercent: 0,
       grossPerformancePercentWithCurrencyEffect: 0,
       grossPerformanceWithCurrencyEffect: 0,
-      holdings: [],
       investment: balance,
       marketPrice: 0,
-      name: currency,
       netPerformance: 0,
       netPerformancePercent: 0,
       netPerformancePercentWithCurrencyEffect: 0,
       netPerformanceWithCurrencyEffect: 0,
       quantity: 0,
-      sectors: [],
-      symbol: currency,
       tags: [],
       valueInBaseCurrency: balance
     };

apps/api/src/app/redis-cache/redis-cache.service.ts

@@ -10,6 +10,8 @@ import { createHash, randomUUID } from 'node:crypto';
 
 @Injectable()
 export class RedisCacheService {
+  private readonly logger = new Logger(RedisCacheService.name);
+
   private client: Keyv;
 
   public constructor(
@@ -27,7 +29,7 @@ export class RedisCacheService {
     };
 
     this.client.on('error', (error) => {
-      Logger.error(error, 'RedisCacheService');
+      this.logger.error(error);
     });
   }
 
@@ -101,7 +103,7 @@ export class RedisCacheService {
 
       return true;
     } catch (error) {
-      Logger.error(error?.message, 'RedisCacheService');
+      this.logger.error(error?.message);
 
       return false;
     } finally {

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

@@ -33,6 +33,8 @@ import { SubscriptionService } from './subscription.service';
 
 @Controller('subscription')
 export class SubscriptionController {
+  private readonly logger = new Logger(SubscriptionController.name);
+
   public constructor(
     private readonly configurationService: ConfigurationService,
     private readonly propertyService: PropertyService,
@@ -80,9 +82,8 @@ export class SubscriptionController {
       value: JSON.stringify(coupons)
     });
 
-    Logger.log(
+    this.logger.log(
-      `Subscription for user '${this.request.user.id}' has been created with a coupon for ${coupon.duration}`,
+      `Subscription for user '${this.request.user.id}' has been created with a coupon for ${coupon.duration}`
-      'SubscriptionController'
     );
 
     return {
@@ -101,9 +102,8 @@ export class SubscriptionController {
     );
 
     if (userId) {
-      Logger.log(
+      this.logger.log(
-        `Subscription for user '${userId}' has been created via Stripe`,
+        `Subscription for user '${userId}' has been created via Stripe`
-        'SubscriptionController'
       );
     }
 
@@ -126,7 +126,7 @@ export class SubscriptionController {
         user: this.request.user
       });
     } catch (error) {
-      Logger.error(error, 'SubscriptionController');
+      this.logger.error(error);
 
       throw new HttpException(
         getReasonPhrase(StatusCodes.BAD_REQUEST),

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

@@ -24,6 +24,8 @@ import Stripe from 'stripe';
 
 @Injectable()
 export class SubscriptionService {
+  private readonly logger = new Logger(SubscriptionService.name);
+
   private stripe: Stripe;
 
   public constructor(
@@ -166,9 +168,8 @@ export class SubscriptionService {
           error instanceof Prisma.PrismaClientKnownRequestError &&
           error.code === 'P2002'
         ) {
-          Logger.log(
+          this.logger.log(
-            `Stripe Checkout Session '${session.id}' has already been redeemed`,
+            `Stripe Checkout Session '${session.id}' has already been redeemed`
-            'SubscriptionService'
           );
         } else {
           throw error;
@@ -177,7 +178,7 @@ export class SubscriptionService {
 
       return session.client_reference_id;
     } catch (error) {
-      Logger.error(error, 'SubscriptionService');
+      this.logger.error(error);
     }
   }
 

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

@@ -15,6 +15,8 @@ import { format, subDays } from 'date-fns';
 
 @Injectable()
 export class SymbolService {
+  private readonly logger = new Logger(SymbolService.name);
+
   public constructor(
     private readonly dataProviderService: DataProviderService,
     private readonly marketDataService: MarketDataService
@@ -119,7 +121,7 @@ export class SymbolService {
       results.items = items;
       return results;
     } catch (error) {
-      Logger.error(error, 'SymbolService');
+      this.logger.error(error);
 
       throw error;
     }

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

@@ -49,7 +49,7 @@ import { PerformanceCalculationType } from '@ghostfolio/common/types/performance
 
 import { Injectable } from '@nestjs/common';
 import { EventEmitter2 } from '@nestjs/event-emitter';
-import { Prisma, Role, User } from '@prisma/client';
+import { Prisma, Role, Settings, User } from '@prisma/client';
 import { differenceInDays, subDays } from 'date-fns';
 import { without } from 'lodash';
 import { createHmac } from 'node:crypto';
@@ -109,7 +109,14 @@ export class UserService {
   }): Promise<IUser> {
     const { id, permissions, settings, subscription } = user;
 
-    const userData = await Promise.all([
+    const [
+      access,
+      accounts,
+      activitiesCount,
+      firstActivity,
+      impersonationUserSettings,
+      tagsForUser
+    ] = await Promise.all([
       this.prismaService.access.findMany({
         include: {
           user: true
@@ -134,16 +141,17 @@ export class UserService {
         },
         where: { userId: impersonationUserId || user.id }
       }),
+      impersonationUserId
+        ? this.prismaService.settings.findUnique({
+            where: { userId: impersonationUserId }
+          })
+        : Promise.resolve<Settings>(null),
       this.tagService.getTagsForUser(impersonationUserId || user.id)
     ]);
 
-    const access = userData[0];
+    const baseCurrency =
-    const accounts = userData[1];
+      (impersonationUserSettings?.settings as UserSettings)?.baseCurrency ??
-    const activitiesCount = userData[2];
+      (settings.settings as UserSettings)?.baseCurrency;
-    const firstActivity = userData[3];
-    let tags = userData[4].filter((tag) => {
-      return tag.id !== TAG_ID_EXCLUDE_FROM_ANALYSIS;
-    });
 
     let systemMessage: SystemMessage;
 
@@ -156,6 +164,10 @@ export class UserService {
       systemMessage = systemMessageProperty;
     }
 
+    let tags = tagsForUser.filter((tag) => {
+      return tag.id !== TAG_ID_EXCLUDE_FROM_ANALYSIS;
+    });
+
     if (
       this.configurationService.get('ENABLE_FEATURE_SUBSCRIPTION') &&
       subscription.type === SubscriptionType.Basic
@@ -183,6 +195,7 @@ export class UserService {
       dateOfFirstActivity: firstActivity?.date ?? new Date(),
       settings: {
         ...(settings.settings as UserSettings),
+        baseCurrency,
         locale: (settings.settings as UserSettings)?.locale ?? locale
       }
     };

apps/api/src/events/asset-profile-changed.listener.ts

@@ -15,6 +15,8 @@ import { AssetProfileChangedEvent } from './asset-profile-changed.event';
 
 @Injectable()
 export class AssetProfileChangedListener {
+  private readonly logger = new Logger(AssetProfileChangedListener.name);
+
   private static readonly DEBOUNCE_DELAY = ms('5 seconds');
 
   private debounceTimers = new Map<string, NodeJS.Timeout>();
@@ -67,10 +69,7 @@ export class AssetProfileChangedListener {
     dataSource: DataSource;
     symbol: string;
   }) {
-    Logger.log(
+    this.logger.log(`Asset profile of ${symbol} (${dataSource}) has changed`);
-      `Asset profile of ${symbol} (${dataSource}) has changed`,
-      'AssetProfileChangedListener'
-    );
 
     if (
       this.configurationService.get(
@@ -84,10 +83,7 @@ export class AssetProfileChangedListener {
     const existingCurrencies = this.exchangeRateDataService.getCurrencies();
 
     if (!existingCurrencies.includes(currency)) {
-      Logger.log(
+      this.logger.log(`New currency ${currency} has been detected`);
-        `New currency ${currency} has been detected`,
-        'AssetProfileChangedListener'
-      );
 
       await this.exchangeRateDataService.initialize();
     }

apps/api/src/events/portfolio-changed.listener.ts

@@ -8,6 +8,8 @@ import { PortfolioChangedEvent } from './portfolio-changed.event';
 
 @Injectable()
 export class PortfolioChangedListener {
+  private readonly logger = new Logger(PortfolioChangedListener.name);
+
   private static readonly DEBOUNCE_DELAY = ms('5 seconds');
 
   private debounceTimers = new Map<string, NodeJS.Timeout>();
@@ -35,10 +37,7 @@ export class PortfolioChangedListener {
   }
 
   private async processPortfolioChanged({ userId }: { userId: string }) {
-    Logger.log(
+    this.logger.log(`Portfolio of user '${userId}' has changed`);
-      `Portfolio of user '${userId}' has changed`,
-      'PortfolioChangedListener'
-    );
 
     await this.redisCacheService.removePortfolioSnapshotsByUserId({ userId });
   }

apps/api/src/helper/country.helper.ts

@@ -0,0 +1,17 @@
+import { countries } from 'countries-list';
+
+export function getCountryCodeByName({
+  aliases = {},
+  name
+}: {
+  aliases?: Record<string, string>;
+  name: string;
+}): string {
+  for (const [code, country] of Object.entries(countries)) {
+    if (country.name === name || country.name === aliases[name]) {
+      return code;
+    }
+  }
+
+  return undefined;
+}

apps/api/src/helper/sector.helper.ts

@@ -0,0 +1,28 @@
+import { SECTORS } from '@ghostfolio/common/config';
+import { SectorName } from '@ghostfolio/common/types';
+
+import { Logger } from '@nestjs/common';
+
+export function getSectorName({
+  aliases = {},
+  name
+}: {
+  aliases?: Record<string, SectorName>;
+  name: string;
+}): SectorName {
+  if (aliases[name]) {
+    return aliases[name];
+  }
+
+  if ((SECTORS as readonly string[]).includes(name)) {
+    return name as SectorName;
+  }
+
+  if (name) {
+    const logger = new Logger('getSectorName');
+
+    logger.warn(`Could not map the sector "${name}" to the ontology`);
+  }
+
+  return 'Other';
+}

apps/api/src/interceptors/performance-logging/performance-logging.service.ts

@@ -2,6 +2,8 @@ import { Injectable, Logger } from '@nestjs/common';
 
 @Injectable()
 export class PerformanceLoggingService {
+  private readonly logger = new Logger(PerformanceLoggingService.name);
+
   public logPerformance({
     className,
     methodName,
@@ -13,7 +15,7 @@ export class PerformanceLoggingService {
   }) {
     const endTime = performance.now();
 
-    Logger.debug(
+    this.logger.debug(
       `Completed execution of ${methodName}() in ${((endTime - startTime) / 1000).toFixed(3)} seconds`,
       className
     );

apps/api/src/main.ts

@@ -18,11 +18,17 @@ import type { NestExpressApplication } from '@nestjs/platform-express';
 import cookieParser from 'cookie-parser';
 import { NextFunction, Request, Response } from 'express';
 import helmet from 'helmet';
+import { EnvHttpProxyAgent, setGlobalDispatcher } from 'undici';
 
 import { AppModule } from './app/app.module';
 import { environment } from './environments/environment';
 
+const logger = new Logger('Bootstrap');
+
 async function bootstrap() {
+  // Respect HTTP_PROXY / HTTPS_PROXY / NO_PROXY for outbound HTTP requests
+  setGlobalDispatcher(new EnvHttpProxyAgent());
+
   const configApp = await NestFactory.create(AppModule);
   const configService = configApp.get<ConfigService>(ConfigService);
   let customLogLevels: LogLevel[];
@@ -110,20 +116,20 @@ async function bootstrap() {
       address = `${host}:${addressObject.port}`;
     }
 
-    Logger.log(`Listening at http://${address}`);
+    logger.log(`Listening at http://${address}`);
-    Logger.log('');
+    logger.log('');
   });
 }
 
 function logLogo() {
-  Logger.log('   ________               __  ____      ___');
+  logger.log('   ________               __  ____      ___');
-  Logger.log('  / ____/ /_  ____  _____/ /_/ __/___  / (_)___');
+  logger.log('  / ____/ /_  ____  _____/ /_/ __/___  / (_)___');
-  Logger.log(' / / __/ __ \\/ __ \\/ ___/ __/ /_/ __ \\/ / / __ \\');
+  logger.log(' / / __/ __ \\/ __ \\/ ___/ __/ /_/ __ \\/ / / __ \\');
-  Logger.log('/ /_/ / / / / /_/ (__  ) /_/ __/ /_/ / / / /_/ /');
+  logger.log('/ /_/ / / / / /_/ (__  ) /_/ __/ /_/ / / / /_/ /');
-  Logger.log(
+  logger.log(
     `\\____/_/ /_/\\____/____/\\__/_/  \\____/_/_/\\____/ ${environment.version}`
   );
-  Logger.log('');
+  logger.log('');
 }
 
 bootstrap();

apps/api/src/middlewares/html-template.middleware.ts

@@ -92,6 +92,8 @@ const locales = {
 
 @Injectable()
 export class HtmlTemplateMiddleware implements NestMiddleware {
+  private readonly logger = new Logger(HtmlTemplateMiddleware.name);
+
   private indexHtmlMap: { [languageCode: string]: string } = {};
 
   public constructor(private readonly i18nService: I18nService) {
@@ -107,11 +109,7 @@ export class HtmlTemplateMiddleware implements NestMiddleware {
         {}
       );
     } catch (error) {
-      Logger.error(
+      this.logger.error('Failed to initialize index HTML map', error);
-        'Failed to initialize index HTML map',
-        error,
-        'HTMLTemplateMiddleware'
-      );
     }
   }
 

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

@@ -28,6 +28,8 @@ import { BenchmarkValue } from './interfaces/benchmark-value.interface';
 
 @Injectable()
 export class BenchmarkService {
+  private readonly logger = new Logger(BenchmarkService.name);
+
   private readonly CACHE_KEY_BENCHMARKS = 'BENCHMARKS';
 
   public constructor(
@@ -87,7 +89,7 @@ export class BenchmarkService {
         const { benchmarks, expiration }: BenchmarkValue =
           JSON.parse(cachedBenchmarkValue);
 
-        Logger.debug('Fetched benchmarks from cache', 'BenchmarkService');
+        this.logger.debug('Fetched benchmarks from cache');
 
         if (isAfter(new Date(), new Date(expiration))) {
           this.calculateAndCacheBenchmarks({
@@ -227,7 +229,7 @@ export class BenchmarkService {
   private async calculateAndCacheBenchmarks({
     enableSharing = false
   }): Promise<BenchmarkResponse['benchmarks']> {
-    Logger.debug('Calculate benchmarks', 'BenchmarkService');
+    this.logger.debug('Calculate benchmarks');
 
     const benchmarkAssetProfiles = await this.getBenchmarkAssetProfiles({
       enableSharing

apps/api/src/services/data-provider/coingecko/coingecko.service.ts

@@ -7,6 +7,7 @@ import {
   GetQuotesParams,
   GetSearchParams
 } from '@ghostfolio/api/services/data-provider/interfaces/data-provider.interface';
+import { FetchService } from '@ghostfolio/api/services/fetch/fetch.service';
 import { DEFAULT_CURRENCY } from '@ghostfolio/common/config';
 import { DATE_FORMAT } from '@ghostfolio/common/helper';
 import {
@@ -28,11 +29,14 @@ import { format, fromUnixTime, getUnixTime } from 'date-fns';
 
 @Injectable()
 export class CoinGeckoService implements DataProviderInterface, OnModuleInit {
+  private readonly logger = new Logger(CoinGeckoService.name);
+
   private apiUrl: string;
   private headers: HeadersInit = {};
 
   public constructor(
-    private readonly configurationService: ConfigurationService
+    private readonly configurationService: ConfigurationService,
+    private readonly fetchService: FetchService
   ) {}
 
   public onModuleInit() {
@@ -67,12 +71,14 @@ export class CoinGeckoService implements DataProviderInterface, OnModuleInit {
     };
 
     try {
-      const { name } = await fetch(`${this.apiUrl}/coins/${symbol}`, {
+      const { name } = await this.fetchService
-        headers: this.headers,
+        .fetch(`${this.apiUrl}/coins/${symbol}`, {
-        signal: AbortSignal.timeout(
+          headers: this.headers,
-          this.configurationService.get('REQUEST_TIMEOUT')
+          signal: AbortSignal.timeout(
-        )
+            this.configurationService.get('REQUEST_TIMEOUT')
-      }).then((res) => res.json());
+          )
+        })
+        .then((res) => res.json());
 
       response.name = name;
     } catch (error) {
@@ -84,7 +90,7 @@ export class CoinGeckoService implements DataProviderInterface, OnModuleInit {
         ).toFixed(3)} seconds`;
       }
 
-      Logger.error(message, 'CoinGeckoService');
+      this.logger.error(message);
     }
 
     return response;
@@ -118,13 +124,15 @@ export class CoinGeckoService implements DataProviderInterface, OnModuleInit {
         vs_currency: DEFAULT_CURRENCY.toLowerCase()
       });
 
-      const { error, prices, status } = await fetch(
+      const { error, prices, status } = await this.fetchService
-        `${this.apiUrl}/coins/${symbol}/market_chart/range?${queryParams.toString()}`,
+        .fetch(
-        {
+          `${this.apiUrl}/coins/${symbol}/market_chart/range?${queryParams.toString()}`,
-          headers: this.headers,
+          {
-          signal: AbortSignal.timeout(requestTimeout)
+            headers: this.headers,
-        }
+            signal: AbortSignal.timeout(requestTimeout)
-      ).then((res) => res.json());
+          }
+        )
+        .then((res) => res.json());
 
       if (error?.status) {
         throw new Error(error.status.error_message);
@@ -181,13 +189,12 @@ export class CoinGeckoService implements DataProviderInterface, OnModuleInit {
         vs_currencies: DEFAULT_CURRENCY.toLowerCase()
       });
 
-      const quotes = await fetch(
+      const quotes = await this.fetchService
-        `${this.apiUrl}/simple/price?${queryParams.toString()}`,
+        .fetch(`${this.apiUrl}/simple/price?${queryParams.toString()}`, {
-        {
           headers: this.headers,
           signal: AbortSignal.timeout(requestTimeout)
-        }
+        })
-      ).then((res) => res.json());
+        .then((res) => res.json());
 
       for (const symbol in quotes) {
         response[symbol] = {
@@ -209,7 +216,7 @@ export class CoinGeckoService implements DataProviderInterface, OnModuleInit {
         ).toFixed(3)} seconds`;
       }
 
-      Logger.error(message, 'CoinGeckoService');
+      this.logger.error(message);
     }
 
     return response;
@@ -230,13 +237,12 @@ export class CoinGeckoService implements DataProviderInterface, OnModuleInit {
         query
       });
 
-      const { coins } = await fetch(
+      const { coins } = await this.fetchService
-        `${this.apiUrl}/search?${queryParams.toString()}`,
+        .fetch(`${this.apiUrl}/search?${queryParams.toString()}`, {
-        {
           headers: this.headers,
           signal: AbortSignal.timeout(requestTimeout)
-        }
+        })
-      ).then((res) => res.json());
+        .then((res) => res.json());
 
       items = coins.map(({ id: symbol, name }) => {
         return {
@@ -258,7 +264,7 @@ export class CoinGeckoService implements DataProviderInterface, OnModuleInit {
         ).toFixed(3)} seconds`;
       }
 
-      Logger.error(message, 'CoinGeckoService');
+      this.logger.error(message);
     }
 
     return { items };

apps/api/src/services/data-provider/data-enhancer/data-enhancer.module.ts

@@ -3,6 +3,7 @@ import { CryptocurrencyModule } from '@ghostfolio/api/services/cryptocurrency/cr
 import { OpenFigiDataEnhancerService } from '@ghostfolio/api/services/data-provider/data-enhancer/openfigi/openfigi.service';
 import { TrackinsightDataEnhancerService } from '@ghostfolio/api/services/data-provider/data-enhancer/trackinsight/trackinsight.service';
 import { YahooFinanceDataEnhancerService } from '@ghostfolio/api/services/data-provider/data-enhancer/yahoo-finance/yahoo-finance.service';
+import { FetchModule } from '@ghostfolio/api/services/fetch/fetch.module';
 
 import { Module } from '@nestjs/common';
 
@@ -16,7 +17,7 @@ import { DataEnhancerService } from './data-enhancer.service';
     YahooFinanceDataEnhancerService,
     'DataEnhancers'
   ],
-  imports: [ConfigurationModule, CryptocurrencyModule],
+  imports: [ConfigurationModule, CryptocurrencyModule, FetchModule],
   providers: [
     DataEnhancerService,
     OpenFigiDataEnhancerService,

apps/api/src/services/data-provider/data-enhancer/openfigi/openfigi.service.ts

@@ -1,5 +1,6 @@
 import { ConfigurationService } from '@ghostfolio/api/services/configuration/configuration.service';
 import { DataEnhancerInterface } from '@ghostfolio/api/services/data-provider/interfaces/data-enhancer.interface';
+import { FetchService } from '@ghostfolio/api/services/fetch/fetch.service';
 import { parseSymbol } from '@ghostfolio/common/helper';
 
 import { Injectable } from '@nestjs/common';
@@ -10,7 +11,8 @@ export class OpenFigiDataEnhancerService implements DataEnhancerInterface {
   private static baseUrl = 'https://api.openfigi.com';
 
   public constructor(
-    private readonly configurationService: ConfigurationService
+    private readonly configurationService: ConfigurationService,
+    private readonly fetchService: FetchService
   ) {}
 
   public async enhance({
@@ -42,9 +44,8 @@ export class OpenFigiDataEnhancerService implements DataEnhancerInterface {
         this.configurationService.get('API_KEY_OPEN_FIGI');
     }
 
-    const mappings = (await fetch(
+    const mappings = (await this.fetchService
-      `${OpenFigiDataEnhancerService.baseUrl}/v3/mapping`,
+      .fetch(`${OpenFigiDataEnhancerService.baseUrl}/v3/mapping`, {
-      {
         body: JSON.stringify([
           { exchCode: exchange, idType: 'TICKER', idValue: ticker }
         ]),
@@ -54,8 +55,8 @@ export class OpenFigiDataEnhancerService implements DataEnhancerInterface {
         },
         method: 'POST',
         signal: AbortSignal.timeout(requestTimeout)
-      }
+      })
-    ).then((res) => res.json())) as any[];
+      .then((res) => res.json())) as any[];
 
     if (mappings?.length === 1 && mappings[0].data?.length === 1) {
       const { compositeFIGI, figi, shareClassFIGI } = mappings[0].data[0];

apps/api/src/services/data-provider/data-enhancer/trackinsight/trackinsight.service.ts

@@ -1,29 +1,38 @@
+import { getCountryCodeByName } from '@ghostfolio/api/helper/country.helper';
+import { getSectorName } from '@ghostfolio/api/helper/sector.helper';
 import { ConfigurationService } from '@ghostfolio/api/services/configuration/configuration.service';
 import { DataEnhancerInterface } from '@ghostfolio/api/services/data-provider/interfaces/data-enhancer.interface';
+import { FetchService } from '@ghostfolio/api/services/fetch/fetch.service';
 import { Holding } from '@ghostfolio/common/interfaces';
 import { Country } from '@ghostfolio/common/interfaces/country.interface';
 import { Sector } from '@ghostfolio/common/interfaces/sector.interface';
+import { SectorName } from '@ghostfolio/common/types';
 
 import { Injectable, Logger } from '@nestjs/common';
 import { SymbolProfile } from '@prisma/client';
-import { countries } from 'countries-list';
 
 @Injectable()
 export class TrackinsightDataEnhancerService implements DataEnhancerInterface {
   private static baseUrl = 'https://www.trackinsight.com/data-api';
   private static countriesMapping = {
-    'Russian Federation': 'Russia'
+    'Russian Federation': 'Russia',
+    USA: 'United States'
   };
   private static holdingsWeightTreshold = 0.85;
-  private static sectorsMapping = {
+  private static sectorsMapping: Record<string, SectorName> = {
     'Consumer Discretionary': 'Consumer Cyclical',
-    'Consumer Defensive': 'Consumer Staples',
+    'Consumer Staples': 'Consumer Defensive',
+    Financials: 'Financial Services',
     'Health Care': 'Healthcare',
-    'Information Technology': 'Technology'
+    'Information Technology': 'Technology',
+    Materials: 'Basic Materials'
   };
 
+  private readonly logger = new Logger(TrackinsightDataEnhancerService.name);
+
   public constructor(
-    private readonly configurationService: ConfigurationService
+    private readonly configurationService: ConfigurationService,
+    private readonly fetchService: FetchService
   ) {}
 
   public async enhance({
@@ -60,12 +69,13 @@ export class TrackinsightDataEnhancerService implements DataEnhancerInterface {
       return response;
     }
 
-    const profile = await fetch(
+    const profile = await this.fetchService
-      `${TrackinsightDataEnhancerService.baseUrl}/funds/${trackinsightSymbol}.json`,
+      .fetch(
-      {
+        `${TrackinsightDataEnhancerService.baseUrl}/funds/${trackinsightSymbol}.json`,
-        signal: AbortSignal.timeout(requestTimeout)
+        {
-      }
+          signal: AbortSignal.timeout(requestTimeout)
-    )
+        }
+      )
       .then((res) => res.json())
       .catch(() => {
         return {};
@@ -83,12 +93,13 @@ export class TrackinsightDataEnhancerService implements DataEnhancerInterface {
       response.isin = isin;
     }
 
-    const holdings = await fetch(
+    const holdings = await this.fetchService
-      `${TrackinsightDataEnhancerService.baseUrl}/holdings/${trackinsightSymbol}.json`,
+      .fetch(
-      {
+        `${TrackinsightDataEnhancerService.baseUrl}/holdings/${trackinsightSymbol}.json`,
-        signal: AbortSignal.timeout(requestTimeout)
+        {
-      }
+          signal: AbortSignal.timeout(requestTimeout)
-    )
+        }
+      )
       .then((res) => res.json())
       .catch(() => {
         return {};
@@ -110,21 +121,11 @@ export class TrackinsightDataEnhancerService implements DataEnhancerInterface {
       for (const [name, value] of Object.entries<any>(
         holdings?.countries ?? {}
       )) {
-        let countryCode: string;
-
-        for (const [code, country] of Object.entries(countries)) {
-          if (
-            country.name === name ||
-            country.name ===
-              TrackinsightDataEnhancerService.countriesMapping[name]
-          ) {
-            countryCode = code;
-            break;
-          }
-        }
-
         response.countries.push({
-          code: countryCode,
+          code: getCountryCodeByName({
+            name,
+            aliases: TrackinsightDataEnhancerService.countriesMapping
+          }),
           weight: value.weight
         });
       }
@@ -158,7 +159,10 @@ export class TrackinsightDataEnhancerService implements DataEnhancerInterface {
         holdings?.sectors ?? {}
       )) {
         response.sectors.push({
-          name: TrackinsightDataEnhancerService.sectorsMapping[name] ?? name,
+          name: getSectorName({
+            name,
+            aliases: TrackinsightDataEnhancerService.sectorsMapping
+          }),
           weight: value.weight
         });
       }
@@ -182,12 +186,13 @@ export class TrackinsightDataEnhancerService implements DataEnhancerInterface {
     requestTimeout: number;
     symbol: string;
   }) {
-    return fetch(
+    return this.fetchService
-      `https://www.trackinsight.com/search-api/search_v2/${symbol}/_/ticker/default/0/3`,
+      .fetch(
-      {
+        `https://www.trackinsight.com/search-api/search_v2/${symbol}/_/ticker/default/0/3`,
-        signal: AbortSignal.timeout(requestTimeout)
+        {
-      }
+          signal: AbortSignal.timeout(requestTimeout)
-    )
+        }
+      )
       .then((res) => res.json())
       .then((jsonRes) => {
         if (
@@ -203,9 +208,8 @@ export class TrackinsightDataEnhancerService implements DataEnhancerInterface {
         return undefined;
       })
       .catch(({ message }) => {
-        Logger.error(
+        this.logger.error(
-          `Failed to search Trackinsight symbol for ${symbol} (${message})`,
+          `Failed to search Trackinsight symbol for ${symbol} (${message})`
-          'TrackinsightDataEnhancerService'
         );
 
         return undefined;

apps/api/src/services/data-provider/data-enhancer/yahoo-finance/yahoo-finance.service.ts

@@ -1,12 +1,13 @@
+import { getSectorName } from '@ghostfolio/api/helper/sector.helper';
 import { CryptocurrencyService } from '@ghostfolio/api/services/cryptocurrency/cryptocurrency.service';
 import { AssetProfileDelistedError } from '@ghostfolio/api/services/data-provider/errors/asset-profile-delisted.error';
 import { DataEnhancerInterface } from '@ghostfolio/api/services/data-provider/interfaces/data-enhancer.interface';
 import {
   DEFAULT_CURRENCY,
-  REPLACE_NAME_PARTS,
+  REPLACE_NAME_PARTS
-  UNKNOWN_KEY
 } from '@ghostfolio/common/config';
 import { isCurrency } from '@ghostfolio/common/helper';
+import { SectorName } from '@ghostfolio/common/types';
 
 import { Injectable, Logger } from '@nestjs/common';
 import {
@@ -23,6 +24,22 @@ import type { Price } from 'yahoo-finance2/esm/src/modules/quoteSummary-iface';
 
 @Injectable()
 export class YahooFinanceDataEnhancerService implements DataEnhancerInterface {
+  private static sectorsMapping: Record<string, SectorName> = {
+    basic_materials: 'Basic Materials',
+    communication_services: 'Communication Services',
+    consumer_cyclical: 'Consumer Cyclical',
+    consumer_defensive: 'Consumer Defensive',
+    energy: 'Energy',
+    financial_services: 'Financial Services',
+    healthcare: 'Healthcare',
+    industrials: 'Industrials',
+    realestate: 'Real Estate',
+    technology: 'Technology',
+    utilities: 'Utilities'
+  };
+
+  private readonly logger = new Logger(YahooFinanceDataEnhancerService.name);
+
   private readonly yahooFinance = new YahooFinance({
     suppressNotices: ['yahooSurvey']
   });
@@ -123,7 +140,7 @@ export class YahooFinanceDataEnhancerService implements DataEnhancerInterface {
         response.url = url;
       }
     } catch (error) {
-      Logger.error(error, 'YahooFinanceDataEnhancerService');
+      this.logger.error(error);
     }
 
     return response;
@@ -222,7 +239,10 @@ export class YahooFinanceDataEnhancerService implements DataEnhancerInterface {
           .flatMap((sectorWeighting) => {
             return Object.entries(sectorWeighting).map(([sector, weight]) => {
               return {
-                name: this.parseSector(sector),
+                name: getSectorName({
+                  aliases: YahooFinanceDataEnhancerService.sectorsMapping,
+                  name: sector
+                }),
                 weight: weight as number
               };
             });
@@ -266,7 +286,7 @@ export class YahooFinanceDataEnhancerService implements DataEnhancerInterface {
           `No data found, ${aSymbol} (${this.getName()}) may be delisted`
         );
       } else {
-        Logger.error(error, 'YahooFinanceService');
+        this.logger.error(error);
       }
     }
 
@@ -329,46 +349,4 @@ export class YahooFinanceDataEnhancerService implements DataEnhancerInterface {
 
     return { assetClass, assetSubClass };
   }
-
-  private parseSector(aString: string) {
-    let sector = UNKNOWN_KEY;
-
-    switch (aString) {
-      case 'basic_materials':
-        sector = 'Basic Materials';
-        break;
-      case 'communication_services':
-        sector = 'Communication Services';
-        break;
-      case 'consumer_cyclical':
-        sector = 'Consumer Cyclical';
-        break;
-      case 'consumer_defensive':
-        sector = 'Consumer Staples';
-        break;
-      case 'energy':
-        sector = 'Energy';
-        break;
-      case 'financial_services':
-        sector = 'Financial Services';
-        break;
-      case 'healthcare':
-        sector = 'Healthcare';
-        break;
-      case 'industrials':
-        sector = 'Industrials';
-        break;
-      case 'realestate':
-        sector = 'Real Estate';
-        break;
-      case 'technology':
-        sector = 'Technology';
-        break;
-      case 'utilities':
-        sector = 'Utilities';
-        break;
-    }
-
-    return sector;
-  }
 }

apps/api/src/services/data-provider/data-provider.module.ts

@@ -10,6 +10,7 @@ import { GoogleSheetsService } from '@ghostfolio/api/services/data-provider/goog
 import { ManualService } from '@ghostfolio/api/services/data-provider/manual/manual.service';
 import { RapidApiService } from '@ghostfolio/api/services/data-provider/rapid-api/rapid-api.service';
 import { YahooFinanceService } from '@ghostfolio/api/services/data-provider/yahoo-finance/yahoo-finance.service';
+import { FetchModule } from '@ghostfolio/api/services/fetch/fetch.module';
 import { MarketDataModule } from '@ghostfolio/api/services/market-data/market-data.module';
 import { PrismaModule } from '@ghostfolio/api/services/prisma/prisma.module';
 import { PropertyModule } from '@ghostfolio/api/services/property/property.module';
@@ -26,6 +27,7 @@ import { DataProviderService } from './data-provider.service';
     ConfigurationModule,
     CryptocurrencyModule,
     DataEnhancerModule,
+    FetchModule,
     MarketDataModule,
     PrismaModule,
     PropertyModule,

apps/api/src/services/data-provider/data-provider.service.ts

@@ -41,6 +41,8 @@ import { AssetProfileInvalidError } from './errors/asset-profile-invalid.error';
 
 @Injectable()
 export class DataProviderService implements OnModuleInit {
+  private readonly logger = new Logger(DataProviderService.name);
+
   private dataProviderMapping: { [dataProviderName: string]: string };
 
   public constructor(
@@ -129,7 +131,7 @@ export class DataProviderService implements OnModuleInit {
         );
       }
     } catch (error) {
-      Logger.error(error, 'DataProviderService');
+      this.logger.error(error);
 
       throw error;
     }
@@ -391,7 +393,7 @@ export class DataProviderService implements OnModuleInit {
         return r;
       }, {});
     } catch (error) {
-      Logger.error(error, 'DataProviderService');
+      this.logger.error(error);
     } finally {
       return response;
     }
@@ -503,7 +505,7 @@ export class DataProviderService implements OnModuleInit {
         result[symbol] = data;
       }
     } catch (error) {
-      Logger.error(error, 'DataProviderService');
+      this.logger.error(error);
 
       throw error;
     }
@@ -567,13 +569,12 @@ export class DataProviderService implements OnModuleInit {
     const numberOfItemsInCache = Object.keys(response)?.length;
 
     if (numberOfItemsInCache) {
-      Logger.debug(
+      this.logger.debug(
         `Fetched ${numberOfItemsInCache} quote${
           numberOfItemsInCache > 1 ? 's' : ''
         } from cache in ${((performance.now() - startTimeTotal) / 1000).toFixed(
           3
-        )} seconds`,
+        )} seconds`
-        'DataProviderService'
       );
     }
 
@@ -684,14 +685,13 @@ export class DataProviderService implements OnModuleInit {
               }
             }
 
-            Logger.debug(
+            this.logger.debug(
               `Fetched ${symbolsChunk.length} quote${
                 symbolsChunk.length > 1 ? 's' : ''
               } from ${dataSource} in ${(
                 (performance.now() - startTimeDataSource) /
                 1000
-              ).toFixed(3)} seconds`,
+              ).toFixed(3)} seconds`
-              'DataProviderService'
             );
 
             try {
@@ -722,15 +722,18 @@ export class DataProviderService implements OnModuleInit {
 
     await Promise.all(promises);
 
-    Logger.debug('--------------------------------------------------------');
+    this.logger.debug(
-    Logger.debug(
+      '--------------------------------------------------------'
+    );
+    this.logger.debug(
       `Fetched ${items.length} quote${items.length > 1 ? 's' : ''} in ${(
         (performance.now() - startTimeTotal) /
         1000
-      ).toFixed(3)} seconds`,
+      ).toFixed(3)} seconds`
-      'DataProviderService'
+    );
+    this.logger.debug(
+      '========================================================'
     );
-    Logger.debug('========================================================');
 
     return response;
   }

apps/api/src/services/data-provider/eod-historical-data/eod-historical-data.service.ts

@@ -7,6 +7,7 @@ import {
   GetQuotesParams,
   GetSearchParams
 } from '@ghostfolio/api/services/data-provider/interfaces/data-provider.interface';
+import { FetchService } from '@ghostfolio/api/services/fetch/fetch.service';
 import { SymbolProfileService } from '@ghostfolio/api/services/symbol-profile/symbol-profile.service';
 import {
   DEFAULT_CURRENCY,
@@ -36,11 +37,14 @@ import { isNumber } from 'lodash';
 export class EodHistoricalDataService
   implements DataProviderInterface, OnModuleInit
 {
+  private readonly logger = new Logger(EodHistoricalDataService.name);
+
   private apiKey: string;
   private readonly URL = 'https://eodhistoricaldata.com/api';
 
   public constructor(
     private readonly configurationService: ConfigurationService,
+    private readonly fetchService: FetchService,
     private readonly symbolProfileService: SymbolProfileService
   ) {}
 
@@ -111,12 +115,11 @@ export class EodHistoricalDataService
         [date: string]: DataProviderHistoricalResponse;
       } = {};
 
-      const historicalResult = await fetch(
+      const historicalResult = await this.fetchService
-        `${this.URL}/div/${symbol}?${queryParams.toString()}`,
+        .fetch(`${this.URL}/div/${symbol}?${queryParams.toString()}`, {
-        {
           signal: AbortSignal.timeout(requestTimeout)
-        }
+        })
-      ).then((res) => res.json());
+        .then((res) => res.json());
 
       for (const { date, value } of historicalResult) {
         response[date] = {
@@ -126,12 +129,11 @@ export class EodHistoricalDataService
 
       return response;
     } catch (error) {
-      Logger.error(
+      this.logger.error(
         `Could not get dividends for ${symbol} (${this.getName()}) from ${format(
           from,
           DATE_FORMAT
-        )} to ${format(to, DATE_FORMAT)}: [${error.name}] ${error.message}`,
+        )} to ${format(to, DATE_FORMAT)}: [${error.name}] ${error.message}`
-        'EodHistoricalDataService'
       );
 
       return {};
@@ -158,12 +160,11 @@ export class EodHistoricalDataService
         to: format(to, DATE_FORMAT)
       });
 
-      const response = await fetch(
+      const response = await this.fetchService
-        `${this.URL}/eod/${symbol}?${queryParams.toString()}`,
+        .fetch(`${this.URL}/eod/${symbol}?${queryParams.toString()}`, {
-        {
           signal: AbortSignal.timeout(requestTimeout)
-        }
+        })
-      ).then((res) => res.json());
+        .then((res) => res.json());
 
       return response.reduce(
         (result, { adjusted_close, date }) => {
@@ -172,9 +173,8 @@ export class EodHistoricalDataService
               marketPrice: adjusted_close
             };
           } else {
-            Logger.error(
+            this.logger.error(
-              `Could not get historical market data for ${symbol} (${this.getName()}) at ${date}`,
+              `Could not get historical market data for ${symbol} (${this.getName()}) at ${date}`
-              'EodHistoricalDataService'
             );
           }
 
@@ -223,12 +223,14 @@ export class EodHistoricalDataService
         s: eodHistoricalDataSymbols.join(',')
       });
 
-      const realTimeResponse = await fetch(
+      const realTimeResponse = await this.fetchService
-        `${this.URL}/real-time/${eodHistoricalDataSymbols[0]}?${queryParams.toString()}`,
+        .fetch(
-        {
+          `${this.URL}/real-time/${eodHistoricalDataSymbols[0]}?${queryParams.toString()}`,
-          signal: AbortSignal.timeout(requestTimeout)
+          {
-        }
+            signal: AbortSignal.timeout(requestTimeout)
-      ).then((res) => res.json());
+          }
+        )
+        .then((res) => res.json());
 
       const quotes: {
         close: number;
@@ -290,9 +292,8 @@ export class EodHistoricalDataService
             dataSource: this.getName()
           };
         } else {
-          Logger.error(
+          this.logger.error(
-            `Could not get quote for ${this.convertFromEodSymbol(code)} (${this.getName()})`,
+            `Could not get quote for ${this.convertFromEodSymbol(code)} (${this.getName()})`
-            'EodHistoricalDataService'
           );
         }
       }
@@ -309,7 +310,7 @@ export class EodHistoricalDataService
         ).toFixed(3)} seconds`;
       }
 
-      Logger.error(message, 'EodHistoricalDataService');
+      this.logger.error(message);
     }
 
     return {};
@@ -430,12 +431,11 @@ export class EodHistoricalDataService
         api_token: this.apiKey
       });
 
-      const response = await fetch(
+      const response = await this.fetchService
-        `${this.URL}/search/${query}?${queryParams.toString()}`,
+        .fetch(`${this.URL}/search/${query}?${queryParams.toString()}`, {
-        {
           signal: AbortSignal.timeout(requestTimeout)
-        }
+        })
-      ).then((res) => res.json());
+        .then((res) => res.json());
 
       searchResult = response.map(
         ({ Code, Currency, Exchange, ISIN: isin, Name: name, Type }) => {
@@ -464,7 +464,7 @@ export class EodHistoricalDataService
         ).toFixed(3)} seconds`;
       }
 
-      Logger.error(message, 'EodHistoricalDataService');
+      this.logger.error(message);
     }
 
     return searchResult;

apps/api/src/services/data-provider/financial-modeling-prep/financial-modeling-prep.service.ts

@@ -1,3 +1,4 @@
+import { getCountryCodeByName } from '@ghostfolio/api/helper/country.helper';
 import { ConfigurationService } from '@ghostfolio/api/services/configuration/configuration.service';
 import { CryptocurrencyService } from '@ghostfolio/api/services/cryptocurrency/cryptocurrency.service';
 import { AssetProfileDelistedError } from '@ghostfolio/api/services/data-provider/errors/asset-profile-delisted.error';
@@ -9,6 +10,7 @@ import {
   GetQuotesParams,
   GetSearchParams
 } from '@ghostfolio/api/services/data-provider/interfaces/data-provider.interface';
+import { FetchService } from '@ghostfolio/api/services/fetch/fetch.service';
 import { PrismaService } from '@ghostfolio/api/services/prisma/prisma.service';
 import {
   DEFAULT_CURRENCY,
@@ -32,7 +34,6 @@ import {
   SymbolProfile
 } from '@prisma/client';
 import { isISIN } from 'class-validator';
-import { countries } from 'countries-list';
 import {
   addDays,
   addYears,
@@ -54,11 +55,14 @@ export class FinancialModelingPrepService
     'Taiwan (Province of China)': 'Taiwan'
   };
 
+  private readonly logger = new Logger(FinancialModelingPrepService.name);
+
   private apiKey: string;
 
   public constructor(
     private readonly configurationService: ConfigurationService,
     private readonly cryptocurrencyService: CryptocurrencyService,
+    private readonly fetchService: FetchService,
     private readonly prismaService: PrismaService
   ) {}
 
@@ -96,12 +100,14 @@ export class FinancialModelingPrepService
           apikey: this.apiKey
         });
 
-        const [quote] = await fetch(
+        const [quote] = await this.fetchService
-          `${this.getUrl({ version: 'stable' })}/quote?${queryParams.toString()}`,
+          .fetch(
-          {
+            `${this.getUrl({ version: 'stable' })}/quote?${queryParams.toString()}`,
-            signal: AbortSignal.timeout(requestTimeout)
+            {
-          }
+              signal: AbortSignal.timeout(requestTimeout)
-        ).then((res) => res.json());
+            }
+          )
+          .then((res) => res.json());
 
         response.assetClass = AssetClass.LIQUIDITY;
         response.assetSubClass = AssetSubClass.CRYPTOCURRENCY;
@@ -115,12 +121,14 @@ export class FinancialModelingPrepService
           apikey: this.apiKey
         });
 
-        const [assetProfile] = await fetch(
+        const [assetProfile] = await this.fetchService
-          `${this.getUrl({ version: 'stable' })}/profile?${queryParams.toString()}`,
+          .fetch(
-          {
+            `${this.getUrl({ version: 'stable' })}/profile?${queryParams.toString()}`,
-            signal: AbortSignal.timeout(requestTimeout)
+            {
-          }
+              signal: AbortSignal.timeout(requestTimeout)
-        ).then((res) => res.json());
+            }
+          )
+          .then((res) => res.json());
 
         if (!assetProfile) {
           throw new AssetProfileDelistedError(
@@ -143,43 +151,37 @@ export class FinancialModelingPrepService
             apikey: this.apiKey
           });
 
-          const etfCountryWeightings = await fetch(
+          const etfCountryWeightings = await this.fetchService
-            `${this.getUrl({ version: 'stable' })}/etf/country-weightings?${queryParams.toString()}`,
+            .fetch(
-            {
+              `${this.getUrl({ version: 'stable' })}/etf/country-weightings?${queryParams.toString()}`,
-              signal: AbortSignal.timeout(requestTimeout)
+              {
-            }
+                signal: AbortSignal.timeout(requestTimeout)
-          ).then((res) => res.json());
+              }
+            )
+            .then((res) => res.json());
 
           response.countries = etfCountryWeightings
             .filter(({ country: countryName }) => {
               return countryName.toLowerCase() !== 'other';
             })
             .map(({ country: countryName, weightPercentage }) => {
-              let countryCode: string;
-
-              for (const [code, country] of Object.entries(countries)) {
-                if (
-                  country.name === countryName ||
-                  country.name ===
-                    FinancialModelingPrepService.countriesMapping[countryName]
-                ) {
-                  countryCode = code;
-                  break;
-                }
-              }
-
               return {
-                code: countryCode,
+                code: getCountryCodeByName({
+                  aliases: FinancialModelingPrepService.countriesMapping,
+                  name: countryName
+                }),
                 weight: parseFloat(weightPercentage.slice(0, -1)) / 100
               };
             });
 
-          const etfHoldings = await fetch(
+          const etfHoldings = await this.fetchService
-            `${this.getUrl({ version: 'stable' })}/etf/holdings?${queryParams.toString()}`,
+            .fetch(
-            {
+              `${this.getUrl({ version: 'stable' })}/etf/holdings?${queryParams.toString()}`,
-              signal: AbortSignal.timeout(requestTimeout)
+              {
-            }
+                signal: AbortSignal.timeout(requestTimeout)
-          ).then((res) => res.json());
+              }
+            )
+            .then((res) => res.json());
 
           const sortedTopHoldings = etfHoldings
             .sort((a, b) => {
@@ -193,23 +195,27 @@ export class FinancialModelingPrepService
             }
           );
 
-          const [etfInformation] = await fetch(
+          const [etfInformation] = await this.fetchService
-            `${this.getUrl({ version: 'stable' })}/etf/info?${queryParams.toString()}`,
+            .fetch(
-            {
+              `${this.getUrl({ version: 'stable' })}/etf/info?${queryParams.toString()}`,
-              signal: AbortSignal.timeout(requestTimeout)
+              {
-            }
+                signal: AbortSignal.timeout(requestTimeout)
-          ).then((res) => res.json());
+              }
+            )
+            .then((res) => res.json());
 
           if (etfInformation?.website) {
             response.url = etfInformation.website;
           }
 
-          const etfSectorWeightings = await fetch(
+          const etfSectorWeightings = await this.fetchService
-            `${this.getUrl({ version: 'stable' })}/etf/sector-weightings?${queryParams.toString()}`,
+            .fetch(
-            {
+              `${this.getUrl({ version: 'stable' })}/etf/sector-weightings?${queryParams.toString()}`,
-              signal: AbortSignal.timeout(requestTimeout)
+              {
-            }
+                signal: AbortSignal.timeout(requestTimeout)
-          ).then((res) => res.json());
+              }
+            )
+            .then((res) => res.json());
 
           response.sectors = etfSectorWeightings.map(
             ({ sector, weightPercentage }) => {
@@ -251,7 +257,7 @@ export class FinancialModelingPrepService
         ).toFixed(3)} seconds`;
       }
 
-      Logger.error(message, 'FinancialModelingPrepService');
+      this.logger.error(message);
     }
 
     return response;
@@ -286,12 +292,14 @@ export class FinancialModelingPrepService
         [date: string]: DataProviderHistoricalResponse;
       } = {};
 
-      const dividends = await fetch(
+      const dividends = await this.fetchService
-        `${this.getUrl({ version: 'stable' })}/dividends?${queryParams.toString()}`,
+        .fetch(
-        {
+          `${this.getUrl({ version: 'stable' })}/dividends?${queryParams.toString()}`,
-          signal: AbortSignal.timeout(requestTimeout)
+          {
-        }
+            signal: AbortSignal.timeout(requestTimeout)
-      ).then((res) => res.json());
+          }
+        )
+        .then((res) => res.json());
 
       dividends
         .filter(({ date }) => {
@@ -309,12 +317,11 @@ export class FinancialModelingPrepService
 
       return response;
     } catch (error) {
-      Logger.error(
+      this.logger.error(
         `Could not get dividends for ${symbol} (${this.getName()}) from ${format(
           from,
           DATE_FORMAT
-        )} to ${format(to, DATE_FORMAT)}: [${error.name}] ${error.message}`,
+        )} to ${format(to, DATE_FORMAT)}: [${error.name}] ${error.message}`
-        'FinancialModelingPrepService'
       );
 
       return {};
@@ -354,12 +361,14 @@ export class FinancialModelingPrepService
           to: format(currentTo, DATE_FORMAT)
         });
 
-        const historical = await fetch(
+        const historical = await this.fetchService
-          `${this.getUrl({ version: 'stable' })}/historical-price-eod/full?${queryParams.toString()}`,
+          .fetch(
-          {
+            `${this.getUrl({ version: 'stable' })}/historical-price-eod/full?${queryParams.toString()}`,
-            signal: AbortSignal.timeout(requestTimeout)
+            {
-          }
+              signal: AbortSignal.timeout(requestTimeout)
-        ).then((res) => res.json());
+            }
+          )
+          .then((res) => res.json());
 
         for (const { close, date } of historical) {
           if (
@@ -422,14 +431,17 @@ export class FinancialModelingPrepService
             symbolTarget: { in: symbols }
           }
         }),
-        fetch(
+        this.fetchService
-          `${this.getUrl({ version: 'stable' })}/batch-quote-short?${queryParams.toString()}`,
+          .fetch(
-          {
+            `${this.getUrl({ version: 'stable' })}/batch-quote-short?${queryParams.toString()}`,
-            signal: AbortSignal.timeout(requestTimeout)
+            {
-          }
+              signal: AbortSignal.timeout(requestTimeout)
-        ).then(
+            }
-          (res) => res.json() as unknown as { price: number; symbol: string }[]
+          )
-        )
+          .then(
+            (res) =>
+              res.json() as unknown as { price: number; symbol: string }[]
+          )
       ]);
 
       for (const { currency, symbolTarget } of assetProfileResolutions) {
@@ -497,7 +509,7 @@ export class FinancialModelingPrepService
         ).toFixed(3)} seconds`;
       }
 
-      Logger.error(message, 'FinancialModelingPrepService');
+      this.logger.error(message);
     }
 
     return response;
@@ -525,12 +537,14 @@ export class FinancialModelingPrepService
           isin: query.toUpperCase()
         });
 
-        const result = await fetch(
+        const result = await this.fetchService
-          `${this.getUrl({ version: 'stable' })}/search-isin?${queryParams.toString()}`,
+          .fetch(
-          {
+            `${this.getUrl({ version: 'stable' })}/search-isin?${queryParams.toString()}`,
-            signal: AbortSignal.timeout(requestTimeout)
+            {
-          }
+              signal: AbortSignal.timeout(requestTimeout)
-        ).then((res) => res.json());
+            }
+          )
+          .then((res) => res.json());
 
         await Promise.all(
           result.map(({ symbol }) => {
@@ -558,18 +572,22 @@ export class FinancialModelingPrepService
         });
 
         const [nameResults, symbolResults] = await Promise.all([
-          fetch(
+          this.fetchService
-            `${this.getUrl({ version: 'stable' })}/search-name?${queryParams.toString()}`,
+            .fetch(
-            {
+              `${this.getUrl({ version: 'stable' })}/search-name?${queryParams.toString()}`,
-              signal: AbortSignal.timeout(requestTimeout)
+              {
-            }
+                signal: AbortSignal.timeout(requestTimeout)
-          ).then((res) => res.json()),
+              }
-          fetch(
+            )
-            `${this.getUrl({ version: 'stable' })}/search-symbol?${queryParams.toString()}`,
+            .then((res) => res.json()),
-            {
+          this.fetchService
-              signal: AbortSignal.timeout(requestTimeout)
+            .fetch(
-            }
+              `${this.getUrl({ version: 'stable' })}/search-symbol?${queryParams.toString()}`,
-          ).then((res) => res.json())
+              {
+                signal: AbortSignal.timeout(requestTimeout)
+              }
+            )
+            .then((res) => res.json())
         ]);
 
         const result = uniqBy(
@@ -611,7 +629,7 @@ export class FinancialModelingPrepService
         ).toFixed(3)} seconds`;
       }
 
-      Logger.error(message, 'FinancialModelingPrepService');
+      this.logger.error(message);
     }
 
     return { items };

apps/api/src/services/data-provider/ghostfolio/ghostfolio.service.ts

@@ -8,6 +8,7 @@ import {
   GetQuotesParams,
   GetSearchParams
 } from '@ghostfolio/api/services/data-provider/interfaces/data-provider.interface';
+import { FetchService } from '@ghostfolio/api/services/fetch/fetch.service';
 import { PropertyService } from '@ghostfolio/api/services/property/property.service';
 import {
   HEADER_KEY_TOKEN,
@@ -32,12 +33,15 @@ import { StatusCodes } from 'http-status-codes';
 
 @Injectable()
 export class GhostfolioService implements DataProviderInterface {
+  private readonly logger = new Logger(GhostfolioService.name);
+
   private readonly URL = environment.production
     ? 'https://ghostfol.io/api'
     : `${this.configurationService.get('ROOT_URL')}/api`;
 
   public constructor(
     private readonly configurationService: ConfigurationService,
+    private readonly fetchService: FetchService,
     private readonly propertyService: PropertyService
   ) {}
 
@@ -52,7 +56,7 @@ export class GhostfolioService implements DataProviderInterface {
     let assetProfile: DataProviderGhostfolioAssetProfileResponse;
 
     try {
-      const response = await fetch(
+      const response = await this.fetchService.fetch(
         `${this.URL}/v1/data-providers/ghostfolio/asset-profile/${symbol}`,
         {
           headers: await this.getRequestHeaders(),
@@ -87,7 +91,7 @@ export class GhostfolioService implements DataProviderInterface {
           'RequestError: The API key is invalid. Please update it in the Settings section of the Admin Control panel.';
       }
 
-      Logger.error(message, 'GhostfolioService');
+      this.logger.error(message);
     }
 
     return assetProfile;
@@ -122,7 +126,7 @@ export class GhostfolioService implements DataProviderInterface {
         to: format(to, DATE_FORMAT)
       });
 
-      const response = await fetch(
+      const response = await this.fetchService.fetch(
         `${this.URL}/v2/data-providers/ghostfolio/dividends/${symbol}?${queryParams.toString()}`,
         {
           headers: await this.getRequestHeaders(),
@@ -152,7 +156,7 @@ export class GhostfolioService implements DataProviderInterface {
           'RequestError: The API key is invalid. Please update it in the Settings section of the Admin Control panel.';
       }
 
-      Logger.error(message, 'GhostfolioService');
+      this.logger.error(message);
     }
 
     return dividends;
@@ -174,7 +178,7 @@ export class GhostfolioService implements DataProviderInterface {
         to: format(to, DATE_FORMAT)
       });
 
-      const response = await fetch(
+      const response = await this.fetchService.fetch(
         `${this.URL}/v2/data-providers/ghostfolio/historical/${symbol}?${queryParams.toString()}`,
         {
           headers: await this.getRequestHeaders(),
@@ -209,7 +213,7 @@ export class GhostfolioService implements DataProviderInterface {
           'RequestError: The API key is invalid. Please update it in the Settings section of the Admin Control panel.';
       }
 
-      Logger.error(error.message, 'GhostfolioService');
+      this.logger.error(error.message);
 
       throw new Error(
         `Could not get historical market data for ${symbol} (${this.getName()}) from ${format(
@@ -245,7 +249,7 @@ export class GhostfolioService implements DataProviderInterface {
         symbols: symbols.join(',')
       });
 
-      const response = await fetch(
+      const response = await this.fetchService.fetch(
         `${this.URL}/v2/data-providers/ghostfolio/quotes?${queryParams.toString()}`,
         {
           headers: await this.getRequestHeaders(),
@@ -281,7 +285,7 @@ export class GhostfolioService implements DataProviderInterface {
           'RequestError: The API key is invalid. Please update it in the Settings section of the Admin Control panel.';
       }
 
-      Logger.error(message, 'GhostfolioService');
+      this.logger.error(message);
     }
 
     return quotes;
@@ -302,7 +306,7 @@ export class GhostfolioService implements DataProviderInterface {
         query
       });
 
-      const response = await fetch(
+      const response = await this.fetchService.fetch(
         `${this.URL}/v2/data-providers/ghostfolio/lookup?${queryParams.toString()}`,
         {
           headers: await this.getRequestHeaders(),
@@ -336,7 +340,7 @@ export class GhostfolioService implements DataProviderInterface {
           'RequestError: The API key is invalid. Please update it in the Settings section of the Admin Control panel.';
       }
 
-      Logger.error(message, 'GhostfolioService');
+      this.logger.error(message);
     }
 
     return searchResult;

apps/api/src/services/data-provider/google-sheets/google-sheets.service.ts

@@ -24,6 +24,8 @@ import { GoogleSpreadsheet } from 'google-spreadsheet';
 
 @Injectable()
 export class GoogleSheetsService implements DataProviderInterface {
+  private readonly logger = new Logger(GoogleSheetsService.name);
+
   public constructor(
     private readonly configurationService: ConfigurationService,
     private readonly prismaService: PrismaService,
@@ -144,7 +146,7 @@ export class GoogleSheetsService implements DataProviderInterface {
 
       return response;
     } catch (error) {
-      Logger.error(error, 'GoogleSheetsService');
+      this.logger.error(error);
     }
 
     return {};

apps/api/src/services/data-provider/manual/manual.service.ts

@@ -8,6 +8,7 @@ import {
   GetQuotesParams,
   GetSearchParams
 } from '@ghostfolio/api/services/data-provider/interfaces/data-provider.interface';
+import { FetchService } from '@ghostfolio/api/services/fetch/fetch.service';
 import { PrismaService } from '@ghostfolio/api/services/prisma/prisma.service';
 import { SymbolProfileService } from '@ghostfolio/api/services/symbol-profile/symbol-profile.service';
 import {
@@ -30,8 +31,11 @@ import { addDays, format, isBefore } from 'date-fns';
 
 @Injectable()
 export class ManualService implements DataProviderInterface {
+  private readonly logger = new Logger(ManualService.name);
+
   public constructor(
     private readonly configurationService: ConfigurationService,
+    private readonly fetchService: FetchService,
     private readonly prismaService: PrismaService,
     private readonly symbolProfileService: SymbolProfileService
   ) {}
@@ -179,9 +183,8 @@ export class ManualService implements DataProviderInterface {
               });
               return { marketPrice, symbol };
             } catch (error) {
-              Logger.error(
+              this.logger.error(
-                `Could not get quote for ${symbol} (${this.getName()}): [${error.name}] ${error.message}`,
+                `Could not get quote for ${symbol} (${this.getName()}): [${error.name}] ${error.message}`
-                'ManualService'
               );
               return { symbol, marketPrice: undefined };
             }
@@ -214,7 +217,7 @@ export class ManualService implements DataProviderInterface {
 
       return response;
     } catch (error) {
-      Logger.error(error, 'ManualService');
+      this.logger.error(error);
     }
 
     return {};
@@ -292,7 +295,7 @@ export class ManualService implements DataProviderInterface {
   }): Promise<number> {
     let locale = scraperConfiguration.locale;
 
-    const response = await fetch(scraperConfiguration.url, {
+    const response = await this.fetchService.fetch(scraperConfiguration.url, {
       headers: scraperConfiguration.headers as HeadersInit,
       signal: AbortSignal.timeout(
         this.configurationService.get('REQUEST_TIMEOUT')

apps/api/src/services/data-provider/rapid-api/rapid-api.service.ts

@@ -7,6 +7,7 @@ import {
   GetQuotesParams,
   GetSearchParams
 } from '@ghostfolio/api/services/data-provider/interfaces/data-provider.interface';
+import { FetchService } from '@ghostfolio/api/services/fetch/fetch.service';
 import {
   ghostfolioFearAndGreedIndexSymbol,
   ghostfolioFearAndGreedIndexSymbolStocks
@@ -25,8 +26,11 @@ import { format } from 'date-fns';
 
 @Injectable()
 export class RapidApiService implements DataProviderInterface {
+  private readonly logger = new Logger(RapidApiService.name);
+
   public constructor(
-    private readonly configurationService: ConfigurationService
+    private readonly configurationService: ConfigurationService,
+    private readonly fetchService: FetchService
   ) {}
 
   public canHandle() {
@@ -120,7 +124,7 @@ export class RapidApiService implements DataProviderInterface {
         };
       }
     } catch (error) {
-      Logger.error(error, 'RapidApiService');
+      this.logger.error(error);
     }
 
     return {};
@@ -142,9 +146,8 @@ export class RapidApiService implements DataProviderInterface {
     oneYearAgo: { value: number; valueText: string };
   }> {
     try {
-      const { fgi } = await fetch(
+      const { fgi } = await this.fetchService
-        `https://fear-and-greed-index.p.rapidapi.com/v1/fgi`,
+        .fetch(`https://fear-and-greed-index.p.rapidapi.com/v1/fgi`, {
-        {
           headers: {
             useQueryString: 'true',
             'x-rapidapi-host': 'fear-and-greed-index.p.rapidapi.com',
@@ -153,8 +156,8 @@ export class RapidApiService implements DataProviderInterface {
           signal: AbortSignal.timeout(
             this.configurationService.get('REQUEST_TIMEOUT')
           )
-        }
+        })
-      ).then((res) => res.json());
+        .then((res) => res.json());
 
       return fgi;
     } catch (error) {
@@ -166,7 +169,7 @@ export class RapidApiService implements DataProviderInterface {
         ).toFixed(3)} seconds`;
       }
 
-      Logger.error(message, 'RapidApiService');
+      this.logger.error(message);
 
       return undefined;
     }

apps/api/src/services/data-provider/yahoo-finance/yahoo-finance.service.ts

@@ -41,6 +41,8 @@ import { SearchQuoteNonYahoo } from 'yahoo-finance2/esm/src/modules/search';
 
 @Injectable()
 export class YahooFinanceService implements DataProviderInterface {
+  private readonly logger = new Logger(YahooFinanceService.name);
+
   private readonly yahooFinance = new YahooFinance({
     suppressNotices: ['yahooSurvey']
   });
@@ -105,12 +107,11 @@ export class YahooFinanceService implements DataProviderInterface {
 
       return response;
     } catch (error) {
-      Logger.error(
+      this.logger.error(
         `Could not get dividends for ${symbol} (${this.getName()}) from ${format(
           from,
           DATE_FORMAT
-        )} to ${format(to, DATE_FORMAT)}: [${error.name}] ${error.message}`,
+        )} to ${format(to, DATE_FORMAT)}: [${error.name}] ${error.message}`
-        'YahooFinanceService'
       );
 
       return {};
@@ -198,12 +199,9 @@ export class YahooFinanceService implements DataProviderInterface {
       try {
         quotes = await this.yahooFinance.quote(yahooFinanceSymbols);
       } catch (error) {
-        Logger.error(error, 'YahooFinanceService');
+        this.logger.error(error);
 
-        Logger.warn(
+        this.logger.warn('Fallback to yahooFinance.quoteSummary()');
-          'Fallback to yahooFinance.quoteSummary()',
-          'YahooFinanceService'
-        );
 
         quotes = await this.getQuotesWithQuoteSummary(yahooFinanceSymbols);
       }
@@ -229,7 +227,7 @@ export class YahooFinanceService implements DataProviderInterface {
 
       return response;
     } catch (error) {
-      Logger.error(error, 'YahooFinanceService');
+      this.logger.error(error);
 
       return {};
     }
@@ -334,7 +332,7 @@ export class YahooFinanceService implements DataProviderInterface {
         });
       }
     } catch (error) {
-      Logger.error(error, 'YahooFinanceService');
+      this.logger.error(error);
     }
 
     return { items };
@@ -365,10 +363,7 @@ export class YahooFinanceService implements DataProviderInterface {
       .filter(
         (result): result is PromiseFulfilledResult<QuoteSummaryResult> => {
           if (result.status === 'rejected') {
-            Logger.error(
+            this.logger.error(`Could not get quote summary: ${result.reason}`);
-              `Could not get quote summary: ${result.reason}`,
-              'YahooFinanceService'
-            );
 
             return false;
           }

apps/api/src/services/exchange-rate-data/exchange-rate-data.service.ts

@@ -30,6 +30,8 @@ import { ExchangeRatesByCurrency } from './interfaces/exchange-rate-data.interfa
 
 @Injectable()
 export class ExchangeRateDataService {
+  private readonly logger = new Logger(ExchangeRateDataService.name);
+
   private currencies: string[] = [];
   private currencyPairs: DataGatheringItem[] = [];
   private derivedCurrencyFactors: { [currencyPair: string]: number } = {};
@@ -110,9 +112,8 @@ export class ExchangeRateDataService {
             previousExchangeRate;
 
           if (currency === DEFAULT_CURRENCY && isBefore(date, new Date())) {
-            Logger.error(
+            this.logger.error(
-              `No exchange rate has been found for ${currency}${targetCurrency} at ${dateString}`,
+              `No exchange rate has been found for ${currency}${targetCurrency} at ${dateString}`
-              'ExchangeRateDataService'
             );
           }
         } else {
@@ -253,9 +254,8 @@ export class ExchangeRateDataService {
     }
 
     // Fallback with error, if currencies are not available
-    Logger.error(
+    this.logger.error(
-      `No exchange rate has been found for ${aFromCurrency}${aToCurrency}`,
+      `No exchange rate has been found for ${aFromCurrency}${aToCurrency}`
-      'ExchangeRateDataService'
     );
 
     return aValue;
@@ -341,12 +341,11 @@ export class ExchangeRateDataService {
       return factor * aValue;
     }
 
-    Logger.error(
+    this.logger.error(
       `No exchange rate has been found for ${aFromCurrency}${aToCurrency} at ${format(
         aDate,
         DATE_FORMAT
-      )}`,
+      )}`
-      'ExchangeRateDataService'
     );
 
     return undefined;
@@ -483,7 +482,7 @@ export class ExchangeRateDataService {
             errorMessage = `${errorMessage} and ${DEFAULT_CURRENCY}${currencyTo}`;
           }
 
-          Logger.error(`${errorMessage}.`, 'ExchangeRateDataService');
+          this.logger.error(`${errorMessage}.`);
         }
       }
     }

apps/api/src/services/fetch/fetch.module.ts

@@ -0,0 +1,11 @@
+import { FetchService } from '@ghostfolio/api/services/fetch/fetch.service';
+import { PropertyModule } from '@ghostfolio/api/services/property/property.module';
+
+import { Module } from '@nestjs/common';
+
+@Module({
+  exports: [FetchService],
+  imports: [PropertyModule],
+  providers: [FetchService]
+})
+export class FetchModule {}

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

@@ -0,0 +1,199 @@
+import { redactPaths } from '@ghostfolio/api/helper/object.helper';
+import { PropertyService } from '@ghostfolio/api/services/property/property.service';
+import {
+  PROPERTY_API_KEY_OPENROUTER,
+  PROPERTY_OPENROUTER_MODEL,
+  PROPERTY_WEB_FETCH_ROUTES
+} from '@ghostfolio/common/config';
+
+import { Injectable, Logger, OnModuleInit } from '@nestjs/common';
+import { createOpenRouter } from '@openrouter/ai-sdk-provider';
+import { generateText, jsonSchema, tool } from 'ai';
+import ms from 'ms';
+
+import { WebFetchRoute } from './interfaces/web-fetch-route.interface';
+
+@Injectable()
+export class FetchService implements OnModuleInit {
+  private readonly logger = new Logger(FetchService.name);
+
+  private static readonly REDACTED_QUERY_PARAM_NAMES = ['apikey', 'api_token'];
+  private static readonly WEB_FETCH_TIMEOUT = ms('30 seconds');
+
+  private webFetchRoutes: WebFetchRoute[] = [];
+
+  public constructor(private readonly propertyService: PropertyService) {}
+
+  public async onModuleInit() {
+    this.webFetchRoutes =
+      (await this.propertyService.getByKey<WebFetchRoute[]>(
+        PROPERTY_WEB_FETCH_ROUTES
+      )) ?? [];
+  }
+
+  public async fetch(input: RequestInfo | URL, init?: RequestInit) {
+    const method = (
+      init?.method ??
+      (input instanceof Request ? input.method : undefined) ??
+      'GET'
+    ).toUpperCase();
+
+    const url = input instanceof Request ? input.url : input.toString();
+    const urlRedacted = this.redactUrl(url);
+
+    this.logger.debug(`${method} ${urlRedacted}`);
+
+    if (method === 'GET') {
+      const webFetchRoute = this.getMatchingWebFetchRoute(url);
+
+      if (webFetchRoute) {
+        const response = await this.fetchViaWebFetchTool({
+          url,
+          webFetchRoute
+        });
+
+        if (response) {
+          return response;
+        }
+      }
+    }
+
+    try {
+      return await globalThis.fetch(input, init);
+    } catch (error) {
+      if (error instanceof Error) {
+        this.logger.error(
+          `${method} ${urlRedacted} failed: [${error.name}] ${error.message}`
+        );
+      } else {
+        this.logger.error(`${method} ${urlRedacted} failed: ${String(error)}`);
+      }
+
+      throw error;
+    }
+  }
+
+  private async fetchViaWebFetchTool({
+    url,
+    webFetchRoute
+  }: {
+    url: string;
+    webFetchRoute: WebFetchRoute;
+  }) {
+    const [openRouterApiKey, openRouterModel] = await Promise.all([
+      this.propertyService.getByKey<string>(PROPERTY_API_KEY_OPENROUTER),
+      this.propertyService.getByKey<string>(PROPERTY_OPENROUTER_MODEL)
+    ]);
+
+    if (!openRouterApiKey || !openRouterModel) {
+      return undefined;
+    }
+
+    try {
+      const openRouterService = createOpenRouter({ apiKey: openRouterApiKey });
+
+      const { sources, text } = await generateText({
+        model: openRouterService.chat(openRouterModel),
+        prompt: [
+          'You have access to a web_fetch tool. You MUST call it to retrieve the URL below, do not answer from prior knowledge.',
+          'Return the fetched response body exactly as received: raw body only, no commentary, no Markdown, and no code fences.',
+          `URL: ${url}`
+        ].join('\n'),
+        timeout: FetchService.WEB_FETCH_TIMEOUT,
+        tools: {
+          // Provider-defined tool: lets OpenRouter perform the actual web
+          // request server-side via its `web_fetch` engine. `id` and `args`
+          // are the OpenRouter-specific identifiers; the input schema is left
+          // open as the arguments are supplied by the model.
+          web_fetch: tool({
+            args: { engine: 'openrouter' },
+            id: 'openrouter.web_fetch',
+            inputSchema: jsonSchema({
+              additionalProperties: true,
+              type: 'object'
+            }),
+            type: 'provider'
+          })
+        }
+      });
+
+      const candidates = [
+        ...(sources ?? []).map((source) => {
+          return source.providerMetadata?.openrouter?.content;
+        }),
+        text
+      ];
+
+      for (const candidate of candidates) {
+        if (typeof candidate !== 'string') {
+          continue;
+        }
+
+        const body = candidate.trim();
+
+        if (!body) {
+          continue;
+        }
+
+        if (webFetchRoute.responseContentType?.includes('application/json')) {
+          try {
+            JSON.parse(body);
+          } catch {
+            continue;
+          }
+        }
+
+        this.logger.debug(`Routed ${this.redactUrl(url)} via web fetch tool`);
+
+        return new Response(body, {
+          headers: webFetchRoute.responseContentType
+            ? { 'content-type': webFetchRoute.responseContentType }
+            : undefined
+        });
+      }
+
+      return undefined;
+    } catch (error) {
+      this.logger.error(
+        `Web fetch tool failed for ${this.redactUrl(url)}: ${
+          error instanceof Error ? error.message : String(error)
+        }`
+      );
+
+      return undefined;
+    }
+  }
+
+  private getMatchingWebFetchRoute(url: string) {
+    try {
+      const { hostname } = new URL(url);
+
+      return this.webFetchRoutes.find(({ domain }) => {
+        return hostname === domain || hostname.endsWith(`.${domain}`);
+      });
+    } catch {
+      return undefined;
+    }
+  }
+
+  private redactUrl(rawUrl: string): string {
+    try {
+      const url = new URL(rawUrl);
+
+      const redacted = redactPaths({
+        object: Object.fromEntries(url.searchParams),
+        paths: FetchService.REDACTED_QUERY_PARAM_NAMES
+      });
+
+      for (const [key, value] of Object.entries(redacted)) {
+        if (value === null) {
+          url.searchParams.set(key, '*******');
+        }
+      }
+
+      return url.toString();
+    } catch {
+      return rawUrl;
+    }
+  }
+}

apps/api/src/services/fetch/interfaces/web-fetch-route.interface.ts

@@ -0,0 +1,19 @@
+/**
+ * Routes outgoing GET requests for a given domain through the OpenRouter
+ * `web_fetch` tool instead of a direct network request.
+ *
+ * Configured via the `WEB_FETCH_ROUTES` property as a JSON array, e.g.
+ *
+ * [
+ *   {
+ *     "domain": "example.com",
+ *     "responseContentType": "application/json"
+ *   }
+ * ]
+ *
+ * Matches the domain itself and its subdomains (e.g. `api.example.com`).
+ */
+export interface WebFetchRoute {
+  domain: string;
+  responseContentType?: string;
+}

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

@@ -7,6 +7,8 @@ import { join } from 'node:path';
 
 @Injectable()
 export class I18nService implements OnModuleInit {
+  private readonly logger = new Logger(I18nService.name);
+
   private localesPath = join(__dirname, 'assets', 'locales');
   private translations: { [locale: string]: cheerio.CheerioAPI } = {};
 
@@ -26,7 +28,7 @@ export class I18nService implements OnModuleInit {
     const $ = this.translations[languageCode];
 
     if (!$) {
-      Logger.warn(`Translation not found for locale '${languageCode}'`);
+      this.logger.warn(`Translation not found for locale '${languageCode}'`);
     }
 
     let translatedText = $(
@@ -36,7 +38,7 @@ export class I18nService implements OnModuleInit {
     ).text();
 
     if (!translatedText) {
-      Logger.warn(
+      this.logger.warn(
         `Translation not found for id '${id}' in locale '${languageCode}'`
       );
     }
@@ -60,7 +62,7 @@ export class I18nService implements OnModuleInit {
           this.parseXml(xmlData);
       }
     } catch (error) {
-      Logger.error(error, 'I18nService');
+      this.logger.error(error);
     }
   }
 

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

@@ -14,6 +14,8 @@ export class PrismaService
   extends PrismaClient
   implements OnModuleInit, OnModuleDestroy
 {
+  private readonly logger = new Logger(PrismaService.name);
+
   public constructor(configService: ConfigService) {
     const adapter = new PrismaPg({
       connectionString: configService.get<string>('DATABASE_URL')
@@ -43,7 +45,7 @@ export class PrismaService
     try {
       await this.$connect();
     } catch (error) {
-      Logger.error(error, 'PrismaService');
+      this.logger.error(error);
     }
   }
 

apps/api/src/services/queues/data-gathering/data-gathering.processor.ts

@@ -32,6 +32,8 @@ import { DataGatheringService } from './data-gathering.service';
 @Injectable()
 @Processor(DATA_GATHERING_QUEUE)
 export class DataGatheringProcessor {
+  private readonly logger = new Logger(DataGatheringProcessor.name);
+
   public constructor(
     private readonly dataGatheringService: DataGatheringService,
     private readonly dataProviderService: DataProviderService,
@@ -51,16 +53,14 @@ export class DataGatheringProcessor {
     const { dataSource, symbol } = job.data;
 
     try {
-      Logger.log(
+      this.logger.log(
-        `Asset profile data gathering has been started for ${symbol} (${dataSource})`,
+        `Asset profile data gathering has been started for ${symbol} (${dataSource})`
-        `DataGatheringProcessor (${GATHER_ASSET_PROFILE_PROCESS_JOB_NAME})`
       );
 
       await this.dataGatheringService.gatherAssetProfiles([job.data]);
 
-      Logger.log(
+      this.logger.log(
-        `Asset profile data gathering has been completed for ${symbol} (${dataSource})`,
+        `Asset profile data gathering has been completed for ${symbol} (${dataSource})`
-        `DataGatheringProcessor (${GATHER_ASSET_PROFILE_PROCESS_JOB_NAME})`
       );
     } catch (error) {
       if (error instanceof AssetProfileDelistedError) {
@@ -74,18 +74,14 @@ export class DataGatheringProcessor {
           }
         );
 
-        Logger.log(
+        this.logger.log(
-          `Asset profile data gathering has been discarded for ${symbol} (${dataSource})`,
+          `Asset profile data gathering has been discarded for ${symbol} (${dataSource})`
-          `DataGatheringProcessor (${GATHER_ASSET_PROFILE_PROCESS_JOB_NAME})`
         );
 
         return job.discard();
       }
 
-      Logger.error(
+      this.logger.error(error);
-        error,
-        `DataGatheringProcessor (${GATHER_ASSET_PROFILE_PROCESS_JOB_NAME})`
-      );
 
       throw error;
     }
@@ -105,12 +101,11 @@ export class DataGatheringProcessor {
     try {
       let currentDate = parseISO(date as unknown as string);
 
-      Logger.log(
+      this.logger.log(
         `Historical market data gathering has been started for ${symbol} (${dataSource}) at ${format(
           currentDate,
           DATE_FORMAT
-        )}${force ? ' (forced update)' : ''}`,
+        )}${force ? ' (forced update)' : ''}`
-        `DataGatheringProcessor (${GATHER_HISTORICAL_MARKET_DATA_PROCESS_JOB_NAME})`
       );
 
       const historicalData = await this.dataProviderService.getHistoricalRaw({
@@ -167,12 +162,11 @@ export class DataGatheringProcessor {
         await this.marketDataService.updateMany({ data });
       }
 
-      Logger.log(
+      this.logger.log(
         `Historical market data gathering has been completed for ${symbol} (${dataSource}) at ${format(
           currentDate,
           DATE_FORMAT
-        )}`,
+        )}`
-        `DataGatheringProcessor (${GATHER_HISTORICAL_MARKET_DATA_PROCESS_JOB_NAME})`
       );
     } catch (error) {
       if (error instanceof AssetProfileDelistedError) {
@@ -186,18 +180,14 @@ export class DataGatheringProcessor {
           }
         );
 
-        Logger.log(
+        this.logger.log(
-          `Historical market data gathering has been discarded for ${symbol} (${dataSource})`,
+          `Historical market data gathering has been discarded for ${symbol} (${dataSource})`
-          `DataGatheringProcessor (${GATHER_HISTORICAL_MARKET_DATA_PROCESS_JOB_NAME})`
         );
 
         return job.discard();
       }
 
-      Logger.error(
+      this.logger.error(error);
-        error,
-        `DataGatheringProcessor (${GATHER_HISTORICAL_MARKET_DATA_PROCESS_JOB_NAME})`
-      );
 
       throw error;
     }

apps/api/src/services/queues/data-gathering/data-gathering.service.ts

@@ -34,6 +34,8 @@ import ms, { StringValue } from 'ms';
 
 @Injectable()
 export class DataGatheringService {
+  private readonly logger = new Logger(DataGatheringService.name);
+
   public constructor(
     @Inject('DataEnhancers')
     private readonly dataEnhancers: DataEnhancerInterface[],
@@ -145,7 +147,7 @@ export class DataGatheringService {
         });
       }
     } catch (error) {
-      Logger.error(error, 'DataGatheringService');
+      this.logger.error(error);
     } finally {
       return undefined;
     }
@@ -176,30 +178,42 @@ export class DataGatheringService {
     );
 
     for (const [symbol, assetProfile] of Object.entries(assetProfiles)) {
-      const symbolMapping = symbolProfiles.find((symbolProfile) => {
+      const symbolProfile = symbolProfiles.find(
-        return symbolProfile.symbol === symbol;
+        ({ symbol: symbolProfileSymbol }) => {
-      })?.symbolMapping;
+          return symbolProfileSymbol === symbol;
+        }
+      );
+
+      const symbolMapping = symbolProfile?.symbolMapping;
+
+      let enhancedAssetProfile = symbolProfile
+        ? {
+            ...assetProfile,
+            assetClass: symbolProfile.assetClass ?? assetProfile.assetClass,
+            assetSubClass:
+              symbolProfile.assetSubClass ?? assetProfile.assetSubClass
+          }
+        : assetProfile;
 
       for (const dataEnhancer of this.dataEnhancers) {
         try {
-          assetProfiles[symbol] = await dataEnhancer.enhance({
+          enhancedAssetProfile = await dataEnhancer.enhance({
-            response: assetProfile,
+            response: enhancedAssetProfile,
             symbol: symbolMapping?.[dataEnhancer.getName()] ?? symbol
           });
         } catch (error) {
-          Logger.error(
+          this.logger.error(
             `Failed to enhance data for ${symbol} (${
               assetProfile.dataSource
             }) by ${dataEnhancer.getName()}`,
-            error,
+            error
-            'DataGatheringService'
           );
         }
       }
 
+      const { assetClass, assetSubClass } = assetProfile;
+
       const {
-        assetClass,
-        assetSubClass,
         countries,
         currency,
         cusip,
@@ -212,7 +226,7 @@ export class DataGatheringService {
         name,
         sectors,
         url
-      } = assetProfile;
+      } = enhancedAssetProfile;
 
       try {
         await this.prismaService.symbolProfile.upsert({
@@ -256,11 +270,7 @@ export class DataGatheringService {
           }
         });
       } catch (error) {
-        Logger.error(
+        this.logger.error(`${symbol}: ${error?.meta?.cause}`, error);
-          `${symbol}: ${error?.meta?.cause}`,
-          error,
-          'DataGatheringService'
-        );
 
         if (assetProfileIdentifiers.length === 1) {
           throw error;

apps/api/src/services/queues/portfolio-snapshot/portfolio-snapshot.processor.ts

@@ -21,6 +21,8 @@ import { PortfolioSnapshotQueueJob } from './interfaces/portfolio-snapshot-queue
 @Injectable()
 @Processor(PORTFOLIO_SNAPSHOT_COMPUTATION_QUEUE)
 export class PortfolioSnapshotProcessor {
+  private readonly logger = new Logger(PortfolioSnapshotProcessor.name);
+
   public constructor(
     private readonly accountBalanceService: AccountBalanceService,
     private readonly activitiesService: ActivitiesService,
@@ -41,9 +43,8 @@ export class PortfolioSnapshotProcessor {
     try {
       const startTime = performance.now();
 
-      Logger.log(
+      this.logger.log(
-        `Portfolio snapshot calculation of user '${job.data.userId}' has been started`,
+        `Portfolio snapshot calculation of user '${job.data.userId}' has been started`
-        `PortfolioSnapshotProcessor (${PORTFOLIO_SNAPSHOT_PROCESS_JOB_NAME})`
       );
 
       const { activities } =
@@ -72,12 +73,11 @@ export class PortfolioSnapshotProcessor {
 
       const snapshot = await portfolioCalculator.computeSnapshot();
 
-      Logger.log(
+      this.logger.log(
         `Portfolio snapshot calculation of user '${job.data.userId}' has been completed in ${(
           (performance.now() - startTime) /
           1000
-        ).toFixed(3)} seconds`,
+        ).toFixed(3)} seconds`
-        `PortfolioSnapshotProcessor (${PORTFOLIO_SNAPSHOT_PROCESS_JOB_NAME})`
       );
 
       const expiration = addMilliseconds(
@@ -101,10 +101,7 @@ export class PortfolioSnapshotProcessor {
 
       return snapshot;
     } catch (error) {
-      Logger.error(
+      this.logger.error(error);
-        error,
-        `PortfolioSnapshotProcessor (${PORTFOLIO_SNAPSHOT_PROCESS_JOB_NAME})`
-      );
 
       throw new Error(error);
     }

apps/api/src/services/queues/statistics-gathering/statistics-gathering.module.ts

@@ -1,4 +1,5 @@
 import { ConfigurationModule } from '@ghostfolio/api/services/configuration/configuration.module';
+import { FetchModule } from '@ghostfolio/api/services/fetch/fetch.module';
 import { PropertyModule } from '@ghostfolio/api/services/property/property.module';
 import { STATISTICS_GATHERING_QUEUE } from '@ghostfolio/common/config';
 
@@ -29,6 +30,7 @@ import { StatisticsGatheringService } from './statistics-gathering.service';
       name: STATISTICS_GATHERING_QUEUE
     }),
     ConfigurationModule,
+    FetchModule,
     PropertyModule
   ],
   providers: [StatisticsGatheringProcessor, StatisticsGatheringService]

apps/api/src/services/queues/statistics-gathering/statistics-gathering.processor.ts

@@ -1,4 +1,5 @@
 import { ConfigurationService } from '@ghostfolio/api/services/configuration/configuration.service';
+import { FetchService } from '@ghostfolio/api/services/fetch/fetch.service';
 import { PropertyService } from '@ghostfolio/api/services/property/property.service';
 import {
   GATHER_STATISTICS_DOCKER_HUB_PULLS_PROCESS_JOB_NAME,
@@ -26,17 +27,17 @@ import { format, subDays } from 'date-fns';
 @Injectable()
 @Processor(STATISTICS_GATHERING_QUEUE)
 export class StatisticsGatheringProcessor {
+  private readonly logger = new Logger(StatisticsGatheringProcessor.name);
+
   public constructor(
     private readonly configurationService: ConfigurationService,
+    private readonly fetchService: FetchService,
     private readonly propertyService: PropertyService
   ) {}
 
   @Process(GATHER_STATISTICS_DOCKER_HUB_PULLS_PROCESS_JOB_NAME)
   public async gatherDockerHubPullsStatistics() {
-    Logger.log(
+    this.logger.log('Docker Hub pulls statistics gathering has been started');
-      'Docker Hub pulls statistics gathering has been started',
-      'StatisticsGatheringProcessor'
-    );
 
     const dockerHubPulls = await this.countDockerHubPulls();
 
@@ -45,17 +46,13 @@ export class StatisticsGatheringProcessor {
       value: String(dockerHubPulls)
     });
 
-    Logger.log(
+    this.logger.log('Docker Hub pulls statistics gathering has been completed');
-      'Docker Hub pulls statistics gathering has been completed',
-      'StatisticsGatheringProcessor'
-    );
   }
 
   @Process(GATHER_STATISTICS_GITHUB_CONTRIBUTORS_PROCESS_JOB_NAME)
   public async gatherGitHubContributorsStatistics() {
-    Logger.log(
+    this.logger.log(
-      'GitHub contributors statistics gathering has been started',
+      'GitHub contributors statistics gathering has been started'
-      'StatisticsGatheringProcessor'
     );
 
     const gitHubContributors = await this.countGitHubContributors();
@@ -65,18 +62,14 @@ export class StatisticsGatheringProcessor {
       value: String(gitHubContributors)
     });
 
-    Logger.log(
+    this.logger.log(
-      'GitHub contributors statistics gathering has been completed',
+      'GitHub contributors statistics gathering has been completed'
-      'StatisticsGatheringProcessor'
     );
   }
 
   @Process(GATHER_STATISTICS_GITHUB_STARGAZERS_PROCESS_JOB_NAME)
   public async gatherGitHubStargazersStatistics() {
-    Logger.log(
+    this.logger.log('GitHub stargazers statistics gathering has been started');
-      'GitHub stargazers statistics gathering has been started',
-      'StatisticsGatheringProcessor'
-    );
 
     const gitHubStargazers = await this.countGitHubStargazers();
 
@@ -85,9 +78,8 @@ export class StatisticsGatheringProcessor {
       value: String(gitHubStargazers)
     });
 
-    Logger.log(
+    this.logger.log(
-      'GitHub stargazers statistics gathering has been completed',
+      'GitHub stargazers statistics gathering has been completed'
-      'StatisticsGatheringProcessor'
     );
   }
 
@@ -98,18 +90,14 @@ export class StatisticsGatheringProcessor {
     );
 
     if (!monitorId) {
-      Logger.log(
+      this.logger.log(
-        `Uptime statistics gathering has been skipped as no ${PROPERTY_BETTER_UPTIME_MONITOR_ID} is configured`,
+        `Uptime statistics gathering has been skipped as no ${PROPERTY_BETTER_UPTIME_MONITOR_ID} is configured`
-        'StatisticsGatheringProcessor'
       );
 
       return;
     }
 
-    Logger.log(
+    this.logger.log('Uptime statistics gathering has been started');
-      'Uptime statistics gathering has been started',
-      'StatisticsGatheringProcessor'
-    );
 
     const uptime = await this.getUptime(monitorId);
 
@@ -118,27 +106,23 @@ export class StatisticsGatheringProcessor {
       value: String(uptime)
     });
 
-    Logger.log(
+    this.logger.log('Uptime statistics gathering has been completed');
-      'Uptime statistics gathering has been completed',
-      'StatisticsGatheringProcessor'
-    );
   }
 
   private async countDockerHubPulls(): Promise<number> {
     try {
-      const { pull_count } = (await fetch(
+      const { pull_count } = (await this.fetchService
-        'https://hub.docker.com/v2/repositories/ghostfolio/ghostfolio',
+        .fetch('https://hub.docker.com/v2/repositories/ghostfolio/ghostfolio', {
-        {
           headers: { 'User-Agent': 'request' },
           signal: AbortSignal.timeout(
             this.configurationService.get('REQUEST_TIMEOUT')
           )
-        }
+        })
-      ).then((res) => res.json())) as { pull_count: number };
+        .then((res) => res.json())) as { pull_count: number };
 
       return pull_count;
     } catch (error) {
-      Logger.error(error, 'StatisticsGatheringProcessor - DockerHub');
+      this.logger.error(error);
 
       throw error;
     }
@@ -146,11 +130,13 @@ export class StatisticsGatheringProcessor {
 
   private async countGitHubContributors(): Promise<number> {
     try {
-      const body = await fetch('https://github.com/ghostfolio/ghostfolio', {
+      const body = await this.fetchService
-        signal: AbortSignal.timeout(
+        .fetch('https://github.com/ghostfolio/ghostfolio', {
-          this.configurationService.get('REQUEST_TIMEOUT')
+          signal: AbortSignal.timeout(
-        )
+            this.configurationService.get('REQUEST_TIMEOUT')
-      }).then((res) => res.text());
+          )
+        })
+        .then((res) => res.text());
 
       const $ = cheerio.load(body);
 
@@ -166,7 +152,7 @@ export class StatisticsGatheringProcessor {
         value
       });
     } catch (error) {
-      Logger.error(error, 'StatisticsGatheringProcessor - GitHub');
+      this.logger.error(error);
 
       throw error;
     }
@@ -174,19 +160,18 @@ export class StatisticsGatheringProcessor {
 
   private async countGitHubStargazers(): Promise<number> {
     try {
-      const { stargazers_count } = (await fetch(
+      const { stargazers_count } = (await this.fetchService
-        'https://api.github.com/repos/ghostfolio/ghostfolio',
+        .fetch('https://api.github.com/repos/ghostfolio/ghostfolio', {
-        {
           headers: { 'User-Agent': 'request' },
           signal: AbortSignal.timeout(
             this.configurationService.get('REQUEST_TIMEOUT')
           )
-        }
+        })
-      ).then((res) => res.json())) as { stargazers_count: number };
+        .then((res) => res.json())) as { stargazers_count: number };
 
       return stargazers_count;
     } catch (error) {
-      Logger.error(error, 'StatisticsGatheringProcessor - GitHub');
+      this.logger.error(error);
 
       throw error;
     }
@@ -194,26 +179,28 @@ export class StatisticsGatheringProcessor {
 
   private async getUptime(monitorId: string): Promise<number> {
     try {
-      const { data } = await fetch(
+      const { data } = await this.fetchService
-        `https://uptime.betterstack.com/api/v2/monitors/${monitorId}/sla?from=${format(
+        .fetch(
-          subDays(new Date(), 90),
+          `https://uptime.betterstack.com/api/v2/monitors/${monitorId}/sla?from=${format(
-          DATE_FORMAT
+            subDays(new Date(), 90),
-        )}&to${format(new Date(), DATE_FORMAT)}`,
+            DATE_FORMAT
-        {
+          )}&to${format(new Date(), DATE_FORMAT)}`,
-          headers: {
+          {
-            [HEADER_KEY_TOKEN]: `Bearer ${this.configurationService.get(
+            headers: {
-              'API_KEY_BETTER_UPTIME'
+              [HEADER_KEY_TOKEN]: `Bearer ${this.configurationService.get(
-            )}`
+                'API_KEY_BETTER_UPTIME'
-          },
+              )}`
-          signal: AbortSignal.timeout(
+            },
-            this.configurationService.get('REQUEST_TIMEOUT')
+            signal: AbortSignal.timeout(
-          )
+              this.configurationService.get('REQUEST_TIMEOUT')
-        }
+            )
-      ).then((res) => res.json());
+          }
+        )
+        .then((res) => res.json());
 
       return data.attributes.availability / 100;
     } catch (error) {
-      Logger.error(error, 'StatisticsGatheringProcessor - Better Stack');
+      this.logger.error(error);
 
       throw error;
     }

apps/api/src/services/symbol-profile/symbol-profile.service.ts

@@ -1,5 +1,6 @@
 import { PrismaService } from '@ghostfolio/api/services/prisma/prisma.service';
 import { UNKNOWN_KEY } from '@ghostfolio/common/config';
+import { applyAssetProfileOverrides } from '@ghostfolio/common/helper';
 import {
   AssetProfileIdentifier,
   EnhancedSymbolProfile,
@@ -192,21 +193,28 @@ export class SymbolProfileService {
     })[]
   ): EnhancedSymbolProfile[] {
     return symbolProfiles.map((symbolProfile) => {
+      const symbolProfileWithOverrides = applyAssetProfileOverrides(
+        symbolProfile,
+        symbolProfile.SymbolProfileOverrides
+      );
+
       const item = {
-        ...symbolProfile,
+        ...symbolProfileWithOverrides,
         activitiesCount: 0,
         countries: this.getCountries(
-          symbolProfile?.countries as unknown as Prisma.JsonArray
+          symbolProfileWithOverrides?.countries as unknown as Prisma.JsonArray
         ),
         dateOfFirstActivity: undefined as Date,
         holdings: this.getHoldings(
-          symbolProfile?.holdings as unknown as Prisma.JsonArray
+          symbolProfileWithOverrides?.holdings as unknown as Prisma.JsonArray
+        ),
+        scraperConfiguration: this.getScraperConfiguration(
+          symbolProfileWithOverrides
         ),
-        scraperConfiguration: this.getScraperConfiguration(symbolProfile),
         sectors: this.getSectors(
-          symbolProfile?.sectors as unknown as Prisma.JsonArray
+          symbolProfileWithOverrides?.sectors as unknown as Prisma.JsonArray
         ),
-        symbolMapping: this.getSymbolMapping(symbolProfile),
+        symbolMapping: this.getSymbolMapping(symbolProfileWithOverrides),
         watchedByCount: 0
       };
 
@@ -217,45 +225,7 @@ export class SymbolProfileService {
       item.dateOfFirstActivity = symbolProfile.activities?.[0]?.date;
       delete item.activities;
 
-      if (item.SymbolProfileOverrides) {
+      delete item.SymbolProfileOverrides;
-        item.assetClass =
-          item.SymbolProfileOverrides.assetClass ?? item.assetClass;
-        item.assetSubClass =
-          item.SymbolProfileOverrides.assetSubClass ?? item.assetSubClass;
-
-        if (
-          (item.SymbolProfileOverrides.countries as unknown as Prisma.JsonArray)
-            ?.length > 0
-        ) {
-          item.countries = this.getCountries(
-            item.SymbolProfileOverrides.countries as unknown as Prisma.JsonArray
-          );
-        }
-
-        if (
-          (item.SymbolProfileOverrides.holdings as unknown as Holding[])
-            ?.length > 0
-        ) {
-          item.holdings = this.getHoldings(
-            item.SymbolProfileOverrides.holdings as unknown as Prisma.JsonArray
-          );
-        }
-
-        item.name = item.SymbolProfileOverrides.name ?? item.name;
-
-        if (
-          (item.SymbolProfileOverrides.sectors as unknown as Sector[])?.length >
-          0
-        ) {
-          item.sectors = this.getSectors(
-            item.SymbolProfileOverrides.sectors as unknown as Prisma.JsonArray
-          );
-        }
-
-        item.url = item.SymbolProfileOverrides.url ?? item.url;
-
-        delete item.SymbolProfileOverrides;
-      }
 
       return item;
     });

apps/api/src/services/twitter-bot/twitter-bot.service.ts

@@ -16,6 +16,8 @@ import { TwitterApi, TwitterApiReadWrite } from 'twitter-api-v2';
 
 @Injectable()
 export class TwitterBotService implements OnModuleInit {
+  private readonly logger = new Logger(TwitterBotService.name);
+
   private twitterClient: TwitterApiReadWrite;
 
   public constructor(
@@ -71,13 +73,12 @@ export class TwitterBotService implements OnModuleInit {
         const { data: createdTweet } =
           await this.twitterClient.v2.tweet(status);
 
-        Logger.log(
+        this.logger.log(
-          `Fear & Greed Index has been posted: https://x.com/ghostfolio_/status/${createdTweet.id}`,
+          `Fear & Greed Index has been posted: https://x.com/ghostfolio_/status/${createdTweet.id}`
-          'TwitterBotService'
         );
       }
     } catch (error) {
-      Logger.error(error, 'TwitterBotService');
+      this.logger.error(error);
     }
   }
 

apps/client/src/app/components/account-detail-dialog/account-detail-dialog.html

@@ -148,6 +148,7 @@
           [accountBalances]="accountBalances"
           [accountCurrency]="currency"
           [accountId]="data.accountId"
+          [currentBalance]="balance"
           [locale]="user?.settings?.locale"
           [showActions]="
             !data.hasImpersonationId &&

apps/client/src/app/components/admin-market-data/admin-market-data.component.ts

@@ -18,6 +18,7 @@ import { AdminMarketDataItem } from '@ghostfolio/common/interfaces/admin-market-
 import { hasPermission, permissions } from '@ghostfolio/common/permissions';
 import { GfSymbolPipe } from '@ghostfolio/common/pipes';
 import { GfActivitiesFilterComponent } from '@ghostfolio/ui/activities-filter';
+import { GfFabComponent } from '@ghostfolio/ui/fab';
 import { translate } from '@ghostfolio/ui/i18n';
 import { GfPremiumIndicatorComponent } from '@ghostfolio/ui/premium-indicator';
 import { AdminService, DataService } from '@ghostfolio/ui/services';
@@ -80,10 +81,10 @@ import { CreateAssetProfileDialogParams } from './create-asset-profile-dialog/in
 
 @Component({
   changeDetection: ChangeDetectionStrategy.OnPush,
-  host: { class: 'has-fab' },
   imports: [
     CommonModule,
     GfActivitiesFilterComponent,
+    GfFabComponent,
     GfPremiumIndicatorComponent,
     GfSymbolPipe,
     GfValueComponent,

apps/client/src/app/components/admin-market-data/admin-market-data.html

@@ -332,15 +332,5 @@
     </div>
   </div>
 
-  <div class="fab-container">
+  <gf-fab [queryParams]="{ createAssetProfileDialog: true }" />
-    <a
-      class="align-items-center d-flex justify-content-center"
-      color="primary"
-      mat-fab
-      [queryParams]="{ createAssetProfileDialog: true }"
-      [routerLink]="[]"
-    >
-      <ion-icon name="add-outline" size="large" />
-    </a>
-  </div>
 </div>

apps/client/src/app/components/admin-market-data/asset-profile-dialog/asset-profile-dialog.component.scss

@@ -14,4 +14,8 @@
       top: 0;
     }
   }
+
+  .mat-mdc-dialog-title {
+    padding-right: 0.5rem !important;
+  }
 }

apps/client/src/app/components/admin-market-data/asset-profile-dialog/asset-profile-dialog.component.ts

@@ -8,6 +8,7 @@ import { UpdateAssetProfileDto } from '@ghostfolio/common/dtos';
 import {
   canDeleteAssetProfile,
   DATE_FORMAT,
+  getCountryName,
   getCurrencyFromSymbol,
   isCurrency
 } from '@ghostfolio/common/helper';
@@ -224,6 +225,7 @@ export class GfAssetProfileDialogComponent implements OnInit {
       value: 'max'
     }
   ];
+  protected readonly getCountryName = getCountryName;
   protected historicalDataItems: LineChartItem[];
   protected isBenchmark = false;
   protected isDataGatheringEnabled: boolean;
@@ -246,6 +248,8 @@ export class GfAssetProfileDialogComponent implements OnInit {
     [name: string]: { name: string; value: number };
   };
 
+  protected readonly translate = translate;
+
   protected user: User;
 
   private benchmarks: Partial<SymbolProfile>[];
@@ -367,9 +371,9 @@ export class GfAssetProfileDialogComponent implements OnInit {
           this.assetProfile?.countries &&
           this.assetProfile.countries.length > 0
         ) {
-          for (const { code, name, weight } of this.assetProfile.countries) {
+          for (const { code, weight } of this.assetProfile.countries) {
             this.countries[code] = {
-              name,
+              name: getCountryName({ code, locale: this.data.locale }),
               value: weight
             };
           }
@@ -381,7 +385,7 @@ export class GfAssetProfileDialogComponent implements OnInit {
         ) {
           for (const { name, weight } of this.assetProfile.sectors) {
             this.sectors[name] = {
-              name,
+              name: translate(name),
               value: weight
             };
           }

apps/client/src/app/components/admin-market-data/asset-profile-dialog/asset-profile-dialog.html

@@ -1,10 +1,10 @@
 <div class="d-flex flex-column h-100">
-  <div class="d-flex mb-3">
+  <div class="align-items-center d-flex mb-3" mat-dialog-title>
-    <h1 class="flex-grow-1 m-0" mat-dialog-title>
+    <span class="flex-grow-1 text-truncate">{{
-      <span>{{ assetProfile?.name ?? data.symbol }}</span>
+      assetProfile?.name ?? data.symbol
-    </h1>
+    }}</span>
     <button
-      class="mx-1 no-min-width px-2"
+      class="ml-1 no-min-width px-2"
       mat-button
       type="button"
       [matMenuTriggerFor]="assetProfileActionsMenu"
@@ -258,7 +258,7 @@
                       i18n
                       size="medium"
                       [locale]="data.locale"
-                      [value]="assetProfile?.sectors[0].name"
+                      [value]="translate(assetProfile?.sectors[0].name)"
                       >Sector</gf-value
                     >
                   </div>
@@ -269,7 +269,12 @@
                       i18n
                       size="medium"
                       [locale]="data.locale"
-                      [value]="assetProfile?.countries[0].name"
+                      [value]="
+                        getCountryName({
+                          code: assetProfile?.countries[0].code,
+                          locale: data.locale
+                        })
+                      "
                       >Country</gf-value
                     >
                   </div>

apps/client/src/app/components/admin-users/admin-users.component.ts

@@ -59,8 +59,10 @@ import {
   personOutline,
   trashOutline
 } from 'ionicons/icons';
+import ms from 'ms';
 import { DeviceDetectorService } from 'ngx-device-detector';
 import { NgxSkeletonLoaderModule } from 'ngx-skeleton-loader';
+import { interval } from 'rxjs';
 import { switchMap, tap } from 'rxjs/operators';
 
 @Component({
@@ -184,6 +186,15 @@ export class GfAdminUsersComponent implements OnInit {
 
   public ngOnInit() {
     this.fetchUsers();
+
+    interval(ms('30 seconds'))
+      .pipe(takeUntilDestroyed(this.destroyRef))
+      .subscribe(() => {
+        this.fetchUsers({
+          pageIndex: this.paginator().pageIndex,
+          showLoading: false
+        });
+      });
   }
 
   protected formatDistanceToNow(aDateString: string) {
@@ -267,8 +278,13 @@ export class GfAdminUsersComponent implements OnInit {
     );
   }
 
-  private fetchUsers({ pageIndex }: { pageIndex: number } = { pageIndex: 0 }) {
+  private fetchUsers({
-    this.isLoading = true;
+    pageIndex = 0,
+    showLoading = true
+  }: { pageIndex?: number; showLoading?: boolean } = {}) {
+    if (showLoading) {
+      this.isLoading = true;
+    }
 
     if (pageIndex === 0 && this.paginator()) {
       this.paginator().pageIndex = 0;
@@ -281,7 +297,7 @@ export class GfAdminUsersComponent implements OnInit {
       })
       .pipe(takeUntilDestroyed(this.destroyRef))
       .subscribe(({ count, users }) => {
-        this.dataSource = new MatTableDataSource(users);
+        this.dataSource.data = users;
         this.totalItems = count;
 
         this.isLoading = false;

apps/client/src/app/components/holding-detail-dialog/holding-detail-dialog.component.ts

@@ -6,7 +6,11 @@ import {
   NUMERICAL_PRECISION_THRESHOLD_6_FIGURES
 } from '@ghostfolio/common/config';
 import { CreateOrderDto } from '@ghostfolio/common/dtos';
-import { DATE_FORMAT, downloadAsFile } from '@ghostfolio/common/helper';
+import {
+  DATE_FORMAT,
+  downloadAsFile,
+  getCountryName
+} from '@ghostfolio/common/helper';
 import {
   Activity,
   DataProviderInfo,
@@ -121,6 +125,7 @@ export class GfHoldingDetailDialogComponent implements OnInit {
   public dividendInBaseCurrencyPrecision = 2;
   public dividendYieldPercentWithCurrencyEffect: number;
   public feeInBaseCurrency: number;
+  public getCountryName = getCountryName;
   public hasPermissionToCreateOwnTag: boolean;
   public hasPermissionToReadMarketDataOfOwnAssetProfile: boolean;
   public historicalDataItems: LineChartItem[];
@@ -157,6 +162,7 @@ export class GfHoldingDetailDialogComponent implements OnInit {
   public SymbolProfile: EnhancedSymbolProfile;
   public tags: Tag[];
   public tagsAvailable: Tag[];
+  public translate = translate;
   public user: User;
   public value: number;
 
@@ -433,7 +439,10 @@ export class GfHoldingDetailDialogComponent implements OnInit {
           if (SymbolProfile?.countries?.length > 0) {
             for (const country of SymbolProfile.countries) {
               this.countries[country.code] = {
-                name: country.name,
+                name: getCountryName({
+                  code: country.code,
+                  locale: this.data.locale
+                }),
                 value: country.weight
               };
             }
@@ -442,7 +451,7 @@ export class GfHoldingDetailDialogComponent implements OnInit {
           if (SymbolProfile?.sectors?.length > 0) {
             for (const sector of SymbolProfile.sectors) {
               this.sectors[sector.name] = {
-                name: sector.name,
+                name: translate(sector.name),
                 value: sector.weight
               };
             }

apps/client/src/app/components/holding-detail-dialog/holding-detail-dialog.html

@@ -262,7 +262,7 @@
                     i18n
                     size="medium"
                     [locale]="data.locale"
-                    [value]="SymbolProfile.sectors[0].name"
+                    [value]="translate(SymbolProfile.sectors[0].name)"
                     >Sector</gf-value
                   >
                 </div>
@@ -272,7 +272,12 @@
                       i18n
                       size="medium"
                       [locale]="data.locale"
-                      [value]="SymbolProfile.countries[0].name"
+                      [value]="
+                        getCountryName({
+                          code: SymbolProfile.countries[0].code,
+                          locale: data.locale
+                        })
+                      "
                       >Country</gf-value
                     >
                   </div>

apps/client/src/app/components/home-watchlist/home-watchlist.component.ts

@@ -8,6 +8,7 @@ import {
 } from '@ghostfolio/common/interfaces';
 import { hasPermission, permissions } from '@ghostfolio/common/permissions';
 import { GfBenchmarkComponent } from '@ghostfolio/ui/benchmark';
+import { GfFabComponent } from '@ghostfolio/ui/fab';
 import { GfPremiumIndicatorComponent } from '@ghostfolio/ui/premium-indicator';
 import { DataService } from '@ghostfolio/ui/services';
 
@@ -22,12 +23,8 @@ import {
   OnInit
 } from '@angular/core';
 import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
-import { MatButtonModule } from '@angular/material/button';
 import { MatDialog } from '@angular/material/dialog';
 import { ActivatedRoute, Router, RouterModule } from '@angular/router';
-import { IonIcon } from '@ionic/angular/standalone';
-import { addIcons } from 'ionicons';
-import { addOutline } from 'ionicons/icons';
 import { DeviceDetectorService } from 'ngx-device-detector';
 
 import { GfCreateWatchlistItemDialogComponent } from './create-watchlist-item-dialog/create-watchlist-item-dialog.component';
@@ -37,9 +34,8 @@ import { CreateWatchlistItemDialogParams } from './create-watchlist-item-dialog/
   changeDetection: ChangeDetectionStrategy.OnPush,
   imports: [
     GfBenchmarkComponent,
+    GfFabComponent,
     GfPremiumIndicatorComponent,
-    IonIcon,
-    MatButtonModule,
     RouterModule
   ],
   schemas: [CUSTOM_ELEMENTS_SCHEMA],
@@ -108,8 +104,6 @@ export class GfHomeWatchlistComponent implements OnInit {
           this.changeDetectorRef.markForCheck();
         }
       });
-
-    addIcons({ addOutline });
   }
 
   public ngOnInit() {

apps/client/src/app/components/home-watchlist/home-watchlist.html

@@ -22,15 +22,5 @@
   </div>
 </div>
 @if (!hasImpersonationId && hasPermissionToCreateWatchlistItem) {
-  <div class="fab-container">
+  <gf-fab [queryParams]="{ createWatchlistItemDialog: true }" />
-    <a
-      class="align-items-center d-flex justify-content-center"
-      color="primary"
-      mat-fab
-      [queryParams]="{ createWatchlistItemDialog: true }"
-      [routerLink]="[]"
-    >
-      <ion-icon name="add-outline" size="large" />
-    </a>
-  </div>
 }

apps/client/src/app/components/user-account-access/user-account-access.component.ts

@@ -4,6 +4,7 @@ import { CreateAccessDto } from '@ghostfolio/common/dtos';
 import { ConfirmationDialogType } from '@ghostfolio/common/enums';
 import { Access, User } from '@ghostfolio/common/interfaces';
 import { hasPermission, permissions } from '@ghostfolio/common/permissions';
+import { GfFabComponent } from '@ghostfolio/ui/fab';
 import { NotificationService } from '@ghostfolio/ui/notifications';
 import { GfPremiumIndicatorComponent } from '@ghostfolio/ui/premium-indicator';
 import { DataService } from '@ghostfolio/ui/services';
@@ -42,9 +43,9 @@ import { CreateOrUpdateAccessDialogParams } from './create-or-update-access-dial
 
 @Component({
   changeDetection: ChangeDetectionStrategy.OnPush,
-  host: { class: 'has-fab' },
   imports: [
     GfAccessTableComponent,
+    GfFabComponent,
     GfPremiumIndicatorComponent,
     IonIcon,
     MatButtonModule,

apps/client/src/app/components/user-account-access/user-account-access.html

@@ -69,16 +69,6 @@
     (accessToUpdate)="onUpdateAccess($event)"
   />
   @if (hasPermissionToCreateAccess) {
-    <div class="fab-container">
+    <gf-fab [queryParams]="{ createDialog: true }" />
-      <a
-        class="align-items-center d-flex justify-content-center"
-        color="primary"
-        mat-fab
-        [queryParams]="{ createDialog: true }"
-        [routerLink]="[]"
-      >
-        <ion-icon name="add-outline" size="large" />
-      </a>
-    </div>
   }
 </div>

apps/client/src/app/components/user-detail-dialog/user-detail-dialog.component.scss

@@ -4,4 +4,8 @@
   .mat-mdc-dialog-content {
     max-height: unset;
   }
+
+  .mat-mdc-dialog-title {
+    padding-right: 0.5rem !important;
+  }
 }

apps/client/src/app/components/user-detail-dialog/user-detail-dialog.html

@@ -1,6 +1,6 @@
-<div class="d-flex justify-content-end">
+<div class="align-items-center d-flex justify-content-end" mat-dialog-title>
   <button
-    class="mx-1 no-min-width px-2"
+    class="ml-1 no-min-width px-2"
     mat-button
     type="button"
     [matMenuTriggerFor]="userDetailActionsMenu"

apps/client/src/app/core/auth.guard.ts

@@ -3,7 +3,7 @@ import { UserService } from '@ghostfolio/client/services/user/user.service';
 import { internalRoutes, publicRoutes } from '@ghostfolio/common/routes/routes';
 import { DataService } from '@ghostfolio/ui/services';
 
-import { Injectable } from '@angular/core';
+import { inject, Injectable } from '@angular/core';
 import {
   ActivatedRouteSnapshot,
   Router,
@@ -14,12 +14,10 @@ import { catchError } from 'rxjs/operators';
 
 @Injectable({ providedIn: 'root' })
 export class AuthGuard {
-  public constructor(
+  private readonly dataService = inject(DataService);
-    private dataService: DataService,
+  private readonly router = inject(Router);
-    private router: Router,
+  private readonly settingsStorageService = inject(SettingsStorageService);
-    private settingsStorageService: SettingsStorageService,
+  private readonly userService = inject(UserService);
-    private userService: UserService
-  ) {}
 
   canActivate(route: ActivatedRouteSnapshot, state: RouterStateSnapshot) {
     const utmSource = route.queryParams?.utm_source;

apps/client/src/app/core/auth.interceptor.ts

@@ -13,20 +13,20 @@ import {
   HttpInterceptor,
   HttpRequest
 } from '@angular/common/http';
-import { Injectable } from '@angular/core';
+import { inject, Injectable } from '@angular/core';
 import { Observable } from 'rxjs';
 
 @Injectable()
 export class AuthInterceptor implements HttpInterceptor {
-  public constructor(
+  private readonly impersonationStorageService = inject(
-    private impersonationStorageService: ImpersonationStorageService,
+    ImpersonationStorageService
-    private tokenStorageService: TokenStorageService
+  );
-  ) {}
+  private readonly tokenStorageService = inject(TokenStorageService);
 
-  public intercept(
+  public intercept<T>(
-    req: HttpRequest<any>,
+    req: HttpRequest<T>,
     next: HttpHandler
-  ): Observable<HttpEvent<any>> {
+  ): Observable<HttpEvent<T>> {
     let request = req;
 
     if (request.headers.has(HEADER_KEY_SKIP_INTERCEPTOR)) {

apps/client/src/app/core/http-response.interceptor.ts

@@ -12,7 +12,7 @@ import {
   HttpInterceptor,
   HttpRequest
 } from '@angular/common/http';
-import { Injectable } from '@angular/core';
+import { inject, Injectable } from '@angular/core';
 import {
   MatSnackBar,
   MatSnackBarRef,
@@ -22,31 +22,28 @@ import { Router } from '@angular/router';
 import { StatusCodes } from 'http-status-codes';
 import ms from 'ms';
 import { Observable, throwError } from 'rxjs';
-import { catchError, tap } from 'rxjs/operators';
+import { catchError } from 'rxjs/operators';
 
 @Injectable()
 export class HttpResponseInterceptor implements HttpInterceptor {
-  public info: InfoItem;
+  private readonly info: InfoItem;
-  public snackBarRef: MatSnackBarRef<TextOnlySnackBar>;
+  private snackBarRef: MatSnackBarRef<TextOnlySnackBar> | undefined;
 
-  public constructor(
+  private readonly dataService = inject(DataService);
-    private dataService: DataService,
+  private readonly router = inject(Router);
-    private router: Router,
+  private readonly snackBar = inject(MatSnackBar);
-    private snackBar: MatSnackBar,
+  private readonly userService = inject(UserService);
-    private userService: UserService,
+  private readonly webAuthnService = inject(WebAuthnService);
-    private webAuthnService: WebAuthnService
+
-  ) {
+  public constructor() {
     this.info = this.dataService.fetchInfo();
   }
 
-  public intercept(
+  public intercept<T>(
-    request: HttpRequest<any>,
+    request: HttpRequest<T>,
     next: HttpHandler
-  ): Observable<HttpEvent<any>> {
+  ): Observable<HttpEvent<T>> {
     return next.handle(request).pipe(
-      tap((event: HttpEvent<any>) => {
-        return event;
-      }),
       catchError((error: HttpErrorResponse) => {
         if (error.status === StatusCodes.FORBIDDEN) {
           if (!this.snackBarRef) {
@@ -61,7 +58,7 @@ export class HttpResponseInterceptor implements HttpInterceptor {
                 }
               );
             } else if (
-              !error.url.includes(internalRoutes.auth.routerLink.join(''))
+              !error.url?.includes(internalRoutes.auth.routerLink.join(''))
             ) {
               this.snackBarRef = this.snackBar.open(
                 $localize`This action is not allowed.`,
@@ -72,11 +69,11 @@ export class HttpResponseInterceptor implements HttpInterceptor {
               );
             }
 
-            this.snackBarRef.afterDismissed().subscribe(() => {
+            this.snackBarRef?.afterDismissed().subscribe(() => {
               this.snackBarRef = undefined;
             });
 
-            this.snackBarRef.onAction().subscribe(() => {
+            this.snackBarRef?.onAction().subscribe(() => {
               this.router.navigate(publicRoutes.pricing.routerLink);
             });
           }
@@ -92,11 +89,11 @@ export class HttpResponseInterceptor implements HttpInterceptor {
               }
             );
 
-            this.snackBarRef.afterDismissed().subscribe(() => {
+            this.snackBarRef?.afterDismissed().subscribe(() => {
               this.snackBarRef = undefined;
             });
 
-            this.snackBarRef.onAction().subscribe(() => {
+            this.snackBarRef?.onAction().subscribe(() => {
               window.location.reload();
             });
           }
@@ -106,12 +103,12 @@ export class HttpResponseInterceptor implements HttpInterceptor {
               $localize`Oops! It looks like you’re making too many requests. Please slow down a bit.`
             );
 
-            this.snackBarRef.afterDismissed().subscribe(() => {
+            this.snackBarRef?.afterDismissed().subscribe(() => {
               this.snackBarRef = undefined;
             });
           }
         } else if (error.status === StatusCodes.UNAUTHORIZED) {
-          if (!error.url.includes('/data-providers/ghostfolio/status')) {
+          if (!error.url?.includes('/data-providers/ghostfolio/status')) {
             if (this.webAuthnService.isEnabled()) {
               this.router.navigate(internalRoutes.webauthn.routerLink);
             } else {

apps/client/src/app/directives/file-drop/file-drop.directive.ts

@@ -1,28 +1,34 @@
-import { Directive, EventEmitter, HostListener, Output } from '@angular/core';
+import { Directive, output } from '@angular/core';
 
 @Directive({
+  host: {
+    '(dragenter)': 'onDragEnter($event)',
+    '(dragover)': 'onDragOver($event)',
+    '(drop)': 'onDrop($event)'
+  },
   selector: '[gfFileDrop]'
 })
 export class GfFileDropDirective {
-  @Output() filesDropped = new EventEmitter<FileList>();
+  public readonly filesDropped = output<FileList>();
 
-  @HostListener('dragenter', ['$event']) onDragEnter(event: DragEvent) {
+  public onDragEnter(event: DragEvent) {
     event.preventDefault();
     event.stopPropagation();
   }
 
-  @HostListener('dragover', ['$event']) onDragOver(event: DragEvent) {
+  public onDragOver(event: DragEvent) {
     event.preventDefault();
     event.stopPropagation();
   }
 
-  @HostListener('drop', ['$event']) onDrop(event: DragEvent) {
+  public onDrop(event: DragEvent) {
     event.preventDefault();
     event.stopPropagation();
 
-    // Prevent the browser's default behavior for handling the file drop
+    if (event.dataTransfer) {
-    event.dataTransfer.dropEffect = 'copy';
+      // Prevent the browser's default behavior for handling the file drop
-
+      event.dataTransfer.dropEffect = 'copy';
-    this.filesDropped.emit(event.dataTransfer.files);
+      this.filesDropped.emit(event.dataTransfer.files);
+    }
   }
 }

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

@@ -10,6 +10,7 @@ import {
 import { User } from '@ghostfolio/common/interfaces';
 import { hasPermission, permissions } from '@ghostfolio/common/permissions';
 import { GfAccountsTableComponent } from '@ghostfolio/ui/accounts-table';
+import { GfFabComponent } from '@ghostfolio/ui/fab';
 import { NotificationService } from '@ghostfolio/ui/notifications';
 import { DataService } from '@ghostfolio/ui/services';
 
@@ -20,12 +21,9 @@ import {
   OnInit
 } from '@angular/core';
 import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
-import { MatButtonModule } from '@angular/material/button';
 import { MatDialog } from '@angular/material/dialog';
 import { ActivatedRoute, Router, RouterModule } from '@angular/router';
 import { Account as AccountModel } from '@prisma/client';
-import { addIcons } from 'ionicons';
-import { addOutline } from 'ionicons/icons';
 import { DeviceDetectorService } from 'ngx-device-detector';
 import { EMPTY, Subscription } from 'rxjs';
 import { catchError } from 'rxjs/operators';
@@ -36,8 +34,8 @@ import { TransferBalanceDialogParams } from './transfer-balance/interfaces/inter
 import { GfTransferBalanceDialogComponent } from './transfer-balance/transfer-balance-dialog.component';
 
 @Component({
-  host: { class: 'has-fab page' },
+  host: { class: 'page' },
-  imports: [GfAccountsTableComponent, MatButtonModule, RouterModule],
+  imports: [GfAccountsTableComponent, GfFabComponent, RouterModule],
   selector: 'gf-accounts-page',
   styleUrls: ['./accounts-page.scss'],
   templateUrl: './accounts-page.html'
@@ -90,8 +88,6 @@ export class GfAccountsPageComponent implements OnInit {
           this.openTransferBalanceDialog();
         }
       });
-
-    addIcons({ addOutline });
   }
 
   public ngOnInit() {

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

@@ -26,16 +26,6 @@
     hasPermissionToCreateAccount &&
     !user.settings.isRestrictedView
   ) {
-    <div class="fab-container">
+    <gf-fab [queryParams]="{ createDialog: true }" />
-      <a
-        class="align-items-center d-flex justify-content-center"
-        color="primary"
-        mat-fab
-        [queryParams]="{ createDialog: true }"
-        [routerLink]="[]"
-      >
-        <ion-icon name="add-outline" size="large" />
-      </a>
-    </div>
   }
 </div>

apps/client/src/app/pages/portfolio/activities/activities-page.component.ts

@@ -12,6 +12,7 @@ import {
 import { hasPermission, permissions } from '@ghostfolio/common/permissions';
 import { DateRange } from '@ghostfolio/common/types';
 import { GfActivitiesTableComponent } from '@ghostfolio/ui/activities-table';
+import { GfFabComponent } from '@ghostfolio/ui/fab';
 import { DataService } from '@ghostfolio/ui/services';
 
 import {
@@ -21,17 +22,13 @@ import {
   OnInit
 } from '@angular/core';
 import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
-import { MatButtonModule } from '@angular/material/button';
 import { MatDialog } from '@angular/material/dialog';
 import { PageEvent } from '@angular/material/paginator';
 import { MatSnackBarModule } from '@angular/material/snack-bar';
 import { Sort, SortDirection } from '@angular/material/sort';
 import { MatTableDataSource } from '@angular/material/table';
 import { ActivatedRoute, Router, RouterModule } from '@angular/router';
-import { IonIcon } from '@ionic/angular/standalone';
 import { format, parseISO } from 'date-fns';
-import { addIcons } from 'ionicons';
-import { addOutline } from 'ionicons/icons';
 import { DeviceDetectorService } from 'ngx-device-detector';
 import { Subscription } from 'rxjs';
 
@@ -41,11 +38,9 @@ import { GfImportActivitiesDialogComponent } from './import-activities-dialog/im
 import { ImportActivitiesDialogParams } from './import-activities-dialog/interfaces/interfaces';
 
 @Component({
-  host: { class: 'has-fab' },
   imports: [
     GfActivitiesTableComponent,
-    IonIcon,
+    GfFabComponent,
-    MatButtonModule,
     MatSnackBarModule,
     RouterModule
   ],
@@ -107,8 +102,6 @@ export class GfActivitiesPageComponent implements OnInit {
           }
         }
       });
-
-    addIcons({ addOutline });
   }
 
   public ngOnInit() {

apps/client/src/app/pages/portfolio/activities/activities-page.html

@@ -1,5 +1,5 @@
 <div class="container">
-  <div class="mb-3 row">
+  <div class="row">
     <div class="col">
       <h1 class="d-none d-sm-block h3 mb-3 text-center" i18n>Activities</h1>
       <gf-activities-table
@@ -43,16 +43,6 @@
     hasPermissionToCreateActivity &&
     !user.settings.isRestrictedView
   ) {
-    <div class="fab-container">
+    <gf-fab [queryParams]="{ createDialog: true }" />
-      <a
-        class="align-items-center d-flex justify-content-center"
-        color="primary"
-        mat-fab
-        [queryParams]="{ createDialog: true }"
-        [routerLink]="[]"
-      >
-        <ion-icon name="add-outline" size="large" />
-      </a>
-    </div>
   }
 </div>

apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.component.ts

@@ -139,7 +139,7 @@ export class GfCreateOrUpdateActivityDialogComponent {
             return !['CASH'].includes(assetProfile.assetSubClass);
           })
           .sort((a, b) => {
-            return a.name?.localeCompare(b.name);
+            return a.assetProfile.name?.localeCompare(b.assetProfile.name);
           })
           .map(({ assetProfile }) => {
             return {

apps/client/src/app/pages/portfolio/activities/import-activities-dialog/import-activities-dialog.component.ts

@@ -226,7 +226,8 @@ export class GfImportActivitiesDialogComponent {
     this.assetProfileForm.controls.assetProfileIdentifier.disable();
 
     const { dataSource, symbol } =
-      this.assetProfileForm.controls.assetProfileIdentifier.value ?? {};
+      this.assetProfileForm.controls.assetProfileIdentifier.value
+        ?.assetProfile ?? {};
 
     if (!dataSource || !symbol) {
       return;

apps/client/src/app/pages/portfolio/allocations/allocations-page.component.ts

@@ -3,7 +3,7 @@ import { AccountDetailDialogParams } from '@ghostfolio/client/components/account
 import { ImpersonationStorageService } from '@ghostfolio/client/services/impersonation-storage.service';
 import { UserService } from '@ghostfolio/client/services/user/user.service';
 import { MAX_TOP_HOLDINGS, UNKNOWN_KEY } from '@ghostfolio/common/config';
-import { prettifySymbol } from '@ghostfolio/common/helper';
+import { getCountryName, prettifySymbol } from '@ghostfolio/common/helper';
 import {
   AssetProfileIdentifier,
   HoldingWithParents,
@@ -73,15 +73,14 @@ export class GfAllocationsPageComponent implements OnInit {
   public hasImpersonationId: boolean;
   public holdings: {
     [symbol: string]: Pick<
-      PortfolioPosition,
+      PortfolioPosition['assetProfile'],
       | 'assetClass'
       | 'assetClassLabel'
       | 'assetSubClass'
       | 'assetSubClassLabel'
       | 'currency'
-      | 'exchange'
       | 'name'
-    > & { etfProvider: string; value: number };
+    > & { etfProvider: string; exchange?: string; value: number };
   };
   public isLoading = false;
   public markets: {
@@ -206,7 +205,7 @@ export class GfAllocationsPageComponent implements OnInit {
     assetSubClass,
     name
   }: {
-    assetSubClass: PortfolioPosition['assetSubClass'];
+    assetSubClass: PortfolioPosition['assetProfile']['assetSubClass'];
     name: string;
   }) {
     if (assetSubClass === 'ETF') {
@@ -333,25 +332,28 @@ export class GfAllocationsPageComponent implements OnInit {
 
       this.holdings[symbol] = {
         value,
-        assetClass: position.assetClass || (UNKNOWN_KEY as AssetClass),
+        assetClass:
-        assetClassLabel: position.assetClassLabel || UNKNOWN_KEY,
+          position.assetProfile.assetClass || (UNKNOWN_KEY as AssetClass),
-        assetSubClass: position.assetSubClass || (UNKNOWN_KEY as AssetSubClass),
+        assetClassLabel: position.assetProfile.assetClassLabel || UNKNOWN_KEY,
-        assetSubClassLabel: position.assetSubClassLabel || UNKNOWN_KEY,
+        assetSubClass:
-        currency: position.currency,
+          position.assetProfile.assetSubClass || (UNKNOWN_KEY as AssetSubClass),
+        assetSubClassLabel:
+          position.assetProfile.assetSubClassLabel || UNKNOWN_KEY,
+        currency: position.assetProfile.currency,
         etfProvider: this.extractEtfProvider({
-          assetSubClass: position.assetSubClass,
+          assetSubClass: position.assetProfile.assetSubClass,
-          name: position.name
+          name: position.assetProfile.name
         }),
         exchange: position.exchange,
-        name: position.name
+        name: position.assetProfile.name
       };
 
-      if (position.assetClass !== AssetClass.LIQUIDITY) {
+      if (position.assetProfile.assetClass !== AssetClass.LIQUIDITY) {
         // Prepare analysis data by continents, countries, holdings and sectors except for liquidity
 
-        if (position.countries.length > 0) {
+        if (position.assetProfile.countries.length > 0) {
-          for (const country of position.countries) {
+          for (const country of position.assetProfile.countries) {
-            const { code, continent, name, weight } = country;
+            const { code, continent, weight } = country;
 
             if (this.continents[continent]?.value) {
               this.continents[continent].value +=
@@ -361,7 +363,7 @@ export class GfAllocationsPageComponent implements OnInit {
                   : position.valueInPercentage);
             } else {
               this.continents[continent] = {
-                name: continent,
+                name: translate(continent),
                 value:
                   weight *
                   (isNumber(position.valueInBaseCurrency)
@@ -378,7 +380,10 @@ export class GfAllocationsPageComponent implements OnInit {
                   : position.valueInPercentage);
             } else {
               this.countries[code] = {
-                name,
+                name: getCountryName({
+                  code,
+                  locale: this.user?.settings?.locale
+                }),
                 value:
                   weight *
                   (isNumber(position.valueInBaseCurrency)
@@ -401,12 +406,12 @@ export class GfAllocationsPageComponent implements OnInit {
             : this.portfolioDetails.holdings[symbol].valueInPercentage;
         }
 
-        if (position.holdings.length > 0) {
+        if (position.assetProfile.holdings.length > 0) {
           for (const {
             allocationInPercentage,
             name,
             valueInBaseCurrency
-          } of position.holdings) {
+          } of position.assetProfile.holdings) {
             const normalizedAssetName = this.normalizeAssetName(name);
 
             if (this.topHoldingsMap[normalizedAssetName]?.value) {
@@ -428,8 +433,8 @@ export class GfAllocationsPageComponent implements OnInit {
           }
         }
 
-        if (position.sectors.length > 0) {
+        if (position.assetProfile.sectors.length > 0) {
-          for (const sector of position.sectors) {
+          for (const sector of position.assetProfile.sectors) {
             const { name, weight } = sector;
 
             if (this.sectors[name]?.value) {
@@ -440,7 +445,7 @@ export class GfAllocationsPageComponent implements OnInit {
                   : position.valueInPercentage);
             } else {
               this.sectors[name] = {
-                name,
+                name: translate(name),
                 value:
                   weight *
                   (isNumber(position.valueInBaseCurrency)
@@ -463,8 +468,8 @@ export class GfAllocationsPageComponent implements OnInit {
       }
 
       this.symbols[prettifySymbol(symbol)] = {
-        dataSource: position.dataSource,
+        dataSource: position.assetProfile.dataSource,
-        name: position.name,
+        name: position.assetProfile.name,
         symbol: prettifySymbol(symbol),
         value: isNumber(position.valueInBaseCurrency)
           ? position.valueInBaseCurrency
@@ -517,8 +522,8 @@ export class GfAllocationsPageComponent implements OnInit {
             this.totalValueInEtf > 0 ? value / this.totalValueInEtf : 0,
           parents: Object.entries(this.portfolioDetails.holdings)
             .map(([symbol, holding]) => {
-              if (holding.holdings.length > 0) {
+              if (holding.assetProfile.holdings.length > 0) {
-                const currentParentHolding = holding.holdings.find(
+                const currentParentHolding = holding.assetProfile.holdings.find(
                   (parentHolding) => {
                     return (
                       this.normalizeAssetName(parentHolding.name) ===
@@ -531,7 +536,7 @@ export class GfAllocationsPageComponent implements OnInit {
                   ? {
                       allocationInPercentage:
                         currentParentHolding.valueInBaseCurrency / value,
-                      name: holding.name,
+                      name: holding.assetProfile.name,
                       position: holding,
                       symbol: prettifySymbol(symbol),
                       valueInBaseCurrency:

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

@@ -2,7 +2,10 @@ import { GfBenchmarkComparatorComponent } from '@ghostfolio/client/components/be
 import { GfInvestmentChartComponent } from '@ghostfolio/client/components/investment-chart/investment-chart.component';
 import { ImpersonationStorageService } from '@ghostfolio/client/services/impersonation-storage.service';
 import { UserService } from '@ghostfolio/client/services/user/user.service';
-import { NUMERICAL_PRECISION_THRESHOLD_6_FIGURES } from '@ghostfolio/common/config';
+import {
+  DEFAULT_DATE_RANGE,
+  NUMERICAL_PRECISION_THRESHOLD_6_FIGURES
+} from '@ghostfolio/common/config';
 import {
   HistoricalDataItem,
   InvestmentItem,
@@ -24,9 +27,12 @@ import { Clipboard } from '@angular/cdk/clipboard';
 import {
   ChangeDetectorRef,
   Component,
+  computed,
   DestroyRef,
+  inject,
   OnInit,
-  ViewChild
+  signal,
+  viewChild
 } from '@angular/core';
 import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
 import { MatButtonModule } from '@angular/material/button';
@@ -64,53 +70,57 @@ import { NgxSkeletonLoaderModule } from 'ngx-skeleton-loader';
   templateUrl: './analysis-page.html'
 })
 export class GfAnalysisPageComponent implements OnInit {
-  @ViewChild(MatMenuTrigger) actionsMenuButton!: MatMenuTrigger;
+  protected benchmark?: Partial<SymbolProfile>;
-
+  protected benchmarkDataItems: HistoricalDataItem[] = [];
-  public benchmark: Partial<SymbolProfile>;
+  protected readonly benchmarks: Partial<SymbolProfile>[];
-  public benchmarkDataItems: HistoricalDataItem[] = [];
+  protected bottom3: PortfolioPosition[];
-  public benchmarks: Partial<SymbolProfile>[];
+  protected dividendsByGroup: InvestmentItem[];
-  public bottom3: PortfolioPosition[];
+  protected readonly dividendTimelineDataLabel = $localize`Dividend`;
-  public deviceType: string;
+  protected hasImpersonationId: boolean;
-  public dividendsByGroup: InvestmentItem[];
+  protected hasPermissionToReadAiPrompt: boolean;
-  public dividendTimelineDataLabel = $localize`Dividend`;
+  protected investments: InvestmentItem[];
-  public firstOrderDate: Date;
+  protected readonly investmentTimelineDataLabel = $localize`Investment`;
-  public hasImpersonationId: boolean;
+  protected investmentsByGroup: InvestmentItem[];
-  public hasPermissionToReadAiPrompt: boolean;
+  protected isLoadingAnalysisPrompt: boolean;
-  public investments: InvestmentItem[];
+  protected isLoadingBenchmarkComparator: boolean;
-  public investmentTimelineDataLabel = $localize`Investment`;
+  protected isLoadingDividendTimelineChart: boolean;
-  public investmentsByGroup: InvestmentItem[];
+  protected isLoadingInvestmentChart: boolean;
-  public isLoadingAnalysisPrompt: boolean;
+  protected isLoadingInvestmentTimelineChart: boolean;
-  public isLoadingBenchmarkComparator: boolean;
+  protected isLoadingPortfolioPrompt: boolean;
-  public isLoadingDividendTimelineChart: boolean;
+  protected readonly mode = signal<GroupBy>('month');
-  public isLoadingInvestmentChart: boolean;
+  protected readonly modeOptions: ToggleOption[] = [
-  public isLoadingInvestmentTimelineChart: boolean;
-  public isLoadingPortfolioPrompt: boolean;
-  public mode: GroupBy = 'month';
-  public modeOptions: ToggleOption[] = [
     { label: $localize`Monthly`, value: 'month' },
     { label: $localize`Yearly`, value: 'year' }
   ];
-  public performance: PortfolioPerformance;
+  protected performance: PortfolioPerformance;
-  public performanceDataItems: HistoricalDataItem[];
+  protected performanceDataItems: HistoricalDataItem[];
-  public performanceDataItemsInPercentage: HistoricalDataItem[];
+  protected performanceDataItemsInPercentage: HistoricalDataItem[];
-  public portfolioEvolutionDataLabel = $localize`Investment`;
+  protected readonly portfolioEvolutionDataLabel = $localize`Investment`;
-  public precision = 2;
+  protected precision = 2;
-  public streaks: PortfolioInvestmentsResponse['streaks'];
+  protected streaks: PortfolioInvestmentsResponse['streaks'];
-  public top3: PortfolioPosition[];
+  protected top3: PortfolioPosition[];
-  public unitCurrentStreak: string;
+  protected unitCurrentStreak: string;
-  public unitLongestStreak: string;
+  protected unitLongestStreak: string;
-  public user: User;
+  protected user: User;
-
+
-  public constructor(
+  private readonly actionsMenuButton = viewChild.required(MatMenuTrigger);
-    private changeDetectorRef: ChangeDetectorRef,
+  private readonly deviceType = computed(
-    private clipboard: Clipboard,
+    () => this.deviceDetectorService.deviceInfo().deviceType
-    private dataService: DataService,
+  );
-    private destroyRef: DestroyRef,
+  private firstOrderDate: Date;
-    private deviceDetectorService: DeviceDetectorService,
+
-    private impersonationStorageService: ImpersonationStorageService,
+  private readonly changeDetectorRef = inject(ChangeDetectorRef);
-    private snackBar: MatSnackBar,
+  private readonly clipboard = inject(Clipboard);
-    private userService: UserService
+  private readonly dataService = inject(DataService);
-  ) {
+  private readonly destroyRef = inject(DestroyRef);
+  private readonly deviceDetectorService = inject(DeviceDetectorService);
+  private readonly impersonationStorageService = inject(
+    ImpersonationStorageService
+  );
+  private readonly snackBar = inject(MatSnackBar);
+  private readonly userService = inject(UserService);
+
+  public constructor() {
     const { benchmarks } = this.dataService.fetchInfo();
     this.benchmarks = benchmarks;
 
@@ -123,14 +133,16 @@ export class GfAnalysisPageComponent implements OnInit {
         ? undefined
         : this.user?.settings?.savingsRate;
 
-    return this.mode === 'year'
+    if (savingsRatePerMonth === undefined) {
+      return undefined;
+    }
+
+    return this.mode() === 'year'
       ? savingsRatePerMonth * 12
       : savingsRatePerMonth;
   }
 
   public ngOnInit() {
-    this.deviceType = this.deviceDetectorService.getDeviceInfo().deviceType;
-
     this.impersonationStorageService
       .onChangeHasImpersonation()
       .pipe(takeUntilDestroyed(this.destroyRef))
@@ -158,7 +170,7 @@ export class GfAnalysisPageComponent implements OnInit {
       });
   }
 
-  public onChangeBenchmark(symbolProfileId: string) {
+  protected onChangeBenchmark(symbolProfileId: string) {
     this.dataService
       .putUserSetting({ benchmark: symbolProfileId })
       .pipe(takeUntilDestroyed(this.destroyRef))
@@ -174,12 +186,12 @@ export class GfAnalysisPageComponent implements OnInit {
       });
   }
 
-  public onChangeGroupBy(aMode: GroupBy) {
+  protected onChangeGroupBy(aMode: GroupBy) {
-    this.mode = aMode;
+    this.mode.set(aMode);
     this.fetchDividendsAndInvestments();
   }
 
-  public onCopyPromptToClipboard(mode: AiPromptMode) {
+  protected onCopyPromptToClipboard(mode: AiPromptMode) {
     if (mode === 'analysis') {
       this.isLoadingAnalysisPrompt = true;
     } else if (mode === 'portfolio') {
@@ -210,7 +222,7 @@ export class GfAnalysisPageComponent implements OnInit {
             window.open('https://duck.ai', '_blank');
           });
 
-        this.actionsMenuButton.closeMenu();
+        this.actionsMenuButton().closeMenu();
 
         if (mode === 'analysis') {
           this.isLoadingAnalysisPrompt = false;
@@ -227,8 +239,8 @@ export class GfAnalysisPageComponent implements OnInit {
     this.dataService
       .fetchDividends({
         filters: this.userService.getFilters(),
-        groupBy: this.mode,
+        groupBy: this.mode(),
-        range: this.user?.settings?.dateRange
+        range: this.user?.settings?.dateRange ?? DEFAULT_DATE_RANGE
       })
       .pipe(takeUntilDestroyed(this.destroyRef))
       .subscribe(({ dividends }) => {
@@ -242,15 +254,15 @@ export class GfAnalysisPageComponent implements OnInit {
     this.dataService
       .fetchInvestments({
         filters: this.userService.getFilters(),
-        groupBy: this.mode,
+        groupBy: this.mode(),
-        range: this.user?.settings?.dateRange
+        range: this.user?.settings?.dateRange ?? DEFAULT_DATE_RANGE
       })
       .pipe(takeUntilDestroyed(this.destroyRef))
       .subscribe(({ investments, streaks }) => {
         this.investmentsByGroup = investments;
         this.streaks = streaks;
         this.unitCurrentStreak =
-          this.mode === 'year'
+          this.mode() === 'year'
             ? this.streaks?.currentStreak === 1
               ? translate('YEAR')
               : translate('YEARS')
@@ -258,7 +270,7 @@ export class GfAnalysisPageComponent implements OnInit {
               ? translate('MONTH')
               : translate('MONTHS');
         this.unitLongestStreak =
-          this.mode === 'year'
+          this.mode() === 'year'
             ? this.streaks?.longestStreak === 1
               ? translate('YEAR')
               : translate('YEARS')
@@ -278,7 +290,7 @@ export class GfAnalysisPageComponent implements OnInit {
     this.dataService
       .fetchPortfolioPerformance({
         filters: this.userService.getFilters(),
-        range: this.user?.settings?.dateRange
+        range: this.user?.settings?.dateRange ?? DEFAULT_DATE_RANGE
       })
       .pipe(takeUntilDestroyed(this.destroyRef))
       .subscribe(({ chart, firstOrderDate, performance }) => {
@@ -298,13 +310,16 @@ export class GfAnalysisPageComponent implements OnInit {
             valueInPercentage,
             valueWithCurrencyEffect
           }
-        ] of chart.entries()) {
+        ] of (chart ?? []).entries()) {
+          // Ignore first item where value is 0
           if (index > 0 || this.user?.settings?.dateRange === 'max') {
-            // Ignore first item where value is 0
+            if (totalInvestmentValueWithCurrencyEffect !== undefined) {
-            this.investments.push({
+              this.investments.push({
-              date,
+                date,
-              investment: totalInvestmentValueWithCurrencyEffect
+                investment: totalInvestmentValueWithCurrencyEffect
-            });
+              });
+            }
+
             this.performanceDataItems.push({
               date,
               value: isNumber(valueWithCurrencyEffect)
@@ -320,7 +335,7 @@ export class GfAnalysisPageComponent implements OnInit {
         }
 
         if (
-          this.deviceType === 'mobile' &&
+          this.deviceType() === 'mobile' &&
           this.performance.currentValueInBaseCurrency >=
             NUMERICAL_PRECISION_THRESHOLD_6_FIGURES
         ) {
@@ -387,7 +402,7 @@ export class GfAnalysisPageComponent implements OnInit {
             dataSource,
             symbol,
             filters: this.userService.getFilters(),
-            range: this.user?.settings?.dateRange,
+            range: this.user?.settings?.dateRange ?? DEFAULT_DATE_RANGE,
             startDate: this.firstOrderDate
           })
           .pipe(takeUntilDestroyed(this.destroyRef))

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

@@ -310,13 +310,15 @@
                 <a
                   class="d-flex"
                   [queryParams]="{
-                    dataSource: holding.dataSource,
+                    dataSource: holding.assetProfile.dataSource,
                     holdingDetailDialog: true,
-                    symbol: holding.symbol
+                    symbol: holding.assetProfile.symbol
                   }"
                   [routerLink]="[]"
                 >
-                  <div class="flex-grow-1 mr-2">{{ holding.name }}</div>
+                  <div class="flex-grow-1 mr-2">
+                    {{ holding.assetProfile.name }}
+                  </div>
                   <div class="d-flex justify-content-end">
                     <gf-value
                       class="justify-content-end"
@@ -359,13 +361,15 @@
                 <a
                   class="d-flex"
                   [queryParams]="{
-                    dataSource: holding.dataSource,
+                    dataSource: holding.assetProfile.dataSource,
                     holdingDetailDialog: true,
-                    symbol: holding.symbol
+                    symbol: holding.assetProfile.symbol
                   }"
                   [routerLink]="[]"
                 >
-                  <div class="flex-grow-1 mr-2">{{ holding.name }}</div>
+                  <div class="flex-grow-1 mr-2">
+                    {{ holding.assetProfile.name }}
+                  </div>
                   <div class="d-flex justify-content-end">
                     <gf-value
                       class="justify-content-end"
@@ -438,7 +442,7 @@
         </div>
         <gf-toggle
           class="d-none d-lg-block"
-          [defaultValue]="mode"
+          [defaultValue]="mode()"
           [isLoading]="false"
           [options]="modeOptions"
           (valueChange)="onChangeGroupBy($event.value)"
@@ -472,7 +476,7 @@
           [benchmarkDataItems]="investmentsByGroup"
           [benchmarkDataLabel]="investmentTimelineDataLabel"
           [currency]="user?.settings?.baseCurrency"
-          [groupBy]="mode"
+          [groupBy]="mode()"
           [isInPercentage]="
             hasImpersonationId || user.settings.isRestrictedView
           "
@@ -497,7 +501,7 @@
         </div>
         <gf-toggle
           class="d-none d-lg-block"
-          [defaultValue]="mode"
+          [defaultValue]="mode()"
           [isLoading]="false"
           [options]="modeOptions"
           (valueChange)="onChangeGroupBy($event.value)"
@@ -509,7 +513,7 @@
           [benchmarkDataItems]="dividendsByGroup"
           [benchmarkDataLabel]="dividendTimelineDataLabel"
           [currency]="user?.settings?.baseCurrency"
-          [groupBy]="mode"
+          [groupBy]="mode()"
           [isInPercentage]="
             hasImpersonationId || user.settings.isRestrictedView
           "

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

@@ -1,5 +1,5 @@
 import { UNKNOWN_KEY } from '@ghostfolio/common/config';
-import { prettifySymbol } from '@ghostfolio/common/helper';
+import { getCountryName, prettifySymbol } from '@ghostfolio/common/helper';
 import {
   InfoItem,
   PortfolioPosition,
@@ -9,6 +9,7 @@ import { hasPermission, permissions } from '@ghostfolio/common/permissions';
 import { Market } from '@ghostfolio/common/types';
 import { GfActivitiesTableComponent } from '@ghostfolio/ui/activities-table/activities-table.component';
 import { GfHoldingsTableComponent } from '@ghostfolio/ui/holdings-table/holdings-table.component';
+import { translate } from '@ghostfolio/ui/i18n';
 import { GfPortfolioProportionChartComponent } from '@ghostfolio/ui/portfolio-proportion-chart/portfolio-proportion-chart.component';
 import { DataService } from '@ghostfolio/ui/services';
 import { GfValueComponent } from '@ghostfolio/ui/value';
@@ -74,7 +75,10 @@ export class GfPublicPageComponent implements OnInit {
   };
   protected readonly pageSize = Number.MAX_SAFE_INTEGER;
   protected positions: {
-    [symbol: string]: Pick<PortfolioPosition, 'currency' | 'name'> & {
+    [symbol: string]: Pick<
+      PortfolioPosition['assetProfile'],
+      'currency' | 'name'
+    > & {
       value: number;
     };
   };
@@ -182,14 +186,14 @@ export class GfPublicPageComponent implements OnInit {
 
         if (position.assetProfile.countries.length > 0) {
           for (const country of position.assetProfile.countries) {
-            const { code, continent, name, weight } = country;
+            const { code, continent, weight } = country;
 
             if (this.continents[continent]?.value) {
               this.continents[continent].value +=
                 weight * (position.valueInBaseCurrency ?? 0);
             } else {
               this.continents[continent] = {
-                name: continent,
+                name: translate(continent),
                 value:
                   weight *
                   (this.publicPortfolioDetails.holdings[symbol]
@@ -202,7 +206,7 @@ export class GfPublicPageComponent implements OnInit {
                 weight * (position.valueInBaseCurrency ?? 0);
             } else {
               this.countries[code] = {
-                name,
+                name: getCountryName({ code }),
                 value:
                   weight *
                   (this.publicPortfolioDetails.holdings[symbol]
@@ -229,7 +233,7 @@ export class GfPublicPageComponent implements OnInit {
                 weight * (position.valueInBaseCurrency ?? 0);
             } else {
               this.sectors[name] = {
-                name,
+                name: translate(name),
                 value:
                   weight *
                   (this.publicPortfolioDetails.holdings[symbol]

apps/client/src/app/pages/resources/personal-finance-tools/product-page.component.ts

@@ -1,3 +1,4 @@
+import { getCountryName } from '@ghostfolio/common/helper';
 import { Product } from '@ghostfolio/common/interfaces';
 import { personalFinanceTools } from '@ghostfolio/common/personal-finance-tools';
 import { publicRoutes } from '@ghostfolio/common/routes/routes';
@@ -32,6 +33,7 @@ export class GfProductPageComponent implements OnInit {
   ) {}
 
   public ngOnInit() {
+    const locale = document.documentElement.lang;
     const { subscriptionOffer } = this.dataService.fetchInfo();
 
     this.price = subscriptionOffer?.price;
@@ -55,18 +57,23 @@ export class GfProductPageComponent implements OnInit {
         'Türkçe'
       ],
       name: 'Ghostfolio',
-      origin: $localize`Switzerland`,
+      origin: getCountryName({ locale, code: 'CH' }),
       regions: [$localize`Global`],
       slogan: 'Open Source Wealth Management',
       useAnonymously: true
     };
 
-    this.product2 = personalFinanceTools.find(({ key }) => {
+    this.product2 = {
-      return key === this.route.snapshot.data['key'];
+      ...personalFinanceTools.find(({ key }) => {
-    });
+        return key === this.route.snapshot.data['key'];
+      })
+    };
 
     if (this.product2.origin) {
-      this.product2.origin = translate(this.product2.origin);
+      this.product2.origin = getCountryName({
+        locale,
+        code: this.product2.origin
+      });
     }
 
     if (this.product2.regions) {