🔄 refactor: rename functions for contest data fetching

baoliay2008 · baoliay2008 · commit 96a30f13fac8 · 2024-01-17T12:04:48.000-08:00
diff --git a/app/crawler/contest.py b/app/crawler/contest.py
@@ -39,7 +39,7 @@ async def request_past_contests(
         past_contests.extend(
             response.json().get("data", {}).get("pastContests", {}).get("data", [])
         )
-    logger.success("finished")
+    logger.info(f"{max_page_num=} {len(past_contests)=}")
     return past_contests
 
 
@@ -57,7 +57,7 @@ async def request_contest_homepage_text():
     return req.text
 
 
-async def save_next_two_contests() -> List[Dict]:
+async def request_next_two_contests() -> List[Dict]:
     """
     save two coming contests
     :return:
@@ -95,7 +95,7 @@ async def save_next_two_contests() -> List[Dict]:
     return top_two_contests
 
 
-async def save_all_past_contests() -> List[Dict]:
+async def request_all_past_contests() -> List[Dict]:
     """
     Save past contests
     :return:
@@ -109,13 +109,15 @@ async def save_all_past_contests() -> List[Dict]:
         logger.error("cannot find pageNum")
         return []
     max_page_num = int(max_page_num_search.groups()[0])
-    return await request_past_contests(max_page_num)
+    all_past_contests = await request_past_contests(max_page_num)
+    return all_past_contests
 
 
-async def save_recent_contests() -> List[Dict]:
+async def request_recent_contests() -> List[Dict]:
     """
     Save 10 past contests on the first page
     :return:
     """
+    # 10 contests on the first page, which are enough
     ten_past_contests = await request_past_contests(1)
     return ten_past_contests
diff --git a/app/handler/contest.py b/app/handler/contest.py
@@ -4,7 +4,7 @@
 from beanie.odm.operators.update.general import Set
 from loguru import logger
 
-from app.crawler.contest import save_next_two_contests, save_recent_contests
+from app.crawler.contest import request_next_two_contests, request_recent_contests
 from app.db.models import Contest
 from app.utils import exception_logger_reraise
 
@@ -60,8 +60,8 @@ async def save_recent_and_next_two_contests() -> None:
     :return:
     """
     # Send Http requests to same server, don't do it concurrently
-    top_two_contests = await save_next_two_contests()
-    ten_past_contests = await save_recent_contests()
+    top_two_contests = await request_next_two_contests()
+    ten_past_contests = await request_recent_contests()
     # Save them in database, do it concurrently
     await asyncio.gather(
         multi_upsert_contests(top_two_contests, past=False),
