diff --git a/openbb_terminal/economy/commodity_model.py b/openbb_terminal/economy/commodity_model.py index d28884f478d..883f42666c6 100644 --- a/openbb_terminal/economy/commodity_model.py +++ b/openbb_terminal/economy/commodity_model.py @@ -44,15 +44,15 @@ def get_debt() -> pd.DataFrame: "Date": "As Of", } ) - df["USD Debt"] = df["USD Debt"].apply(lambda x: format_number(x)).astype(int) - df["USD Per Capita"] = df["USD Per Capita"].astype(int) - df["Rank"] = df["USD Debt"].rank(ascending=False).astype(int) + df["USD Debt"] = df["USD Debt"].apply(lambda x: format_number(x)).astype("int64") + df["USD Per Capita"] = df["USD Per Capita"].astype("int64") + df["Rank"] = df["USD Debt"].rank(ascending=False).astype("int64") date = df["As Of"].astype(str) dates = [] for i in date.index: dates.append(date[i].split("[")[0]) df["As Of"] = dates - df["As Of"] = df["As Of"].str.replace("31 September", "30 September") + df["As Of"] = df["As Of"].str.replace("31 September", "30 September").str.strip() indexes = ["Rank", "As Of", "Country", "USD Per Capita", "USD Debt", "% of GDP"] df = df[indexes] diff --git a/tests/openbb_terminal/economy/csv/test_commodity_model/test_get_debt.csv b/tests/openbb_terminal/economy/csv/test_commodity_model/test_get_debt.csv index 557eb157da3..c26d8bbbcb2 100644 --- a/tests/openbb_terminal/economy/csv/test_commodity_model/test_get_debt.csv +++ b/tests/openbb_terminal/economy/csv/test_commodity_model/test_get_debt.csv @@ -23,7 +23,7 @@ 21,22,January 2023,Indonesia,1431,518000000000,39.5 22,23,30 June 2017,Denmark,85700,492000000000,158.0 23,24,1 September 2021,Russia,3700,489000000000,32.0 -24,25,31 March 2022 ,Turkey,5155,444000000000,55.0 +24,25,31 March 2022,Turkey,5155,444000000000,55.0 25,26,30 September 2022,Argentina,6037,382000000000,79.3 26,27,September 2022,Greece,42800,350000000000,175.7 27,28,December 2022,Poland,9500,344000000000,49.3 @@ -104,7 +104,7 @@ 102,103,31 December 2016 est.,Laos,1700,12000000000,53.0 103,104,31 December 2016 est.,Nicaragua,1800,11100000000,83.0 104,105,31 December 2016 est.,Zimbabwe,670,10900000000,77.0 -105,106,31 March 2020 ,Luxembourg,114704,10600000000,22.1 +105,106,31 March 2020,Luxembourg,114704,10600000000,22.1 106,107,31 December 2020,Albania,3634,10500000000,66.0 107,108,31 December 2015,Ivory Coast,420,10000000000,24.0 108,109,31 December 2016,Cambodia,600,9820000000,57.0 diff --git a/tests/openbb_terminal/economy/txt/test_commodity_view/test_display_debt.txt b/tests/openbb_terminal/economy/txt/test_commodity_view/test_display_debt.txt index 21f6f41f465..c36000a8759 100644 --- a/tests/openbb_terminal/economy/txt/test_commodity_view/test_display_debt.txt +++ b/tests/openbb_terminal/economy/txt/test_commodity_view/test_display_debt.txt @@ -23,7 +23,7 @@ 21 22 January 2023 Indonesia 1431 518000000000 39.50 22 23 30 June 2017 Denmark 85700 492000000000 158.00 23 24 1 September 2021 Russia 3700 489000000000 32.00 -24 25 31 March 2022 Turkey 5155 444000000000 55.00 +24 25 31 March 2022 Turkey 5155 444000000000 55.00 25 26 30 September 2022 Argentina 6037 382000000000 79.30 26 27 September 2022 Greece 42800 350000000000 175.70 27 28 December 2022 Poland 9500 344000000000 49.30 @@ -104,7 +104,7 @@ 102 103 31 December 2016 est. Laos 1700 12000000000 53.00 103 104 31 December 2016 est. Nicaragua 1800 11100000000 83.00 104 105 31 December 2016 est. Zimbabwe 670 10900000000 77.00 -105 106 31 March 2020 Luxembourg 114704 10600000000 22.10 +105 106 31 March 2020 Luxembourg 114704 10600000000 22.10 106 107 31 December 2020 Albania 3634 10500000000 66.00 107 108 31 December 2015 Ivory Coast 420 10000000000 24.00 108 109 31 December 2016 Cambodia 600 9820000000 57.00