From 524ee2b251b4b6e4bdc2a1cf52eebd5cf15ad4d4 Mon Sep 17 00:00:00 2001
From: jeroen <jer.bouma@gmail.com>
Date: Mon, 5 Aug 2024 20:48:22 +0200
Subject: [PATCH] Bugfix for #150

---
 financetoolkit/toolkit_controller.py | 28 +++++++++++++++++++++++-----
 1 file changed, 23 insertions(+), 5 deletions(-)

diff --git a/financetoolkit/toolkit_controller.py b/financetoolkit/toolkit_controller.py
index c31b6d0..fceda17 100644
--- a/financetoolkit/toolkit_controller.py
+++ b/financetoolkit/toolkit_controller.py
@@ -2621,9 +2621,18 @@ def get_exchange_rates(
                     historical_currencies=self._historical_statistics.loc["Currency"],
                 )
 
+        # Separate currencies that are merely a comparison between the same currency
+        # and currencies that are actual exchange rates.
+        currencies_to_collect_data_for = [
+            currency for currency in self._currencies if currency[:3] != currency[3:6]
+        ]
+        currencies_to_fill_to_one = [
+            currency for currency in self._currencies if currency[:3] == currency[3:6]
+        ]
+
         if self._daily_exchange_rate_data.empty or overwrite:
             self._daily_exchange_rate_data, _ = _get_historical_data(
-                tickers=self._currencies,
+                tickers=currencies_to_collect_data_for,
                 api_key=self._api_key,
                 source=self._historical_source,
                 start=self._start_date,
@@ -2642,10 +2651,19 @@ def get_exchange_rates(
                 tqdm_message="Obtaining exchange data",
             )
 
-            # For exchange data, it is possible that data on USDUSD=X is
-            # collected which should always be 1. In that case, everything
-            # should match with 1 which is why backfilling is used.
-            self._daily_exchange_rate_data = self._daily_exchange_rate_data.bfill()
+            # For exchange data, it is possible that a ticker such as USDUSD=X
+            # exists which should always be 1. This data is added here.
+            if currencies_to_fill_to_one:
+                upper_columns = self._daily_exchange_rate_data.columns.get_level_values(
+                    level=0
+                ).unique()
+                for currency in currencies_to_fill_to_one:
+                    for column in upper_columns:
+                        self._daily_exchange_rate_data[column, currency] = 1
+
+                self._daily_exchange_rate_data = self._daily_exchange_rate_data.reindex(
+                    upper_columns, axis=1, level=0
+                )
 
         if period == "daily":
             historical_data = self._daily_exchange_rate_data.loc[