all ck_checkpoints queries added

Author: tslashd

README.md

@@ -11,11 +11,11 @@ SurfTimer FastAPI
 - [ ] ck_announcements
 - [x] ck_bonus
 - [x] ck_checkpoints
-- [x] ck_latestrecords
-- [x] ck_maptier
-- [x] ck_playeroptions2
-- [x] ck_playerrank
-- [x] ck_playertemp
+- [x] ck_latestrecords - Partially
+- [x] ck_maptier - Partially
+- [x] ck_playeroptions2 - Partially
+- [x] ck_playerrank - Partially
+- [x] ck_playertemp - Partially
 - [ ] ck_playertimes
 - [ ] ck_spawnlocations
 - [ ] ck_vipadmins

surftimer/ck_checkpoints.py

@@ -82,10 +82,10 @@ async def selectCheckpoints(
     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),
-        )
+        response.headers["content-type"] = "application/json"
+        response.status_code = status.HTTP_200_OK
+        response.body = json.loads(cached_data, use_decimal=True, parse_nan=True)
+        return response
 
     xquery = selectQuery(
         surftimer.queries.sql_selectCheckpoints.format(mapname, steamid32)
@@ -95,9 +95,8 @@ async def selectCheckpoints(
         # xquery = xquery.pop()
         print("Hit, length:", len(xquery))
     else:
-        return JSONResponse(
-            status_code=status.HTTP_404_NOT_FOUND, content=status.HTTP_404_NOT_FOUND
-        )
+        response.status_code = status.HTTP_204_NO_CONTENT
+        return response
 
     # Cache the data in Redis
     set_cache(cache_key, xquery)
@@ -128,10 +127,10 @@ async def selectCheckpointsinZoneGroup(
     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),
-        )
+        response.headers["content-type"] = "application/json"
+        response.status_code = status.HTTP_200_OK
+        response.body = json.loads(cached_data, use_decimal=True, parse_nan=True)
+        return response
 
     xquery = selectQuery(
         surftimer.queries.sql_selectCheckpointsinZoneGroup.format(
@@ -142,9 +141,8 @@ async def selectCheckpointsinZoneGroup(
     if len(xquery) > 0:
         print("Hit, length:", len(xquery))
     else:
-        return JSONResponse(
-            status_code=status.HTTP_404_NOT_FOUND, content=status.HTTP_404_NOT_FOUND
-        )
+        response.status_code = status.HTTP_204_NO_CONTENT
+        return response
 
     # Cache the data in Redis
     set_cache(cache_key, xquery)
@@ -171,10 +169,10 @@ async def selectRecordCheckpoints(
     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),
-        )
+        response.headers["content-type"] = "application/json"
+        response.status_code = status.HTTP_200_OK
+        response.body = json.loads(cached_data, use_decimal=True, parse_nan=True)
+        return response
 
     xquery = selectQuery(
         surftimer.queries.sql_selectRecordCheckpoints.format(
@@ -185,9 +183,8 @@ async def selectRecordCheckpoints(
     if len(xquery) > 0:
         print("Hit, length:", len(xquery))
     else:
-        return JSONResponse(
-            status_code=status.HTTP_404_NOT_FOUND, content=status.HTTP_404_NOT_FOUND
-        )
+        response.status_code = status.HTTP_204_NO_CONTENT
+        return response
 
     # Cache the data in Redis
     set_cache(cache_key, xquery)
@@ -241,14 +238,14 @@ async def selectStageTimes(
     tic = time.perf_counter()
 
     # Check if data is cached in Redis
-    cache_key = f"selectStageTimes:-{mapname}-{steamid32}"
+    cache_key = f"selectStageTimes:{mapname}-{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)")
-        return JSONResponse(
-            status_code=status.HTTP_200_OK,
-            content=json.loads(cached_data, use_decimal=True, parse_nan=True),
-        )
+        response.headers["content-type"] = "application/json"
+        response.status_code = status.HTTP_200_OK
+        response.body = json.loads(cached_data, use_decimal=True, parse_nan=True)
+        return response
 
     xquery = selectQuery(
         surftimer.queries.sql_selectStageTimes.format(mapname, steamid32)
@@ -257,9 +254,8 @@ async def selectStageTimes(
     if len(xquery) > 0:
         print("Hit, length:", len(xquery))
     else:
-        return JSONResponse(
-            status_code=status.HTTP_404_NOT_FOUND, content=status.HTTP_404_NOT_FOUND
-        )
+        response.status_code = status.HTTP_204_NO_CONTENT
+        return response
 
     # Cache the data in Redis
     set_cache(cache_key, xquery)
@@ -282,14 +278,14 @@ async def selectStageAttempts(
     tic = time.perf_counter()
 
     # Check if data is cached in Redis
-    cache_key = f"selectStageAttempts:-{mapname}-{steamid32}"
+    cache_key = f"selectStageAttempts:{mapname}-{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)")
-        return JSONResponse(
-            status_code=status.HTTP_200_OK,
-            content=json.loads(cached_data, use_decimal=True, parse_nan=True),
-        )
+        response.headers["content-type"] = "application/json"
+        response.status_code = status.HTTP_200_OK
+        response.body = json.loads(cached_data, use_decimal=True, parse_nan=True)
+        return response
 
     xquery = selectQuery(
         surftimer.queries.sql_selectStageAttempts.format(mapname, steamid32)
@@ -298,9 +294,127 @@ async def selectStageAttempts(
     if len(xquery) > 0:
         print("Hit, length:", len(xquery))
     else:
-        return JSONResponse(
-            status_code=status.HTTP_404_NOT_FOUND, content=status.HTTP_404_NOT_FOUND
-        )
+        response.status_code = status.HTTP_204_NO_CONTENT
+        return response
+
+    # Cache the data in Redis
+    set_cache(cache_key, xquery)
+
+    toc = time.perf_counter()
+    print(f"Execution time {toc - tic:0.4f}")
+
+    return xquery
+
+
+@router.delete(
+    "/surftimer/deleteWipePlayerCheckpoints",
+    name="Wipe Player Checkpoint",
+    tags=["ck_checkpoints", "strays"],
+)
+async def deleteWipePlayerCheckpoints(
+    request: Request,
+    response: Response,
+    steamid32: str,
+):
+    """```char sql_stray_deleteWipePlayerCheckpoints[] = ....```"""
+    tic = time.perf_counter()
+
+    xquery = insertQuery(
+        surftimer.queries.sql_stray_deleteWipePlayerCheckpoints.format(steamid32)
+    )
+
+    content_data = {"deleted": xquery, "xtime": time.perf_counter() - tic}
+    if xquery < 1:
+        # response.body = json.dumps(content_data).encode('utf-8')
+        response.headers["content-type"] = "application/json"
+        response.status_code = status.HTTP_304_NOT_MODIFIED
+        return response
+
+    toc = time.perf_counter()
+    print(f"Execution time {toc - tic:0.4f}")
+
+    response.body = json.dumps(content_data).encode("utf-8")
+    response.headers["content-type"] = "application/json"
+    response.status_code = status.HTTP_200_OK
+    return response
+
+
+@router.get(
+    "/surftimer/selectCPR",
+    name="Get Player Checkpoints for !cpr",
+    tags=["ck_checkpoints", "strays"],
+)
+async def stray_selectCPR(
+    request: Request,
+    response: Response,
+    steamid32: str,
+    mapname: str,
+):
+    """`char[] sql_stray_selectCPR = ....`"""
+    tic = time.perf_counter()
+
+    # Check if data is cached in Redis
+    cache_key = f"selectCPR:{steamid32}-{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)")
+        response.headers["content-type"] = "application/json"
+        response.status_code = status.HTTP_200_OK
+        response.body = json.loads(cached_data, use_decimal=True, parse_nan=True)
+        return response
+
+    xquery = selectQuery(
+        surftimer.queries.sql_stray_selectCPR.format(steamid32, mapname)
+    )
+
+    if len(xquery) > 0:
+        print("Hit, length:", len(xquery))
+    else:
+        response.status_code = status.HTTP_204_NO_CONTENT
+        return response
+
+    # Cache the data in Redis
+    set_cache(cache_key, xquery)
+
+    toc = time.perf_counter()
+    print(f"Execution time {toc - tic:0.4f}")
+
+    return xquery
+
+
+@router.get(
+    "/surftimer/ccp_getPlayerPR",
+    name="Get Player CCP info",
+    tags=["ck_checkpoints", "strays"],
+)
+async def ccp_getPlayerPR(
+    request: Request,
+    response: Response,
+    mapname: str,
+    steamid32: str,
+):
+    """`char[] sql_stray_ccp_getPlayerPR = ....`"""
+    tic = time.perf_counter()
+
+    # Check if data is cached in Redis
+    cache_key = f"ccp_getPlayerPR:{mapname}-{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)")
+        response.headers["content-type"] = "application/json"
+        response.status_code = status.HTTP_200_OK
+        response.body = json.loads(cached_data, use_decimal=True, parse_nan=True)
+        return response
+
+    xquery = selectQuery(
+        surftimer.queries.sql_stray_ccp_getPlayerPR.format(steamid32, mapname)
+    )
+
+    if len(xquery) > 0:
+        print("Hit, length:", len(xquery))
+    else:
+        response.status_code = status.HTTP_204_NO_CONTENT
+        return response
 
     # Cache the data in Redis
     set_cache(cache_key, xquery)

surftimer/queries.py

@@ -22,21 +22,6 @@
 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;"
-sql_stray_viewBonusRunRank = "SELECT count(runtime)+1 FROM ck_bonus WHERE mapname = '{}' AND zonegroup = {} AND runtime < {} AND style = {};"
-sql_stray_deleteSpecificBonus = (
-    "DELETE FROM ck_bonus WHERE zonegroup = {} AND mapname = '{}';"
-)
-sql_stray_selectPersonalBonusPrestrafeSpeeds = "SELECT zonegroup, style, velStartXY, velStartXYZ, velStartZ FROM ck_bonus WHERE steamid = '{}' AND mapname = '{}' AND runtime > '0.0';"
-sql_stray_selectMapRankBonusStyle = "SELECT name FROM ck_bonus WHERE runtime <= (SELECT runtime FROM ck_bonus WHERE steamid = '{}' AND mapname= '{}' AND style = {} AND runtime > 0.0 AND zonegroup = {}) AND mapname = '{}' AND style = {} AND zonegroup = {};"
-sql_stray_viewBonusStyleRunRank = "SELECT count(runtime)+1 FROM ck_bonus WHERE mapname = '{}' AND zonegroup = '{}' AND style = '{}' AND runtime < {}"
-sql_stray_selectPersonalBonusStylesRecords = "SELECT runtime, zonegroup FROM ck_bonus WHERE steamid = '{}' AND mapname = '{}' AND style = '{}' AND runtime > '0.0'"
-sql_stray_viewPRinfoMapRankBonusCallback = "SELECT COUNT(*), steamid FROM ck_bonus WHERE runtime <= (SELECT runtime FROM ck_bonus WHERE steamid = '{}' AND mapname LIKE '%{}%' AND runtime > -1.0 AND zonegroup = {} AND style = 0) AND mapname = '{}' AND zonegroup = {} AND style = 0;"
-sql_stray_getRankSteamIdBonus = "SELECT steamid FROM ck_bonus WHERE mapname = '{}' AND style = 0 AND runtime > -1.0 AND zonegroup = '{}' ORDER BY runtime ASC LIMIT {}, 1;"
-sql_stray_deleteWipePlayerBonus = "DELETE FROM ck_bonus WHERE steamid = '{}';"
-sql_stray_pr_bonusInfo = "SELECT runtime, zonegroup FROM ck_bonus WHERE steamid = '{}' AND mapname = '{}' AND zonegroup = {};"
-## Player Points Calculation ##
-sql_stray_point_calc_countFinishedBonus = "SELECT mapname, (SELECT count(1)+1 FROM ck_bonus b WHERE a.mapname=b.mapname AND a.runtime > b.runtime AND a.zonegroup = b.zonegroup AND b.style = {}) AS `rank`, (SELECT count(1) FROM ck_bonus b WHERE a.mapname = b.mapname AND a.zonegroup = b.zonegroup AND b.style = {}) as total FROM ck_bonus a WHERE steamid = '{}' AND style = {};"
-
 
 ## 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;"
@@ -196,3 +181,28 @@
 sql_UpdateLastSeenSQLite = (
     "UPDATE ck_playerrank SET lastseen = date('now') where steamid = '{}';"
 )
+
+
+## Not implemented in ST code yet
+# bonus
+sql_stray_viewBonusRunRank = "SELECT count(runtime)+1 FROM ck_bonus WHERE mapname = '{}' AND zonegroup = {} AND runtime < {} AND style = {};"
+sql_stray_deleteSpecificBonus = (
+    "DELETE FROM ck_bonus WHERE zonegroup = {} AND mapname = '{}';"
+)
+sql_stray_selectPersonalBonusPrestrafeSpeeds = "SELECT zonegroup, style, velStartXY, velStartXYZ, velStartZ FROM ck_bonus WHERE steamid = '{}' AND mapname = '{}' AND runtime > '0.0';"
+sql_stray_selectMapRankBonusStyle = "SELECT name FROM ck_bonus WHERE runtime <= (SELECT runtime FROM ck_bonus WHERE steamid = '{}' AND mapname= '{}' AND style = {} AND runtime > 0.0 AND zonegroup = {}) AND mapname = '{}' AND style = {} AND zonegroup = {};"
+sql_stray_viewBonusStyleRunRank = "SELECT count(runtime)+1 FROM ck_bonus WHERE mapname = '{}' AND zonegroup = '{}' AND style = '{}' AND runtime < {}"
+sql_stray_selectPersonalBonusStylesRecords = "SELECT runtime, zonegroup FROM ck_bonus WHERE steamid = '{}' AND mapname = '{}' AND style = '{}' AND runtime > '0.0'"
+sql_stray_viewPRinfoMapRankBonusCallback = "SELECT COUNT(*), steamid FROM ck_bonus WHERE runtime <= (SELECT runtime FROM ck_bonus WHERE steamid = '{}' AND mapname LIKE '%{}%' AND runtime > -1.0 AND zonegroup = {} AND style = 0) AND mapname = '{}' AND zonegroup = {} AND style = 0;"
+sql_stray_getRankSteamIdBonus = "SELECT steamid FROM ck_bonus WHERE mapname = '{}' AND style = 0 AND runtime > -1.0 AND zonegroup = '{}' ORDER BY runtime ASC LIMIT {}, 1;"
+sql_stray_deleteWipePlayerBonus = "DELETE FROM ck_bonus WHERE steamid = '{}';"
+sql_stray_pr_bonusInfo = "SELECT runtime, zonegroup FROM ck_bonus WHERE steamid = '{}' AND mapname = '{}' AND zonegroup = {};"
+## Player Points Calculation ##
+sql_stray_point_calc_countFinishedBonus = "SELECT mapname, (SELECT count(1)+1 FROM ck_bonus b WHERE a.mapname=b.mapname AND a.runtime > b.runtime AND a.zonegroup = b.zonegroup AND b.style = {}) AS `rank`, (SELECT count(1) FROM ck_bonus b WHERE a.mapname = b.mapname AND a.zonegroup = b.zonegroup AND b.style = {}) as total FROM ck_bonus a WHERE steamid = '{}' AND style = {};"
+
+# checkpoints
+sql_stray_deleteWipePlayerCheckpoints = (
+    "DELETE FROM ck_checkpoints WHERE steamid = '%s';"
+)
+sql_stray_selectCPR = "SELECT cp, time FROM ck_checkpoints WHERE steamid = '%s' AND mapname = '%s' AND zonegroup = 0;"
+sql_stray_ccp_getPlayerPR = "SELECT db1.steamid, db1.mapname, db1.cp, db1.stage_time, db1.stage_attempts, (SELECT count(name)+1 FROM ck_wrcps WHERE style = 0 AND mapname = db1.mapname AND stage = db1.cp AND stage_time > -1.0 AND runtimepro <= db1.stage_time) AS `rank`, (SELECT count(name) FROM ck_wrcps WHERE style = 0 AND mapname = db1.mapname AND stage = db1.cp AND runtimepro > -1.0) AS total FROM ck_checkpoints db1 WHERE db1.mapname = '%s' AND db1.steamid = '%s' AND db1.stage_time > -1.0  ORDER BY cp ASC;"