move logging to middleware;key names

Author: tslashd

surftimer/ck_bonus.py

@@ -3,9 +3,6 @@
 from pydantic import BaseModel
 from sql import selectQuery, insertQuery
 from globals import (
-    redis_client,
-    config,
-    append_request_log,
     set_cache,
     get_cache,
 )
@@ -48,7 +45,6 @@ def insertBonus(
     """Inserts a new record to the table\n
     ```char sql_insertLatestRecords[] = ....```"""
     tic = time.perf_counter()
-    append_request_log(request)
 
     sql = surftimer.queries.sql_insertBonus.format(
         data.steamid32,
@@ -73,7 +69,6 @@ def insertBonus(
     # Prepare the response
     toc = time.perf_counter()
     print(f"Execution time {toc - tic:0.4f}")
-    # output = ResponseInsertQuery(xquery)
 
     return {"inserted": xquery, "xtime": time.perf_counter() - tic}
 
@@ -90,7 +85,6 @@ def updateBonus(
 ):
     """```char sql_updateBonus[] = ....```"""
     tic = time.perf_counter()
-    append_request_log(request)
 
     sql = surftimer.queries.sql_updateBonus.format(
         data.runtime,
@@ -127,10 +121,8 @@ def selectBonusCount(request: Request, response: Response, mapname: str):
     ```char sql_selectBonusCount[] = ....```"""
     tic = time.perf_counter()
 
-    append_request_log(request)
-
     # Check if data is cached in Redis
-    cache_key = f"selectBonusCount_{mapname}"
+    cache_key = f"selectBonusCount:{mapname}"
     cached_data = get_cache(cache_key)
     if cached_data:
         print(f"[Redis] Loaded '{cache_key}' ({time.perf_counter() - tic:0.4f}s)")
@@ -166,8 +158,6 @@ def selectPersonalBonusRecords(
     """```char sql_selectPersonalBonusRecords[] = ....```"""
     tic = time.perf_counter()
 
-    append_request_log(request)
-
     # Check if data is cached in Redis
     cache_key = f"selectPersonalBonusRecords:{steamid32}-{mapname}"
     cached_data = get_cache(cache_key)
@@ -211,7 +201,6 @@ def selectPlayerRankBonus(
     """```char sql_selectPlayerRankBonus[] = ....```"""
     tic = time.perf_counter()
 
-    append_request_log(request)
     cache_key = (
         f"selectPlayerRankBonus:{data.steamid32}-{data.mapname}-{data.zonegroup}"
     )
@@ -262,8 +251,6 @@ def selectFastestBonus(
     """```char sql_selectFastestBonus[] = ....```"""
     tic = time.perf_counter()
 
-    append_request_log(request)
-
     # Check if data is cached in Redis
     cache_key = f"selectFastestBonus:{mapname}"
     cached_data = get_cache(cache_key)
@@ -303,8 +290,6 @@ def selectAllBonusTimesinMap(
     """```char sql_selectAllBonusTimesinMap[] = ....```"""
     tic = time.perf_counter()
 
-    append_request_log(request)
-
     # Check if data is cached in Redis
     cache_key = f"selectAllBonusTimesinMap:{mapname}"
     cached_data = get_cache(cache_key)
@@ -346,8 +331,6 @@ def selectTopBonusSurfers(
     """```char sql_selectTopBonusSurfers[] = ....```"""
     tic = time.perf_counter()
 
-    append_request_log(request)
-
     # Check if data is cached in Redis
     cache_key = f"selectTopBonusSurfers:{mapname}-{style}-{zonegroup}"
     cached_data = get_cache(cache_key)
@@ -394,8 +377,6 @@ def deleteBonus(
     """```char sql_deleteBonus[] = ....```"""
     tic = time.perf_counter()
 
-    append_request_log(request)
-
     xquery = insertQuery(surftimer.queries.sql_deleteBonus.format(mapname))
 
     if xquery <= 0:

surftimer/ck_checkpoints.py

@@ -1,7 +1,7 @@
 from fastapi import APIRouter, Request, Response, status
 from fastapi.responses import JSONResponse
 from sql import selectQuery, insertQuery
-from globals import append_request_log, get_cache, set_cache
+from globals import get_cache, set_cache
 from pydantic import BaseModel
 import time, json, surftimer.queries
 
@@ -31,7 +31,6 @@ async def insertOrUpdateCheckpoints(
     data: PlayerCheckpoints,
 ):
     tic = time.perf_counter()
-    append_request_log(request)
 
     sql = surftimer.queries.sql_InsertOrUpdateCheckpoints.format(
         data.steamid,
@@ -56,7 +55,6 @@ async def insertOrUpdateCheckpoints(
     # Prepare the response
     toc = time.perf_counter()
     print(f"Execution time {toc - tic:0.4f}")
-    # output = ResponseInsertQuery(xquery)
 
     return {"inserted": xquery, "xtime": time.perf_counter() - tic}
 
@@ -71,7 +69,6 @@ async def selectCheckpoints(
 ):
     """`char[] sql_selectCheckpoints = ....`"""
     tic = time.perf_counter()
-    append_request_log(request)
 
     # Check if data is cached in Redis
     cache_key = f"selectCheckpoints:{mapname}-{steamid32}"
@@ -117,7 +114,6 @@ async def selectCheckpointsinZoneGroup(
 ):
     """`char[] sql_selectCheckpointsinZoneGroup = ....`"""
     tic = time.perf_counter()
-    append_request_log(request)
 
     # Check if data is cached in Redis
     cache_key = f"selectCheckpointsinZoneGroup:{mapname}-{steamid32}-{zonegroup}"
@@ -160,7 +156,6 @@ async def selectRecordCheckpoints(
 ):
     """`char[] sql_selectRecordCheckpoints = ....`"""
     tic = time.perf_counter()
-    append_request_log(request)
 
     # Check if data is cached in Redis
     cache_key = f"selectRecordCheckpoints:{steamid32}-{mapname}-{mapname}"
@@ -206,8 +201,6 @@ async def deleteCheckpoints(
     """```char sql_deleteCheckpoints[] = ....```"""
     tic = time.perf_counter()
 
-    append_request_log(request)
-
     xquery = insertQuery(surftimer.queries.sql_deleteCheckpoints.format(mapname))
 
     if xquery <= 0:
@@ -232,7 +225,6 @@ async def selectStageTimes(
 ):
     """`char[] sql_selectStageTimes = ....`"""
     tic = time.perf_counter()
-    append_request_log(request)
 
     # Check if data is cached in Redis
     cache_key = f"selectStageTimes:-{mapname}-{steamid32}"
@@ -273,7 +265,6 @@ async def selectStageAttempts(
 ):
     """`char[] sql_selectStageAttempts = ....`"""
     tic = time.perf_counter()
-    append_request_log(request)
 
     # Check if data is cached in Redis
     cache_key = f"selectStageAttempts:-{mapname}-{steamid32}"

surftimer/ck_latestrecords.py

@@ -1,7 +1,7 @@
 from fastapi import APIRouter, Request, Response, status
 from fastapi.responses import JSONResponse
 from sql import selectQuery, insertQuery
-from globals import append_request_log, get_cache, set_cache
+from globals import get_cache, set_cache
 import time, json
 import surftimer.queries
 
@@ -19,8 +19,6 @@ async def selectLatestRecord(request: Request, response: Response):
     ```char sql_selectLatestRecords[] = ....```"""
     tic = time.perf_counter()
 
-    append_request_log(request)
-
     # Check if data is cached in Redis
     cache_key = f"selectLatestRecord"
     cached_data = get_cache(cache_key)
@@ -65,7 +63,6 @@ async def insertLatestRecord(
     """Inserts a new record to the table\n
     ```char sql_insertLatestRecords[] = ....```"""
     tic = time.perf_counter()
-    append_request_log(request)
 
     sql = surftimer.queries.sql_insertLatestRecords.format(
         steamid32, name, runtime, mapname

surftimer/ck_maptier.py

@@ -1,7 +1,7 @@
 from fastapi import APIRouter, Request, Response, status
 from fastapi.responses import JSONResponse
 from sql import selectQuery, insertQuery
-from globals import redis_client, config, append_request_log, get_cache, set_cache
+from globals import get_cache, set_cache
 import time, json
 import surftimer.queries
 
@@ -21,10 +21,9 @@ async def selectMapTier(
 ):
     """`char[] sql_selectMapTier = ....`"""
     tic = time.perf_counter()
-    append_request_log(request)
 
     # Check if data is cached in Redis
-    cache_key = f"selectMapTier_{mapname}"
+    cache_key = f"selectMapTier:{mapname}"
     cached_data = get_cache(cache_key)
     if cached_data is not None:
         print(f"[Redis] Loaded '{cache_key}' ({time.perf_counter() - tic:0.4f}s)")
@@ -49,7 +48,7 @@ async def selectMapTier(
     toc = time.perf_counter()
 
     print(f"Execution time {toc - tic:0.4f}")
-    
+
     return xquery
 
 
@@ -68,7 +67,6 @@ async def insertMapTier(
     char[] sql_insertmaptier = ....
     ```"""
     tic = time.perf_counter()
-    append_request_log(request)
 
     xquery = insertQuery(surftimer.queries.sql_insertmaptier.format(mapname, tier))
 
@@ -81,7 +79,6 @@ async def insertMapTier(
     # Prepare the response
     toc = time.perf_counter()
     print(f"Execution time {toc - tic:0.4f}")
-    # output = ResponseInsertQuery(xquery)
 
     return {"inserted": xquery, "xtime": time.perf_counter() - tic}
 
@@ -101,7 +98,6 @@ async def updateMapTier(
     char[] sql_updatemaptier = ....
     ```"""
     tic = time.perf_counter()
-    append_request_log(request)
 
     xquery = insertQuery(surftimer.queries.sql_updatemaptier.format(tier, mapname))
 
@@ -114,7 +110,6 @@ async def updateMapTier(
     # Prepare the response
     toc = time.perf_counter()
     print(f"Execution time {toc - tic:0.4f}")
-    # output = ResponseInsertQuery(xquery)
 
     return {"updated": xquery, "xtime": time.perf_counter() - tic}
 
@@ -134,7 +129,6 @@ async def updateMapperName(
     char[] sql_updateMapperName = ....
     ```"""
     tic = time.perf_counter()
-    append_request_log(request)
 
     xquery = insertQuery(surftimer.queries.sql_updateMapperName.format(mapper, mapname))
 
@@ -147,6 +141,5 @@ async def updateMapperName(
     # Prepare the response
     toc = time.perf_counter()
     print(f"Execution time {toc - tic:0.4f}")
-    # output = ResponseInsertQuery(xquery)
 
     return {"inserted": xquery, "xtime": time.perf_counter() - tic}

surftimer/ck_playeroptions2.py

@@ -1,7 +1,7 @@
 from fastapi import APIRouter, Request, Response, status
 from fastapi.responses import JSONResponse
 from sql import selectQuery, insertQuery
-from globals import append_request_log, get_cache, set_cache
+from globals import get_cache, set_cache
 from pydantic import BaseModel
 import time, json, surftimer.queries
 
@@ -59,7 +59,6 @@ async def insertPlayerOptions(request: Request, response: Response, steamid32: s
     char[] sql_insertPlayerOptions = ....
     ```"""
     tic = time.perf_counter()
-    append_request_log(request)
 
     xquery = insertQuery(surftimer.queries.sql_insertPlayerOptions.format(steamid32))
 
@@ -72,7 +71,6 @@ async def insertPlayerOptions(request: Request, response: Response, steamid32: s
     # Prepare the response
     toc = time.perf_counter()
     print(f"Execution time {toc - tic:0.4f}")
-    # output = ResponseInsertQuery(xquery)
 
     return {"inserted": xquery, "xtime": time.perf_counter() - tic}
 
@@ -85,10 +83,9 @@ async def insertPlayerOptions(request: Request, response: Response, steamid32: s
 async def selectPlayerOptions(request: Request, response: Response, steamid32: str):
     """`char[] sql_selectPlayerOptions = ....`"""
     tic = time.perf_counter()
-    append_request_log(request)
 
     # Check if data is cached in Redis
-    cache_key = f"selectPlayerOptions_{steamid32}"
+    cache_key = f"selectPlayerOptions:{steamid32}"
     cached_data = get_cache(cache_key)
     if cached_data is not None:
         print(f"[Redis] Loaded '{cache_key}' ({time.perf_counter() - tic:0.4f}s)")
@@ -119,12 +116,13 @@ async def selectPlayerOptions(request: Request, response: Response, steamid32: s
     name="Update Player Options",
     tags=["ck_playeroptions2"],
 )
-async def updatePlayerOptions(request: Request, response: Response, data: PlayerOptions):
+async def updatePlayerOptions(
+    request: Request, response: Response, data: PlayerOptions
+):
     """```c
     char[] sql_updatePlayerOptions = ....
     ```"""
     tic = time.perf_counter()
-    append_request_log(request)
 
     xquery = insertQuery(
         surftimer.queries.sql_updatePlayerOptions.format(
@@ -176,6 +174,5 @@ async def updatePlayerOptions(request: Request, response: Response, data: Player
     # Prepare the response
     toc = time.perf_counter()
     print(f"Execution time {toc - tic:0.4f}")
-    # output = ResponseInsertQuery(xquery)
 
     return {"updated": xquery, "xtime": time.perf_counter() - tic}