From 64c1695a32e94c067d8d10c9341780c76edf5a6d Mon Sep 17 00:00:00 2001
From: MuslemRahimi <moslem_rahimi@hotmail.de>
Date: Sun, 17 Nov 2024 16:51:28 +0100
Subject: [PATCH] rename key element in etf holding

---
 app/cron_list.py | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/app/cron_list.py b/app/cron_list.py
index 9aa2608..a7daeea 100644
--- a/app/cron_list.py
+++ b/app/cron_list.py
@@ -81,7 +81,6 @@ async def process_category(cursor, category, condition, category_type='market-ca
 
 
 async def get_etf_holding(etf_symbols, etf_con):
-
     for ticker in tqdm(etf_symbols):
         res = []
         df = pd.read_sql_query(query_etf_holding, etf_con, params=(ticker,))
@@ -89,24 +88,30 @@ async def get_etf_holding(etf_symbols, etf_con):
         try:
             # Load holdings data from the SQL query result
             data = orjson.loads(df['holding'].iloc[0])
-            res = [{key: item[key] for key in ('asset', 'weightPercentage', 'sharesNumber')} for item in data]
+            
+            # Rename 'asset' to 'symbol' and keep other keys the same
+            res = [{'symbol': item['asset'], 
+                    'weightPercentage': item['weightPercentage'], 
+                    'sharesNumber': item['sharesNumber']} 
+                   for item in data]
             
             for item in res:
-                asset = item['asset']
+                symbol = item['symbol']
                 
-                # Check if the asset data is already in the cache
-                if asset in quote_cache:
-                    quote_data = quote_cache[asset]
+                # Check if the symbol data is already in the cache
+                if symbol in quote_cache:
+                    quote_data = quote_cache[symbol]
                 else:
                     # Load the quote data from file if not in cache
                     try:
-                        with open(f"json/quote/{asset}.json") as file:
+                        with open(f"json/quote/{symbol}.json") as file:
                             quote_data = orjson.loads(file.read())
-                            quote_cache[asset] = quote_data  # Cache the loaded data
+                            quote_cache[symbol] = quote_data  # Cache the loaded data
                     except:
                         quote_data = None
 
                 # Assign price and changesPercentage if available, otherwise set to None
+                item['weightPercentage'] = round(item.get('weightPercentage'), 2) if item['weightPercentage'] else None
                 item['price'] = round(quote_data.get('price'), 2) if quote_data else None
                 item['changesPercentage'] = round(quote_data.get('changesPercentage'), 2) if quote_data else None
                 item['name'] = quote_data.get('name') if quote_data else None
@@ -117,9 +122,12 @@ async def get_etf_holding(etf_symbols, etf_con):
 
         # Save results to a file if there's data to write
         if res:
+            for rank, item in enumerate(res, 1):
+                item['rank'] = rank
             with open(f"json/etf/holding/{ticker}.json", 'wb') as file:
                 file.write(orjson.dumps(res))
 
+
 async def get_etf_provider(etf_con):
 
     cursor = etf_con.cursor()