Open Source Wealth Management Software. Angular + NestJS + Prisma + Nx + TypeScript 🤍
TypeScript angularetffinancefintechghostfoliohacktoberfestinvestingnestjsosspersonal-financeportfolioprismasoftwarestocktrackertradingtypescriptwealth-managementweb
Feature/migrate i18n service to injectable service (#4829)
Tobias Kugel3bcb19af1436
diff --git a/CHANGELOG.md b/CHANGELOG.mdindex c09a4d16d1..51597cd605 100644--- a/CHANGELOG.md+++ b/CHANGELOG.md@@ -13,6 +13,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0### Changed+- Migrated the `i18n` service to use `@Injectable()`- Improved the language localization for German (`de`)- Upgraded `nestjs` from version `11.1.0` to `11.1.3`diff --git a/apps/api/src/app/endpoints/ai/ai.module.ts b/apps/api/src/app/endpoints/ai/ai.module.tsindex b6f9941adf..42480efd78 100644--- a/apps/api/src/app/endpoints/ai/ai.module.ts+++ b/apps/api/src/app/endpoints/ai/ai.module.ts@@ -12,6 +12,7 @@ import { BenchmarkModule } from '@ghostfolio/api/services/benchmark/benchmark.moimport { ConfigurationModule } from '@ghostfolio/api/services/configuration/configuration.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 { I18nModule } from '@ghostfolio/api/services/i18n/i18n.module';import { ImpersonationModule } from '@ghostfolio/api/services/impersonation/impersonation.module';import { MarketDataModule } from '@ghostfolio/api/services/market-data/market-data.module';import { MarketDataService } from '@ghostfolio/api/services/market-data/market-data.service';@@ -32,6 +33,7 @@ import { AiService } from './ai.service';ConfigurationModule,DataProviderModule,ExchangeRateDataModule,+ I18nModule,ImpersonationModule,MarketDataModule,OrderModule,diff --git a/apps/api/src/app/endpoints/benchmarks/benchmarks.module.ts b/apps/api/src/app/endpoints/benchmarks/benchmarks.module.tsindex a0f4436213..8bdf790357 100644--- a/apps/api/src/app/endpoints/benchmarks/benchmarks.module.ts+++ b/apps/api/src/app/endpoints/benchmarks/benchmarks.module.ts@@ -15,6 +15,7 @@ import { BenchmarkService } from '@ghostfolio/api/services/benchmark/benchmark.simport { ConfigurationModule } from '@ghostfolio/api/services/configuration/configuration.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 { I18nModule } from '@ghostfolio/api/services/i18n/i18n.module';import { ImpersonationModule } from '@ghostfolio/api/services/impersonation/impersonation.module';import { MarketDataModule } from '@ghostfolio/api/services/market-data/market-data.module';import { MarketDataService } from '@ghostfolio/api/services/market-data/market-data.service';@@ -35,6 +36,7 @@ import { BenchmarksService } from './benchmarks.service';ConfigurationModule,DataProviderModule,ExchangeRateDataModule,+ I18nModule,ImpersonationModule,MarketDataModule,OrderModule,diff --git a/apps/api/src/app/endpoints/public/public.module.ts b/apps/api/src/app/endpoints/public/public.module.tsindex cf4fd3d18e..19e281dde2 100644--- a/apps/api/src/app/endpoints/public/public.module.ts+++ b/apps/api/src/app/endpoints/public/public.module.ts@@ -12,6 +12,7 @@ import { TransformDataSourceInRequestModule } from '@ghostfolio/api/interceptorsimport { 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 { I18nModule } from '@ghostfolio/api/services/i18n/i18n.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';@@ -29,6 +30,7 @@ import { PublicController } from './public.controller';BenchmarkModule,DataProviderModule,ExchangeRateDataModule,+ I18nModule,ImpersonationModule,MarketDataModule,OrderModule,diff --git a/apps/api/src/app/portfolio/portfolio.module.ts b/apps/api/src/app/portfolio/portfolio.module.tsindex 0f64b2f6a1..6dd5811a37 100644--- a/apps/api/src/app/portfolio/portfolio.module.ts+++ b/apps/api/src/app/portfolio/portfolio.module.ts@@ -13,6 +13,7 @@ import { BenchmarkModule } from '@ghostfolio/api/services/benchmark/benchmark.moimport { ConfigurationModule } from '@ghostfolio/api/services/configuration/configuration.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 { I18nModule } from '@ghostfolio/api/services/i18n/i18n.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';@@ -39,6 +40,7 @@ import { RulesService } from './rules.service';DataGatheringModule,DataProviderModule,ExchangeRateDataModule,+ I18nModule,ImpersonationModule,MarketDataModule,OrderModule,diff --git a/apps/api/src/app/portfolio/portfolio.service.ts b/apps/api/src/app/portfolio/portfolio.service.tsindex eb6abc224f..a43499e5bf 100644--- a/apps/api/src/app/portfolio/portfolio.service.ts+++ b/apps/api/src/app/portfolio/portfolio.service.ts@@ -23,6 +23,7 @@ import { RegionalMarketClusterRiskNorthAmerica } from '@ghostfolio/api/models/ruimport { 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 { I18nService } from '@ghostfolio/api/services/i18n/i18n.service';import { ImpersonationService } from '@ghostfolio/api/services/impersonation/impersonation.service';import { SymbolProfileService } from '@ghostfolio/api/services/symbol-profile/symbol-profile.service';import {@@ -105,6 +106,7 @@ export class PortfolioService {private readonly calculatorFactory: PortfolioCalculatorFactory,private readonly dataProviderService: DataProviderService,private readonly exchangeRateDataService: ExchangeRateDataService,+ private readonly i18nService: I18nService,private readonly impersonationService: ImpersonationService,private readonly orderService: OrderService,@Inject(REQUEST) private readonly request: RequestWithUser,@@ -1319,6 +1321,7 @@ export class PortfolioService {[new EmergencyFundSetup(this.exchangeRateDataService,+ this.i18nService,userSettings.language,this.getTotalEmergencyFund({userSettings,@@ -1333,6 +1336,7 @@ export class PortfolioService {[new FeeRatioInitialInvestment(this.exchangeRateDataService,+ this.i18nService,userSettings.language,summary.committedFunds,summary.feesdiff --git a/apps/api/src/app/user/user.module.ts b/apps/api/src/app/user/user.module.tsindex 063cfef826..8a21b0a555 100644--- a/apps/api/src/app/user/user.module.ts+++ b/apps/api/src/app/user/user.module.ts@@ -1,6 +1,7 @@import { OrderModule } from '@ghostfolio/api/app/order/order.module';import { SubscriptionModule } from '@ghostfolio/api/app/subscription/subscription.module';import { ConfigurationModule } from '@ghostfolio/api/services/configuration/configuration.module';+import { I18nModule } from '@ghostfolio/api/services/i18n/i18n.module';import { PrismaModule } from '@ghostfolio/api/services/prisma/prisma.module';import { PropertyModule } from '@ghostfolio/api/services/property/property.module';import { TagModule } from '@ghostfolio/api/services/tag/tag.module';@@ -16,6 +17,7 @@ import { UserService } from './user.service';exports: [UserService],imports: [ConfigurationModule,+ I18nModule,JwtModule.register({secret: process.env.JWT_SECRET_KEY,signOptions: { expiresIn: '30 days' }diff --git a/apps/api/src/app/user/user.service.ts b/apps/api/src/app/user/user.service.tsindex 21790182fb..4b04647b59 100644--- a/apps/api/src/app/user/user.service.ts+++ b/apps/api/src/app/user/user.service.ts@@ -52,11 +52,10 @@ import { sortBy, without } from 'lodash';@Injectable()export class UserService {- private i18nService = new I18nService();-public constructor(private readonly configurationService: ConfigurationService,private readonly eventEmitter: EventEmitter2,+ private readonly i18nService: I18nService,private readonly orderService: OrderService,private readonly prismaService: PrismaService,private readonly propertyService: PropertyService,@@ -298,6 +297,7 @@ export class UserService {undefined).getSettings(user.Settings.settings),EmergencyFundSetup: new EmergencyFundSetup(+ undefined,undefined,undefined,undefined@@ -306,6 +306,7 @@ export class UserService {undefined,undefined,undefined,+ undefined,undefined).getSettings(user.Settings.settings),RegionalMarketClusterRiskAsiaPacific:diff --git a/apps/api/src/models/rules/emergency-fund/emergency-fund-setup.ts b/apps/api/src/models/rules/emergency-fund/emergency-fund-setup.tsindex a91e684250..67c0f297e6 100644--- a/apps/api/src/models/rules/emergency-fund/emergency-fund-setup.ts+++ b/apps/api/src/models/rules/emergency-fund/emergency-fund-setup.ts@@ -6,10 +6,10 @@ import { UserSettings } from '@ghostfolio/common/interfaces';export class EmergencyFundSetup extends Rule<Settings> {private emergencyFund: number;- private i18nService = new I18nService();public constructor(protected exchangeRateDataService: ExchangeRateDataService,+ private i18nService: I18nService,languageCode: string,emergencyFund: number) {diff --git a/apps/api/src/models/rules/fees/fee-ratio-initial-investment.ts b/apps/api/src/models/rules/fees/fee-ratio-initial-investment.tsindex 4298eed44d..89fe32dbf6 100644--- a/apps/api/src/models/rules/fees/fee-ratio-initial-investment.ts+++ b/apps/api/src/models/rules/fees/fee-ratio-initial-investment.ts@@ -6,11 +6,11 @@ import { UserSettings } from '@ghostfolio/common/interfaces';export class FeeRatioInitialInvestment extends Rule<Settings> {private fees: number;- private i18nService = new I18nService();private totalInvestment: number;public constructor(protected exchangeRateDataService: ExchangeRateDataService,+ private i18nService: I18nService,languageCode: string,totalInvestment: number,fees: numberdiff --git a/apps/api/src/services/i18n/i18n.module.ts b/apps/api/src/services/i18n/i18n.module.tsnew file mode 100644index 0000000000..68211de40e--- /dev/null+++ b/apps/api/src/services/i18n/i18n.module.ts@@ -0,0 +1,9 @@+import { Module } from '@nestjs/common';++import { I18nService } from './i18n.service';++@Module({+ exports: [I18nService],+ providers: [I18nService]+})+export class I18nModule {}diff --git a/apps/api/src/services/i18n/i18n.service.ts b/apps/api/src/services/i18n/i18n.service.tsindex 533abf2e23..a0389ab366 100644--- a/apps/api/src/services/i18n/i18n.service.ts+++ b/apps/api/src/services/i18n/i18n.service.ts@@ -1,10 +1,11 @@import { DEFAULT_LANGUAGE_CODE } from '@ghostfolio/common/config';-import { Logger } from '@nestjs/common';+import { Injectable, Logger } from '@nestjs/common';import * as cheerio from 'cheerio';import { readFileSync, readdirSync } from 'fs';import { join } from 'path';+@Injectable()export class I18nService {private localesPath = join(__dirname, 'assets', 'locales');private translations: { [locale: string]: cheerio.CheerioAPI } = {};