Refactoring

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 - ', '');
+      for (const part of REPLACE_NAME_PARTS) {
-      name = name.replace('iShares ETF (CH) - ', '');
+        name = name.replace(part, '');
-      name = name.replace('iShares III Public Limited Company - ', '');
+      }
-      name = name.replace('iShares V PLC - ', '');
+
-      name = name.replace('iShares VI Public Limited Company - ', '');
+      name = name.trim();
-      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 - ', '');
     }
 
     if (quoteType === 'FUTURE') {

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 {
@@ -364,7 +367,11 @@ export class EodHistoricalDataService implements DataProviderInterface {
 
   private formatName({ name }: { name: string }) {
     if (name) {
-      name = name.replace('iShares VII PLC - ', '');
+      for (const part of REPLACE_NAME_PARTS) {
+        name = name.replace(part, '');
+      }
+
+      name = name.trim();
     }
 
     return name;

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',