protocols adjusted

CarmineOptions · Jan 31, 2025 · 8b13e60 · 8b13e60
1 parent 911139a
commit 8b13e60
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 47 deletions.
diff --git a/apps/dashboard_app/charts/main.py b/apps/dashboard_app/charts/main.py
@@ -104,7 +104,7 @@ def load_main_chart(self):
         (
             protocol_main_chart_data_mapping,
             protocol_loans_data_mapping,
-        ) = self.__get_protocol_data_mappings()
+        ) = self._get_protocol_data_mappings()
         loans_data = (  # TODO: remove unused `loans_data` variable or use it
             transform_loans_data(protocol_loans_data_mapping, self.PROTOCOL_NAMES)
         )
@@ -146,7 +146,7 @@ def load_loans_with_low_health_factor_chart(self):
         (
             protocol_main_chart_data_mapping,
             protocol_loans_data_mapping,
-        ) = self.__get_protocol_data_mappings()
+        ) = self._get_protocol_data_mappings()
         loans_data = transform_loans_data(
             protocol_loans_data_mapping, self.PROTOCOL_NAMES
         )
@@ -189,7 +189,7 @@ def load_top_loans_chart(self):
         (
             protocol_main_chart_data_mapping,
             protocol_loans_data_mapping,
-        ) = self.__get_protocol_data_mappings()
+        ) = self._get_protocol_data_mappings()
         loans_data = transform_loans_data(
             protocol_loans_data_mapping, self.PROTOCOL_NAMES
         )
@@ -231,7 +231,7 @@ def load_detail_loan_chart(self):
         (
             protocol_main_chart_data_mapping,
             protocol_loans_data_mapping,
-        ) = self.__get_protocol_data_mappings()
+        ) = self._get_protocol_data_mappings()
         loans_data = transform_loans_data(
             protocol_loans_data_mapping, self.PROTOCOL_NAMES
         )
@@ -370,7 +370,7 @@ def load_comparison_lending_protocols_chart(self):
 
         # TODO: add last update functionality
 
-    def __get_protocol_data_mappings(self) -> tuple:
+    def _get_protocol_data_mappings(self) -> tuple:
         """
         Return a tuple of protocol_main_chart_data_mapping and protocol_loans_data_mapping.
         :return: tuple

diff --git a/apps/dashboard_app/charts/main_chart_figure.py b/apps/dashboard_app/charts/main_chart_figure.py
@@ -207,13 +207,16 @@ def get_bar_chart_figures(
         x.symbol: x.address for x in TOKEN_SETTINGS.values()
     }
     prices = get_prices(token_decimals=underlying_addresses_to_decimals)
-    bar_chart_supply_stats = pd.DataFrame()
-    bar_chart_collateral_stats = pd.DataFrame()
-    bar_chart_debt_stats = pd.DataFrame()
-    import pdb
+    bar_chart_supply_stats = pd.DataFrame(index=[0])
+    bar_chart_collateral_stats = pd.DataFrame(index=[0])
+    bar_chart_debt_stats = pd.DataFrame(index=[0])
     for column in supply_stats.columns:
-        pdb.set_trace()
-        if "protocol" in column.lower() or "total" in column.lower():
+        if "protocol" in column.lower():
+            bar_chart_supply_stats[column] = supply_stats[column][0]
+            bar_chart_collateral_stats[column] = collateral_stats[column][0]
+            bar_chart_debt_stats[column] = debt_stats[column][0]
+            continue
+        elif "total" in column.lower():
             continue
         underlying_symbol = column.split(" ")[0]
         underlying_address = underlying_symbols_to_addresses[SUPPLY_STATS_TOKEN_SYMBOLS_MAPPING[underlying_symbol]]
@@ -237,18 +240,7 @@ def get_bar_chart_figures(
                 y=bar_chart_supply_stats["zkLend"],
                 marker=plotly.graph_objs.bar.Marker(color="#fff7bc"),
             ),
-            plotly.graph_objs.Bar(
-                name="Nostra Alpha",
-                x=bar_chart_supply_stats.index,
-                y=bar_chart_supply_stats["Nostra Alpha"],
-                marker=plotly.graph_objs.bar.Marker(color="#fec44f"),
-            ),
-            plotly.graph_objs.Bar(
-                name="Nostra Mainnet",
-                x=bar_chart_supply_stats.index,
-                y=bar_chart_supply_stats["Nostra Mainnet"],
-                marker=plotly.graph_objs.bar.Marker(color="#d95f0e"),
-            ),
+            # TODO: add functionality for other protocols
         ],
     )
     supply_figure.update_layout(title_text="Supply (USD) per token")
@@ -260,18 +252,7 @@ def get_bar_chart_figures(
                 y=bar_chart_collateral_stats["zkLend"],
                 marker=plotly.graph_objs.bar.Marker(color="#fff7bc"),
             ),
-            plotly.graph_objs.Bar(
-                name="Nostra Alpha",
-                x=bar_chart_collateral_stats.index,
-                y=bar_chart_collateral_stats["Nostra Alpha"],
-                marker=plotly.graph_objs.bar.Marker(color="#fec44f"),
-            ),
-            plotly.graph_objs.Bar(
-                name="Nostra Mainnet",
-                x=bar_chart_collateral_stats.index,
-                y=bar_chart_collateral_stats["Nostra Mainnet"],
-                marker=plotly.graph_objs.bar.Marker(color="#d95f0e"),
-            ),
+            # TODO: add functionality for other protocols
         ],
     )
     collateral_figure.update_layout(title_text="Collateral (USD) per token")
@@ -283,18 +264,7 @@ def get_bar_chart_figures(
                 y=bar_chart_debt_stats["zkLend"],
                 marker=plotly.graph_objs.bar.Marker(color="#fff7bc"),
             ),
-            plotly.graph_objs.Bar(
-                name="Nostra Alpha",
-                x=bar_chart_debt_stats.index,
-                y=bar_chart_debt_stats["Nostra Alpha"],
-                marker=plotly.graph_objs.bar.Marker(color="#fec44f"),
-            ),
-            plotly.graph_objs.Bar(
-                name="Nostra Mainnet",
-                x=bar_chart_debt_stats.index,
-                y=bar_chart_debt_stats["Nostra Mainnet"],
-                marker=plotly.graph_objs.bar.Marker(color="#d95f0e"),
-            ),
+            # TODO: add functionality for other protocols
         ],
     )
     debt_figure.update_layout(title_text="Debt (USD) per token")