Open Source Wealth Management Software. Angular + NestJS + Prisma + Nx + TypeScript 🤍
TypeScript angularetffinancefintechghostfoliohacktoberfestinvestingnestjsosspersonal-financeportfolioprismasoftwarestocktrackertradingtypescriptwealth-managementweb
Bugfix/fix currency conversion in accounts (#937)
Thomas Kaulaf0863d19324
diff --git a/CHANGELOG.md b/CHANGELOG.mdindex 1c03e17d65..9de36b5433 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### Fixed+- Fixed an issue with the currency conversion in the account calculations- Fixed an issue with countries in the symbol profile overrides## 1.149.0 - 16.05.2022diff --git a/apps/api/src/app/portfolio/current-rate.service.mock.ts b/apps/api/src/app/portfolio/current-rate.service.mock.tsindex c91ed9d9af..9246ffc73e 100644--- a/apps/api/src/app/portfolio/current-rate.service.mock.ts+++ b/apps/api/src/app/portfolio/current-rate.service.mock.ts@@ -1,6 +1,7 @@import { parseDate, resetHours } from '@ghostfolio/common/helper';import { addDays, endOfDay, isBefore, isSameDay } from 'date-fns';+import { GetValueObject } from './interfaces/get-value-object.interface';import { GetValuesParams } from './interfaces/get-values-params.interface';function mockGetValue(symbol: string, date: Date) {@@ -33,8 +34,11 @@ function mockGetValue(symbol: string, date: Date) {}export const CurrentRateServiceMock = {- getValues: ({ dataGatheringItems, dateQuery }: GetValuesParams) => {- const result = [];+ getValues: ({+ dataGatheringItems,+ dateQuery+ }: GetValuesParams): Promise<GetValueObject[]> => {+ const result: GetValueObject[] = [];if (dateQuery.lt) {for (let date = resetHours(dateQuery.gte);@@ -44,8 +48,10 @@ export const CurrentRateServiceMock = {for (const dataGatheringItem of dataGatheringItems) {result.push({date,- marketPrice: mockGetValue(dataGatheringItem.symbol, date)- .marketPrice,+ marketPriceInBaseCurrency: mockGetValue(+ dataGatheringItem.symbol,+ date+ ).marketPrice,symbol: dataGatheringItem.symbol});}@@ -55,8 +61,10 @@ export const CurrentRateServiceMock = {for (const dataGatheringItem of dataGatheringItems) {result.push({date,- marketPrice: mockGetValue(dataGatheringItem.symbol, date)- .marketPrice,+ marketPriceInBaseCurrency: mockGetValue(+ dataGatheringItem.symbol,+ date+ ).marketPrice,symbol: dataGatheringItem.symbol});}diff --git a/apps/api/src/app/portfolio/current-rate.service.spec.ts b/apps/api/src/app/portfolio/current-rate.service.spec.tsindex ca45483e12..653cdc7dcf 100644--- a/apps/api/src/app/portfolio/current-rate.service.spec.ts+++ b/apps/api/src/app/portfolio/current-rate.service.spec.ts@@ -4,6 +4,7 @@ import { MarketDataService } from '@ghostfolio/api/services/market-data.service'import { DataSource, MarketData } from '@prisma/client';import { CurrentRateService } from './current-rate.service';+import { GetValueObject } from './interfaces/get-value-object.interface';jest.mock('@ghostfolio/api/services/market-data.service', () => {return {@@ -96,15 +97,15 @@ describe('CurrentRateService', () => {},userCurrency: 'CHF'})- ).toMatchObject([+ ).toMatchObject<GetValueObject[]>([{date: undefined,- marketPrice: 1841.823902,+ marketPriceInBaseCurrency: 1841.823902,symbol: 'AMZN'},{date: undefined,- marketPrice: 1847.839966,+ marketPriceInBaseCurrency: 1847.839966,symbol: 'AMZN'}]);diff --git a/apps/api/src/app/portfolio/current-rate.service.ts b/apps/api/src/app/portfolio/current-rate.service.tsindex 0549596ce1..86020ce2e7 100644--- a/apps/api/src/app/portfolio/current-rate.service.ts+++ b/apps/api/src/app/portfolio/current-rate.service.ts@@ -28,13 +28,7 @@ export class CurrentRateService {(!dateQuery.gte || isBefore(dateQuery.gte, new Date())) &&(!dateQuery.in || this.containsToday(dateQuery.in));- const promises: Promise<- {- date: Date;- marketPrice: number;- symbol: string;- }[]- >[] = [];+ const promises: Promise<GetValueObject[]>[] = [];if (includeToday) {const today = resetHours(new Date());@@ -42,16 +36,17 @@ export class CurrentRateService {this.dataProviderService.getQuotes(dataGatheringItems).then((dataResultProvider) => {- const result = [];+ const result: GetValueObject[] = [];for (const dataGatheringItem of dataGatheringItems) {result.push({date: today,- marketPrice: this.exchangeRateDataService.toCurrency(- dataResultProvider?.[dataGatheringItem.symbol]?.marketPrice ??- 0,- dataResultProvider?.[dataGatheringItem.symbol]?.currency,- userCurrency- ),+ marketPriceInBaseCurrency:+ this.exchangeRateDataService.toCurrency(+ dataResultProvider?.[dataGatheringItem.symbol]+ ?.marketPrice ?? 0,+ dataResultProvider?.[dataGatheringItem.symbol]?.currency,+ userCurrency+ ),symbol: dataGatheringItem.symbol});}@@ -74,11 +69,12 @@ export class CurrentRateService {return data.map((marketDataItem) => {return {date: marketDataItem.date,- marketPrice: this.exchangeRateDataService.toCurrency(- marketDataItem.marketPrice,- currencies[marketDataItem.symbol],- userCurrency- ),+ marketPriceInBaseCurrency:+ this.exchangeRateDataService.toCurrency(+ marketDataItem.marketPrice,+ currencies[marketDataItem.symbol],+ userCurrency+ ),symbol: marketDataItem.symbol};});diff --git a/apps/api/src/app/portfolio/interfaces/get-value-object.interface.ts b/apps/api/src/app/portfolio/interfaces/get-value-object.interface.tsindex 8072a5ea60..e67aca6199 100644--- a/apps/api/src/app/portfolio/interfaces/get-value-object.interface.ts+++ b/apps/api/src/app/portfolio/interfaces/get-value-object.interface.ts@@ -1,5 +1,5 @@export interface GetValueObject {date: Date;- marketPrice: number;+ marketPriceInBaseCurrency: number;symbol: string;}diff --git a/apps/api/src/app/portfolio/portfolio-calculator.ts b/apps/api/src/app/portfolio/portfolio-calculator.tsindex 4f8631a3fe..555ad1cab0 100644--- a/apps/api/src/app/portfolio/portfolio-calculator.ts+++ b/apps/api/src/app/portfolio/portfolio-calculator.ts@@ -231,9 +231,9 @@ export class PortfolioCalculator {if (!marketSymbolMap[date]) {marketSymbolMap[date] = {};}- if (marketSymbol.marketPrice) {+ if (marketSymbol.marketPriceInBaseCurrency) {marketSymbolMap[date][marketSymbol.symbol] = new Big(- marketSymbol.marketPrice+ marketSymbol.marketPriceInBaseCurrency);}}@@ -548,9 +548,9 @@ export class PortfolioCalculator {if (!marketSymbolMap[date]) {marketSymbolMap[date] = {};}- if (marketSymbol.marketPrice) {+ if (marketSymbol.marketPriceInBaseCurrency) {marketSymbolMap[date][marketSymbol.symbol] = new Big(- marketSymbol.marketPrice+ marketSymbol.marketPriceInBaseCurrency);}}diff --git a/apps/api/src/app/portfolio/portfolio.service.ts b/apps/api/src/app/portfolio/portfolio.service.tsindex 409a40017f..840c17f427 100644--- a/apps/api/src/app/portfolio/portfolio.service.ts+++ b/apps/api/src/app/portfolio/portfolio.service.ts@@ -462,8 +462,9 @@ export class PortfolioService {const accounts = await this.getValueOfAccounts({orders,- userId,portfolioItemsNow,+ userCurrency,+ userId,filters: aFilters});@@ -899,7 +900,8 @@ export class PortfolioService {const accounts = await this.getValueOfAccounts({orders,portfolioItemsNow,- userId+ userId,+ userCurrency: currency});return {rules: {@@ -1268,11 +1270,13 @@ export class PortfolioService {filters = [],orders,portfolioItemsNow,+ userCurrency,userId}: {filters?: Filter[];orders: OrderWithAccount[];portfolioItemsNow: { [p: string]: TimelinePosition };+ userCurrency: string;userId: string;}) {const accounts: PortfolioDetails['accounts'] = {};@@ -1301,34 +1305,47 @@ export class PortfolioService {accounts[account.id] = {balance: account.balance,currency: account.currency,- current: account.balance,+ current: this.exchangeRateDataService.toCurrency(+ account.balance,+ account.currency,+ userCurrency+ ),name: account.name,- original: account.balance+ original: this.exchangeRateDataService.toCurrency(+ account.balance,+ account.currency,+ userCurrency+ )};for (const order of ordersByAccount) {- let currentValueOfSymbol =+ let currentValueOfSymbolInBaseCurrency =order.quantity *portfolioItemsNow[order.SymbolProfile.symbol].marketPrice;- let originalValueOfSymbol = order.quantity * order.unitPrice;+ let originalValueOfSymbolInBaseCurrency =+ this.exchangeRateDataService.toCurrency(+ order.quantity * order.unitPrice,+ order.SymbolProfile.currency,+ userCurrency+ );if (order.type === 'SELL') {- currentValueOfSymbol *= -1;- originalValueOfSymbol *= -1;+ currentValueOfSymbolInBaseCurrency *= -1;+ originalValueOfSymbolInBaseCurrency *= -1;}if (accounts[order.Account?.id || UNKNOWN_KEY]?.current) {accounts[order.Account?.id || UNKNOWN_KEY].current +=- currentValueOfSymbol;+ currentValueOfSymbolInBaseCurrency;accounts[order.Account?.id || UNKNOWN_KEY].original +=- originalValueOfSymbol;+ originalValueOfSymbolInBaseCurrency;} else {accounts[order.Account?.id || UNKNOWN_KEY] = {balance: 0,currency: order.Account?.currency,- current: currentValueOfSymbol,+ current: currentValueOfSymbolInBaseCurrency,name: account.name,- original: originalValueOfSymbol+ original: originalValueOfSymbolInBaseCurrency};}}