more stray queries - ck_bonus

Author: tslashd

surftimer/ck_bonus.py

@@ -403,4 +403,145 @@ def deleteBonus(
     response.body = json.dumps(content_data).encode('utf-8')
     response.headers['content-type'] = 'application/json'
     response.status_code = status.HTTP_200_OK
-    return response
+    return response
+
+
+## Stray queries scattered in SurfTimer code
+@router.get(
+    "/surftimer/selectPlayerSpecificBonusData",
+    name="Get Player Specific Bonus Data",
+    tags=["ck_bonus", "strays"],
+)
+def selectPlayerSpecificBonusData(
+    request: Request,
+    response: Response,
+    steamid32: str,
+    mapname: str,
+    zonegroup: int,
+):
+    """```char sql_stray_selectPlayerSpecificBonusData[] = ....```"""
+    tic = time.perf_counter()
+
+    # Check if data is cached in Redis
+    cache_key = f"selectPlayerSpecificBonusData:{steamid32}-{mapname}-{zonegroup}"
+    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)")
+        return JSONResponse(
+            status_code=status.HTTP_200_OK, content=json.loads(cached_data, use_decimal=True, parse_nan=True)
+        )
+
+    xquery = selectQuery(
+        surftimer.queries.sql_stray_selectPlayerSpecificBonusData.format(
+            steamid32,
+            mapname,
+            zonegroup,
+        )
+    )
+
+    if xquery:
+        xquery = xquery.pop()
+    else:
+        response.status_code=status.HTTP_204_NO_CONTENT
+        return response
+
+    toc = time.perf_counter()
+    print(f"Execution time {toc - tic:0.4f}")
+
+    # Cache the data in Redis
+    set_cache(cache_key, xquery)
+
+    return xquery
+
+
+@router.get(
+    "/surftimer/selectTotalBonusCompletesCount",
+    name="Get Count Bonus Finished",
+    tags=["ck_bonus", "strays"],
+)
+def selectTotalBonusCompletesCount(
+    request: Request,
+    response: Response,
+    mapname: str,
+    zonegroup: int,
+):
+    """```char sql_stray_selectTotalBonusCompletes[] = ....```"""
+    tic = time.perf_counter()
+
+    # Check if data is cached in Redis
+    cache_key = f"selectTotalBonusCompletesCount:{mapname}-{zonegroup}"
+    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)")
+        return JSONResponse(
+            status_code=status.HTTP_200_OK, content=json.loads(cached_data, use_decimal=True, parse_nan=True)
+        )
+
+    xquery = selectQuery(
+        surftimer.queries.sql_stray_selectTotalBonusCompletes.format(
+            mapname,
+            zonegroup,
+        )
+    )
+
+    if xquery:
+        xquery = xquery.pop()
+    else:
+        response.status_code=status.HTTP_204_NO_CONTENT
+        return response
+
+    toc = time.perf_counter()
+    print(f"Execution time {toc - tic:0.4f}")
+
+    # Cache the data in Redis
+    set_cache(cache_key, xquery)
+
+    return xquery
+
+@router.get(
+    "/surftimer/selectPlayersBonusRank",
+    name="Get Player Bonus Rank",
+    tags=["ck_bonus", "strays"],
+)
+def selectPlayersBonusRank(
+    request: Request,
+    response: Response,
+    steamid32: str,
+    mapname: str,
+    zonegroup: int,
+):
+    """```char sql_stray_selectPlayersBonusRank[] = ....```"""
+    tic = time.perf_counter()
+
+    # Check if data is cached in Redis
+    cache_key = f"selectPlayersBonusRank:{steamid32}-{mapname}-{zonegroup}"
+    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)")
+        return JSONResponse(
+            status_code=status.HTTP_200_OK, content=json.loads(cached_data, use_decimal=True, parse_nan=True)
+        )
+
+    xquery = selectQuery(
+        surftimer.queries.sql_stray_selectPlayersBonusRank.format(
+            steamid32,
+            mapname,
+            zonegroup,
+            mapname,
+            zonegroup
+        )
+    )
+
+    if xquery:
+        xquery = xquery.pop()
+    else:
+        response.status_code=status.HTTP_204_NO_CONTENT
+        return response
+
+    toc = time.perf_counter()
+    print(f"Execution time {toc - tic:0.4f}")
+
+    # Cache the data in Redis
+    set_cache(cache_key, xquery)
+
+    return xquery

surftimer/queries.py

@@ -19,6 +19,9 @@
     "SELECT zonegroup, runtime from ck_bonus WHERE mapname = '{}';"
 )
 sql_selectTopBonusSurfers = "SELECT db2.steamid, db1.name, db2.runtime as overall, db1.steamid, db2.mapname FROM ck_bonus as db2 INNER JOIN ck_playerrank as db1 on db2.steamid = db1.steamid WHERE db2.mapname = '{}' AND db2.style = {} AND db1.style = {} AND db2.runtime > -1.0 AND zonegroup = {} ORDER BY overall ASC LIMIT 100;"
+sql_stray_selectPlayerSpecificBonusData = "SELECT `steamid`, `name`, `mapname`, `runtime`, zonegroup FROM `ck_bonus` WHERE `steamid` = '{}' AND `mapname` LIKE '%{}%' AND zonegroup = {} AND style = 0 LIMIT 1;"
+sql_stray_selectTotalBonusCompletes = "SELECT count(name) FROM `ck_bonus` WHERE `mapname` = '{}' AND zonegroup = {} AND style = 0 AND runtime > 0.0;"
+sql_stray_selectPlayersBonusRank = "SELECT name,mapname FROM ck_bonus WHERE runtime <= (SELECT runtime FROM ck_bonus WHERE steamid = '{}' AND mapname = '{}' AND zonegroup = {} AND style = 0 AND runtime > -1.0) AND mapname = '{}' AND zonegroup = {} AND runtime > -1.0 ORDER BY runtime;"
 
 ## ck_checkpoints
 sql_createCheckpoints = "CREATE TABLE IF NOT EXISTS ck_checkpoints (steamid VARCHAR(32), mapname VARCHAR(32), cp INT(11) NOT NULL, time decimal(12,6) NOT NULL DEFAULT '-1.000000', zonegroup INT(12) NOT NULL DEFAULT 0, PRIMARY KEY(steamid, mapname, cp, zonegroup)) DEFAULT CHARSET=utf8mb4;"