Simplify getHistorical() function response

apps/api/src/app/endpoints/data-providers/ghostfolio/ghostfolio.service.ts

@@ -171,7 +171,7 @@ export class GhostfolioService {
 
     try {
       const promises: Promise<{
-        [symbol: string]: { [date: string]: DataProviderHistoricalResponse };
+        [date: string]: DataProviderHistoricalResponse;
       }>[] = [];
 
       for (const dataProviderService of this.getDataProviderServices()) {
@@ -185,7 +185,7 @@ export class GhostfolioService {
               to
             })
             .then((historicalData) => {
-              result.historicalData = historicalData[symbol];
+              result.historicalData = historicalData;
 
               return historicalData;
             })

apps/api/src/services/data-provider/alpha-vantage/alpha-vantage.service.ts

@@ -70,7 +70,7 @@ export class AlphaVantageService
     symbol,
     to
   }: GetHistoricalParams): Promise<{
-    [symbol: string]: { [date: string]: DataProviderHistoricalResponse };
+    [date: string]: DataProviderHistoricalResponse;
   }> {
     try {
       const historicalData: {
@@ -83,11 +83,9 @@ export class AlphaVantageService
       );
 
       const response: {
-        [symbol: string]: { [date: string]: DataProviderHistoricalResponse };
+        [date: string]: DataProviderHistoricalResponse;
       } = {};
 
-      response[symbol] = {};
-
       for (const [key, timeSeries] of Object.entries(
         historicalData['Time Series (Digital Currency Daily)']
       ).sort()) {
@@ -95,7 +93,7 @@ export class AlphaVantageService
           isAfter(from, parse(key, DATE_FORMAT, new Date())) &&
           isBefore(to, parse(key, DATE_FORMAT, new Date()))
         ) {
-          response[symbol][key] = {
+          response[key] = {
             marketPrice: parseFloat(timeSeries['4a. close (USD)'])
           };
         }

apps/api/src/services/data-provider/coingecko/coingecko.service.ts

@@ -115,7 +115,7 @@ export class CoinGeckoService implements DataProviderInterface, OnModuleInit {
     symbol,
     to
   }: GetHistoricalParams): Promise<{
-    [symbol: string]: { [date: string]: DataProviderHistoricalResponse };
+    [date: string]: DataProviderHistoricalResponse;
   }> {
     try {
       const queryParams = new URLSearchParams({
@@ -143,13 +143,11 @@ export class CoinGeckoService implements DataProviderInterface, OnModuleInit {
       }
 
       const result: {
-        [symbol: string]: { [date: string]: DataProviderHistoricalResponse };
-      } = {
-        [symbol]: {}
-      };
+        [date: string]: DataProviderHistoricalResponse;
+      } = {};
 
       for (const [timestamp, marketPrice] of prices) {
-        result[symbol][format(fromUnixTime(timestamp / 1000), DATE_FORMAT)] = {
+        result[format(fromUnixTime(timestamp / 1000), DATE_FORMAT)] = {
           marketPrice
         };
       }

apps/api/src/services/data-provider/data-provider.service.ts

@@ -508,7 +508,7 @@ export class DataProviderService implements OnModuleInit {
                 requestTimeout: ms('30 seconds')
               })
               .then((data) => {
-                return { dataSource, symbol, data: data?.[symbol] };
+                return { data, dataSource, symbol };
               })
           );
         }

apps/api/src/services/data-provider/eod-historical-data/eod-historical-data.service.ts

@@ -147,7 +147,7 @@ export class EodHistoricalDataService
     symbol,
     to
   }: GetHistoricalParams): Promise<{
-    [symbol: string]: { [date: string]: DataProviderHistoricalResponse };
+    [date: string]: DataProviderHistoricalResponse;
   }> {
     symbol = this.convertToEodSymbol(symbol);
 
@@ -166,22 +166,19 @@ export class EodHistoricalDataService
         })
         .then((res) => res.json());
 
