Open Source Wealth Management Software. Angular + NestJS + Prisma + Nx + TypeScript 🤍
TypeScript angularetffinancefintechghostfoliohacktoberfestinvestingnestjsosspersonal-financeportfolioprismasoftwarestocktrackertradingtypescriptwealth-managementweb
Feature/format name in eod historical data service (#2922)
Thomas Kaul8f5f4c587536
diff --git a/CHANGELOG.md b/CHANGELOG.mdindex 6752784fa0..9b16b7b8f4 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+- Formatted the name in the _EOD Historical Data_ service- Improved the language localization for German (`de`)### Fixeddiff --git a/apps/api/src/services/data-provider/data-enhancer/yahoo-finance/yahoo-finance.service.ts b/apps/api/src/services/data-provider/data-enhancer/yahoo-finance/yahoo-finance.service.tsindex 930e0c7f1e..f2a1361510 100644--- a/apps/api/src/services/data-provider/data-enhancer/yahoo-finance/yahoo-finance.service.ts+++ b/apps/api/src/services/data-provider/data-enhancer/yahoo-finance/yahoo-finance.service.ts@@ -1,7 +1,11 @@import { ConfigurationService } from '@ghostfolio/api/services/configuration/configuration.service';import { CryptocurrencyService } from '@ghostfolio/api/services/cryptocurrency/cryptocurrency.service';import { DataEnhancerInterface } from '@ghostfolio/api/services/data-provider/interfaces/data-enhancer.interface';-import { DEFAULT_CURRENCY, UNKNOWN_KEY } from '@ghostfolio/common/config';+import {+ DEFAULT_CURRENCY,+ REPLACE_NAME_PARTS,+ UNKNOWN_KEY+} from '@ghostfolio/common/config';import { isCurrency } from '@ghostfolio/common/helper';import { Injectable, Logger } from '@nestjs/common';import {@@ -137,18 +141,11 @@ export class YahooFinanceDataEnhancerService implements DataEnhancerInterface {if (name) {name = name.replace('&', '&');- name = name.replace('Amundi Index Solutions - ', '');- name = name.replace('iShares ETF (CH) - ', '');- name = name.replace('iShares III Public Limited Company - ', '');- name = name.replace('iShares V PLC - ', '');- name = name.replace('iShares VI Public Limited Company - ', '');- name = name.replace('iShares VII PLC - ', '');- name = name.replace('Multi Units Luxembourg - ', '');- name = name.replace('VanEck ETFs N.V. - ', '');- name = name.replace('Vaneck Vectors Ucits Etfs Plc - ', '');- name = name.replace('Vanguard Funds Public Limited Company - ', '');- name = name.replace('Vanguard Index Funds - ', '');- name = name.replace('Xtrackers (IE) Plc - ', '');+ for (const part of REPLACE_NAME_PARTS) {+ name = name.replace(part, '');+ }++ name = name.trim();}if (quoteType === 'FUTURE') {diff --git a/apps/api/src/services/data-provider/eod-historical-data/eod-historical-data.service.ts b/apps/api/src/services/data-provider/eod-historical-data/eod-historical-data.service.tsindex 39457320fc..bcff104c01 100644--- a/apps/api/src/services/data-provider/eod-historical-data/eod-historical-data.service.ts+++ b/apps/api/src/services/data-provider/eod-historical-data/eod-historical-data.service.ts@@ -11,7 +11,10 @@ import {IDataProviderHistoricalResponse,IDataProviderResponse} from '@ghostfolio/api/services/interfaces/interfaces';-import { DEFAULT_CURRENCY } from '@ghostfolio/common/config';+import {+ DEFAULT_CURRENCY,+ REPLACE_NAME_PARTS+} from '@ghostfolio/common/config';import { DATE_FORMAT, isCurrency } from '@ghostfolio/common/helper';import { Injectable, Logger } from '@nestjs/common';import {@@ -362,6 +365,18 @@ export class EodHistoricalDataService implements DataProviderInterface {return aSymbol;}+ private formatName({ name }: { name: string }) {+ if (name) {+ for (const part of REPLACE_NAME_PARTS) {+ name = name.replace(part, '');+ }++ name = name.trim();+ }++ return name;+ }+private async getSearchResult(aQuery: string): Promise<(LookupItem & {assetClass: AssetClass;@@ -397,9 +412,9 @@ export class EodHistoricalDataService implements DataProviderInterface {assetClass,assetSubClass,isin,- name,currency: this.convertCurrency(Currency),dataSource: this.getName(),+ name: this.formatName({ name }),symbol: `${Code}.${Exchange}`};}diff --git a/libs/common/src/lib/config.ts b/libs/common/src/lib/config.tsindex df89ae9e96..b93d22f457 100644--- a/libs/common/src/lib/config.ts+++ b/libs/common/src/lib/config.ts@@ -112,6 +112,21 @@ export const QUEUE_JOB_STATUS_LIST = <JobStatus[]>['waiting'];+export const REPLACE_NAME_PARTS = [+ 'Amundi Index Solutions -',+ 'iShares ETF (CH) -',+ 'iShares III Public Limited Company -',+ 'iShares V PLC -',+ 'iShares VI Public Limited Company -',+ 'iShares VII PLC -',+ 'Multi Units Luxembourg -',+ 'VanEck ETFs N.V. -',+ 'Vaneck Vectors Ucits Etfs Plc -',+ 'Vanguard Funds Public Limited Company -',+ 'Vanguard Index Funds -',+ 'Xtrackers (IE) Plc -'+];+export const SUPPORTED_LANGUAGE_CODES = ['de','en',