Skip to content

Commit 4861c5c

Browse files
committed
#813 Fixed small bug and removed old code
1 parent c11fb19 commit 4861c5c

2 files changed

Lines changed: 4 additions & 17 deletions

File tree

src/backend_data_retrieval/data_retrieval_app/external_data_retrieval/data_retrieval/currency_api_handler.py

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,6 @@ class CurrencyAPIHandler:
88
def __init__(self, url: str) -> None:
99
self.url = url
1010

11-
def _combine_currency_data(self, currencies: list, currency_details: list) -> list:
12-
"""
13-
Combines the currency data.
14-
"""
15-
currencies_df = self._json_to_df(currencies)
16-
currency_details_df = self._json_to_df(currency_details)
17-
18-
combined_currency_data_df = currencies_df.merge(
19-
currency_details_df,
20-
on="id",
21-
)
22-
return combined_currency_data_df
23-
2411
def _json_to_df(self, currencies: list) -> pd.DataFrame:
2512
df = pd.json_normalize(currencies)
2613

src/backend_data_retrieval/data_retrieval_app/external_data_retrieval/transforming_data/transform_currency_api_data.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -77,17 +77,17 @@ def _transform_currency_table(
7777
currency_df["divine.chaosValue"],
7878
)
7979

80-
currency_df["tradeName"] = currency_df["name"].map(
81-
lambda name: self.name_to_trade_name.get(name, pd.NA)
82-
)
83-
8480
chaos_dict = {
8581
"name": ["Chaos Orb"],
8682
"chaos.chaosValue": [1],
8783
}
8884
chaos_df = pd.DataFrame.from_dict(chaos_dict)
8985
currency_df = pd.concat((currency_df, chaos_df), ignore_index=True)
9086

87+
currency_df["tradeName"] = currency_df["name"].map(
88+
lambda name: self.name_to_trade_name.get(name, pd.NA)
89+
)
90+
9191
currency_df["createdHoursSinceLaunch"] = hours_since_launch
9292
return currency_df
9393

0 commit comments

Comments
 (0)