Clean up

apps/api/src/services/exchange-rate-data/exchange-rate-data.service.ts

@@ -383,111 +383,105 @@ export class ExchangeRateDataService {
       return factors;
     }
 
-    {
-      const dataSource =
-        this.dataProviderService.getDataSourceForExchangeRates();
-      const symbol = `${currencyFrom}${currencyTo}`;
+    const dataSource = this.dataProviderService.getDataSourceForExchangeRates();
+    const symbol = `${currencyFrom}${currencyTo}`;
+
+    const marketData = await this.marketDataService.getRange({
+      assetProfileIdentifiers: [
+        {
+          dataSource,
+          symbol
+        }
+      ],
+      dateQuery: { gte: startDate, lt: endDate }
+    });
 
-      const marketData = await this.marketDataService.getRange({
-        assetProfileIdentifiers: [
-          {
-            dataSource,
-            symbol
+    if (marketData?.length > 0) {
+      for (const { date, marketPrice } of marketData) {
+        factors[format(date, DATE_FORMAT)] = marketPrice;
+      }
+    } else {
+      // Calculate indirectly via base currency
+
+      const marketPriceBaseCurrencyFromCurrency: {
+        [dateString: string]: number;
+      } = {};
+      const marketPriceBaseCurrencyToCurrency: {
+        [dateString: string]: number;
+      } = {};
+
+      try {
+        if (currencyFrom === DEFAULT_CURRENCY) {
+          for (const date of dates) {
+            marketPriceBaseCurrencyFromCurrency[format(date, DATE_FORMAT)] = 1;
           }
-        ],
-        dateQuery: { gte: startDate, lt: endDate }
-      });
+        } else {
+          const marketData = await this.marketDataService.getRange({
+            assetProfileIdentifiers: [
+              {
+                dataSource,
+                symbol: `${DEFAULT_CURRENCY}${currencyFrom}`
+              }
+            ],
+            dateQuery: { gte: startDate, lt: endDate }
+          });
 
-      if (marketData?.length > 0) {
-        for (const { date, marketPrice } of marketData) {
-          factors[format(date, DATE_FORMAT)] = marketPrice;
+          for (const { date, marketPrice } of marketData) {
+            marketPriceBaseCurrencyFromCurrency[format(date, DATE_FORMAT)] =
+              marketPrice;
+          }
         }
-      } else {
-        // Calculate indirectly via base currency
-
-        const marketPriceBaseCurrencyFromCurrency: {
-          [dateString: string]: number;
-        } = {};
-        const marketPriceBaseCurrencyToCurrency: {
-          [dateString: string]: number;
-        } = {};
+      } catch {}
 
-        try {
-          if (currencyFrom === DEFAULT_CURRENCY) {
-            for (const date of dates) {
-              marketPriceBaseCurrencyFromCurrency[format(date, DATE_FORMAT)] =
-                1;
-            }
-          } else {
-            const marketData = await this.marketDataService.getRange({
-              assetProfileIdentifiers: [
-                {
-                  dataSource,
-                  symbol: `${DEFAULT_CURRENCY}${currencyFrom}`
-                }
-              ],
-              dateQuery: { gte: startDate, lt: endDate }
-            });
-
-            for (const { date, marketPrice } of marketData) {
-              marketPriceBaseCurrencyFromCurrency[format(date, DATE_FORMAT)] =
-                marketPrice;
-            }
+      try {
+        if (currencyTo === DEFAULT_CURRENCY) {
+          for (const date of dates) {
+            marketPriceBaseCurrencyToCurrency[format(date, DATE_FORMAT)] = 1;
           }
-        } catch {}
-
-        try {
-          if (currencyTo === DEFAULT_CURRENCY) {
-            for (const date of dates) {
-              marketPriceBaseCurrencyToCurrency[format(date, DATE_FORMAT)] = 1;
-            }
-          } else {
-            const marketData = await this.marketDataService.getRange({
-              assetProfileIdentifiers: [
-                {
-                  dataSource,
-                  symbol: `${DEFAULT_CURRENCY}${currencyTo}`
-                }
-              ],
-              dateQuery: {
-                gte: startDate,
-                lt: endDate
+        } else {
+          const marketData = await this.marketDataService.getRange({
+            assetProfileIdentifiers: [
+              {
+                dataSource,
+                symbol: `${DEFAULT_CURRENCY}${currencyTo}`
               }
-            });
-
-            for (const { date, marketPrice } of marketData) {
-              marketPriceBaseCurrencyToCurrency[format(date, DATE_FORMAT)] =
-                marketPrice;
+            ],
+            dateQuery: {
+              gte: startDate,
+              lt: endDate
             }
+          });
+
+          for (const { date, marketPrice } of marketData) {
+            marketPriceBaseCurrencyToCurrency[format(date, DATE_FORMAT)] =
+              marketPrice;
           }
-        } catch {}
+        }
+      } catch {}
 
-        for (const date of dates) {
-          try {
-            const factor =
-              (1 /
-                marketPriceBaseCurrencyFromCurrency[
-                  format(date, DATE_FORMAT)
-                ]) *
-              marketPriceBaseCurrencyToCurrency[format(date, DATE_FORMAT)];
-
-            if (isNaN(factor)) {
-              throw new Error('Exchange rate is not a number');
-            } else {
-              factors[format(date, DATE_FORMAT)] = factor;
-            }
-          } catch {
-            let errorMessage = `No exchange rate has been found for ${currencyFrom}${currencyTo} at ${format(
-              date,
-              DATE_FORMAT
-            )}. Please complement market data for ${DEFAULT_CURRENCY}${currencyFrom}`;
-
-            if (DEFAULT_CURRENCY !== currencyTo) {
-              errorMessage = `${errorMessage} and ${DEFAULT_CURRENCY}${currencyTo}`;
-            }
+      for (const date of dates) {
+        try {
+          const factor =
+            (1 /
+              marketPriceBaseCurrencyFromCurrency[format(date, DATE_FORMAT)]) *
+            marketPriceBaseCurrencyToCurrency[format(date, DATE_FORMAT)];
 
-            Logger.error(`${errorMessage}.`, 'ExchangeRateDataService');
+          if (isNaN(factor)) {
+            throw new Error('Exchange rate is not a number');
+          } else {
+            factors[format(date, DATE_FORMAT)] = factor;
           }
+        } catch {
+          let errorMessage = `No exchange rate has been found for ${currencyFrom}${currencyTo} at ${format(
+            date,
+            DATE_FORMAT
+          )}. Please complement market data for ${DEFAULT_CURRENCY}${currencyFrom}`;
+
+          if (DEFAULT_CURRENCY !== currencyTo) {
+            errorMessage = `${errorMessage} and ${DEFAULT_CURRENCY}${currencyTo}`;
+          }
+
+          Logger.error(`${errorMessage}.`, 'ExchangeRateDataService');
         }
       }
     }