feat: add tvw and borrowed amount usd to rankings

Author: 5lliot

migrations/000016_rankings.up.sql

@@ -7,6 +7,8 @@ returns table (
 		old_total DOUBLE PRECISION,
 		old_collateral_underlying DOUBLE PRECISION,
 		old_profit_underlying DOUBLE PRECISION,
+		old_borrowed_amount_usd DOUBLE PRECISION,
+		old_twv_usd DOUBLE PRECISION,
 		old_hf varchar(80),
         sid varchar(100),
 		new_total DOUBLE PRECISION,
@@ -24,6 +26,7 @@ returns table (
         collateral_usd DOUBLE PRECISION,
 		profit_underlying DOUBLE PRECISION,
 		collateral_underlying DOUBLE PRECISION,
+
         roi DOUBLE PRECISION
 	) 
 language plpgsql
@@ -41,10 +44,12 @@ BEGIN
 		(t2.new_profit_underlying-t1.old_profit_underlying) * price profit_usd, t1.old_collateral_underlying*price collateral_usd,
 		(t2.new_profit_underlying-t1.old_profit_underlying) profit_underlying, t1.old_collateral_underlying collateral_underlying, 
 
-		(t2.new_profit_underlying-t1.old_profit_underlying)/(t1.old_collateral_underlying) roi  FROM
+		(t2.new_profit_underlying-t1.old_profit_underlying)/(t1.old_collateral_underlying) roi FROM
 
         (SELECT distinct on (d.session_id) d.total_value_usd old_total,
 			d.collateral_underlying old_collateral_underlying, d.profit_underlying as old_profit_underlying,
+			((cal_borrowed_amt_with_interest_bi::float8 * total_value_usd)/ cal_total_value_bi::float8) old_borrowed_amount_usd,
+			((cal_threshold_value_bi::float8 * total_value_usd)/ cal_total_value_bi::float8) old_twv_usd,
 			cal_health_factor old_hf, d.session_id sid
 			FROM debts d WHERE block_num >= (SELECT min(id) FROM blocks WHERE timestamp > (extract(epoch from now())::bigint - $1)) 
             order by d.session_id, block_num) t1