From 671e4e316b3db329b2ba53ecd2d25acf35acdcd7 Mon Sep 17 00:00:00 2001
From: Thomas Kaul <4159106+dtslvr@users.noreply.github.com>
Date: Tue, 12 Mar 2024 20:50:32 +0100
Subject: [PATCH] Release 2.63.2 (#3138)

---
 CHANGELOG.md                                  |  2 +-
 .../eod-historical-data.service.ts            | 76 +++++++++++--------
 package.json                                  |  2 +-
 3 files changed, 47 insertions(+), 33 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0877bcf74..6f1c07500 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,7 +5,7 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## 2.63.1 - 2024-03-11
+## 2.63.2 - 2024-03-12
 
 ### Added
 
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.ts
index d8e7a2e0b..99104a78d 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,6 +11,7 @@ import {
   IDataProviderHistoricalResponse,
   IDataProviderResponse
 } from '@ghostfolio/api/services/interfaces/interfaces';
+import { SymbolProfileService } from '@ghostfolio/api/services/symbol-profile/symbol-profile.service';
 import {
   DEFAULT_CURRENCY,
   REPLACE_NAME_PARTS
@@ -35,7 +36,8 @@ export class EodHistoricalDataService implements DataProviderInterface {
   private readonly URL = 'https://eodhistoricaldata.com/api';
 
   public constructor(
-    private readonly configurationService: ConfigurationService
+    private readonly configurationService: ConfigurationService,
+    private readonly symbolProfileService: SymbolProfileService
   ) {
     this.apiKey = this.configurationService.get('API_KEY_EOD_HISTORICAL_DATA');
   }
@@ -230,41 +232,53 @@ export class EodHistoricalDataService implements DataProviderInterface {
           ? [realTimeResponse]
           : realTimeResponse;
 
-      response = quotes.reduce(
-        async (
-          result: { [symbol: string]: IDataProviderResponse },
-          { close, code, timestamp }
-        ) => {
-          let currency: string;
+      const symbolProfiles = await this.symbolProfileService.getSymbolProfiles(
+        symbols.map((symbol) => {
+          return {
+            symbol,
+            dataSource: this.getName()
+          };
+        })
+      );
 
-          if (symbols.length === 1) {
-            const { items } = await this.search({ query: symbols[0] });
+      for (const { close, code, timestamp } of quotes) {
+        let currency: string;
 
-            if (items.length === 1) {
-              currency = items[0].currency;
-            }
-          }
+        if (code.endsWith('.FOREX')) {
+          currency = this.convertFromEodSymbol(code)?.replace(
+            DEFAULT_CURRENCY,
+            ''
+          );
+        }
 
-          if (isNumber(close)) {
-            result[this.convertFromEodSymbol(code)] = {
-              currency,
-              dataSource: this.getName(),
-              marketPrice: close,
-              marketState: isToday(new Date(timestamp * 1000))
-                ? 'open'
-                : 'closed'
-            };
-          } else {
-            Logger.error(
-              `Could not get quote for ${this.convertFromEodSymbol(code)} (${this.getName()})`,
-              'EodHistoricalDataService'
-            );
+        if (!currency) {
+          currency = symbolProfiles.find(({ symbol }) => {
+            return symbol === code;
+          })?.currency;
+        }
+
+        if (!currency) {
+          const { items } = await this.search({ query: code });
+
+          if (items.length === 1) {
+            currency = items[0].currency;
           }
+        }
 
-          return result;
-        },
-        {}
-      );
+        if (isNumber(close)) {
+          response[this.convertFromEodSymbol(code)] = {
+            currency,
+            dataSource: this.getName(),
+            marketPrice: close,
+            marketState: isToday(new Date(timestamp * 1000)) ? 'open' : 'closed'
+          };
+        } else {
+          Logger.error(
+            `Could not get quote for ${this.convertFromEodSymbol(code)} (${this.getName()})`,
+            'EodHistoricalDataService'
+          );
+        }
+      }
 
       return response;
     } catch (error) {
diff --git a/package.json b/package.json
index 579c4151e..c32114cf4 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ghostfolio",
-  "version": "2.63.1",
+  "version": "2.63.2",
   "homepage": "https://ghostfol.io",
   "license": "AGPL-3.0",
   "repository": "https://github.com/ghostfolio/ghostfolio",