-      return response.reduce(
-        (result, { adjusted_close, date }) => {
-          if (isNumber(adjusted_close)) {
-            result[this.convertFromEodSymbol(symbol)][date] = {
-              marketPrice: adjusted_close
-            };
-          } else {
-            this.logger.error(
-              `Could not get historical market data for ${symbol} (${this.getName()}) at ${date}`
-            );
-          }
+      return response.reduce((result, { adjusted_close, date }) => {
+        if (isNumber(adjusted_close)) {
+          result[date] = {
+            marketPrice: adjusted_close
+          };
+        } else {
+          this.logger.error(
+            `Could not get historical market data for ${symbol} (${this.getName()}) at ${date}`
+          );
+        }
 
-          return result;
-        },
-        { [this.convertFromEodSymbol(symbol)]: {} }
-      );
+        return result;
+      }, {});
     } catch (error) {
       throw new Error(
         `Could not get historical market data for ${symbol} (${this.getName()}) from ${format(

apps/api/src/services/data-provider/financial-modeling-prep/financial-modeling-prep.service.ts

@@ -336,14 +336,12 @@ export class FinancialModelingPrepService
     symbol,
     to
   }: GetHistoricalParams): Promise<{
-    [symbol: string]: { [date: string]: DataProviderHistoricalResponse };
+    [date: string]: DataProviderHistoricalResponse;
   }> {
     const MAX_YEARS_PER_REQUEST = 5;
     const result: {
-      [symbol: string]: { [date: string]: DataProviderHistoricalResponse };
-    } = {
-      [symbol]: {}
-    };
+      [date: string]: DataProviderHistoricalResponse;
+    } = {};
 
     let currentFrom = from;
 
@@ -378,7 +376,7 @@ export class FinancialModelingPrepService
               isAfter(parseDate(date), currentFrom)) &&
             isBefore(parseDate(date), currentTo)
           ) {
-            result[symbol][date] = {
+            result[date] = {
               marketPrice: close
             };
           }

apps/api/src/services/data-provider/ghostfolio/ghostfolio.service.ts

@@ -172,7 +172,7 @@ export class GhostfolioService implements DataProviderInterface {
     symbol,
     to
   }: GetHistoricalParams): Promise<{
-    [symbol: string]: { [date: string]: DataProviderHistoricalResponse };
+    [date: string]: DataProviderHistoricalResponse;
   }> {
     try {
       const queryParams = new URLSearchParams({
@@ -198,9 +198,7 @@ export class GhostfolioService implements DataProviderInterface {
 
       const { historicalData } = (await response.json()) as HistoricalResponse;
 
-      return {
-        [symbol]: historicalData
-      };
+      return historicalData;
     } catch (error) {
       if (error?.status === StatusCodes.TOO_MANY_REQUESTS) {
         error.name = 'RequestError';

apps/api/src/services/data-provider/google-sheets/google-sheets.service.ts

@@ -60,7 +60,7 @@ export class GoogleSheetsService implements DataProviderInterface {
     symbol,
     to
   }: GetHistoricalParams): Promise<{
-    [symbol: string]: { [date: string]: DataProviderHistoricalResponse };
+    [date: string]: DataProviderHistoricalResponse;
   }> {
     try {
       const sheet = await this.getSheet({
@@ -85,9 +85,7 @@ export class GoogleSheetsService implements DataProviderInterface {
           historicalData[format(date, DATE_FORMAT)] = { marketPrice: close };
         });
 
-      return {
-        [symbol]: historicalData
-      };
+      return historicalData;
     } catch (error) {
       throw new Error(
         `Could not get historical market data for ${symbol} (${this.getName()}) from ${format(

apps/api/src/services/data-provider/interfaces/data-provider.interface.ts

@@ -35,8 +35,8 @@ export interface DataProviderInterface {
     symbol,
     to
   }: GetHistoricalParams): Promise<{
-    [symbol: string]: { [date: string]: DataProviderHistoricalResponse };
-  }>; // TODO: Return only one symbol
+    [date: string]: DataProviderHistoricalResponse;
+  }>;
 
   getMarketDataOfMarkets?({
     includeHistoricalData,

apps/api/src/services/data-provider/manual/manual.service.ts

@@ -79,7 +79,7 @@ export class ManualService implements DataProviderInterface {
     symbol,
     to
   }: GetHistoricalParams): Promise<{
-    [symbol: string]: { [date: string]: DataProviderHistoricalResponse };
+    [date: string]: DataProviderHistoricalResponse;
   }> {
     try {
       const [symbolProfile] = await this.symbolProfileService.getSymbolProfiles(
@@ -90,14 +90,13 @@ export class ManualService implements DataProviderInterface {
 
       if (defaultMarketPrice) {
         const historical: {
-          [symbol: string]: { [date: string]: DataProviderHistoricalResponse };
-        } = {
-          [symbol]: {}
-        };
+          [date: string]: DataProviderHistoricalResponse;
+        } = {};
+
         let date = from;
 
         while (isBefore(date, to)) {
-          historical[symbol][format(date, DATE_FORMAT)] = {
+          historical[format(date, DATE_FORMAT)] = {
             marketPrice: defaultMarketPrice
           };
 
@@ -115,10 +114,8 @@ export class ManualService implements DataProviderInterface {
       });
 
       return {
-        [symbol]: {
-          [format(getYesterday(), DATE_FORMAT)]: {
-            marketPrice: value
-          }
+        [format(getYesterday(), DATE_FORMAT)]: {
+          marketPrice: value
         }
       };
     } catch (error) {

apps/api/src/services/data-provider/rapid-api/rapid-api.service.ts

@@ -58,7 +58,7 @@ export class RapidApiService implements DataProviderInterface {
     symbol,
     to
   }: GetHistoricalParams): Promise<{
-    [symbol: string]: { [date: string]: DataProviderHistoricalResponse };
+    [date: string]: DataProviderHistoricalResponse;
   }> {
     try {
       if (symbol === ghostfolioFearAndGreedIndexSymbolStocks) {
@@ -66,10 +66,8 @@ export class RapidApiService implements DataProviderInterface {
 
         if (fgi) {
           return {
-            [symbol]: {
-              [format(getYesterday(), DATE_FORMAT)]: {
-                marketPrice: fgi.previousClose.value
-              }
+            [format(getYesterday(), DATE_FORMAT)]: {
+              marketPrice: fgi.previousClose.value
             }
           };
         }

apps/api/src/services/data-provider/yahoo-finance/yahoo-finance.service.ts

@@ -123,7 +123,7 @@ export class YahooFinanceService implements DataProviderInterface {
     symbol,
     to
   }: GetHistoricalParams): Promise<{
-    [symbol: string]: { [date: string]: DataProviderHistoricalResponse };
+    [date: string]: DataProviderHistoricalResponse;
   }> {
     if (isSameDay(from, to)) {
       to = addDays(to, 1);
@@ -144,13 +144,11 @@ export class YahooFinanceService implements DataProviderInterface {
       );
 
       const response: {
-        [symbol: string]: { [date: string]: DataProviderHistoricalResponse };
+        [date: string]: DataProviderHistoricalResponse;
       } = {};
 
-      response[symbol] = {};
-
       for (const historicalItem of historicalResult) {
-        response[symbol][format(historicalItem.date, DATE_FORMAT)] = {
+        response[format(historicalItem.date, DATE_FORMAT)] = {
           marketPrice: historicalItem.close
         };
       }