points calc

Author: tslashd

main.py

@@ -33,6 +33,7 @@
 from surftimer.ck_bonus import router as ck_bonus_router
 from surftimer.ck_checkpoints import router as ck_checkpoints_router
 from surftimer.ck_playertemp import router as ck_playertemp_router
+from surftimer.points import router as points_calculation
 
 
 class IPValidatorMiddleware(BaseHTTPMiddleware):
@@ -86,6 +87,7 @@ async def dispatch(self, request: Request, call_next):
 app.include_router(ck_bonus_router)
 app.include_router(ck_checkpoints_router)
 app.include_router(ck_playertemp_router)
+app.include_router(points_calculation)
 
 
 @app.get("/docs2", include_in_schema=False)

surftimer/ck_bonus.py

@@ -1019,9 +1019,7 @@ def point_calc_countFinishedBonus(
         )
     )
 
-    if xquery:
-        xquery = xquery.pop()
-    else:
+    if len(xquery) <= 0:
         response.status_code = status.HTTP_204_NO_CONTENT
         return response
 

surftimer/points.py

@@ -0,0 +1,90 @@
+from fastapi import APIRouter, Request, Response, status
+from sql import selectQuery
+from globals import get_cache, set_cache
+import time, json
+import surftimer.queries
+
+router = APIRouter()
+
+@router.get(
+    "/surftimer/point_calc_finishedStages",
+    name="Count Player Finished Stages",
+    tags=["strays", "Point Calculation"],
+)
+def point_calc_finishedStages(
+    request: Request,
+    response: Response,
+    steamid32: str,
+    style: int,
+):
+    """```char sql_stray_point_calc_finishedStages[] = ....```\n"""
+    tic = time.perf_counter()
+
+    # Check if data is cached in Redis
+    cache_key = f"point_calc_finishedStages:{steamid32}-{style}"
+    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_point_calc_finishedStages.format(steamid32, style)
+    )
+
+    if len(xquery) <= 0:
+        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/point_calc_finishedMaps",
+    name="Count Player Finished Maps",
+    tags=["strays", "Point Calculation"],
+)
+def point_calc_finishedMaps(
+    request: Request,
+    response: Response,
+    steamid32: str,
+    style: int,
+):
+    """```char sql_stray_point_calc_finishedMaps[] = ....```\n"""
+    tic = time.perf_counter()
+
+    # Check if data is cached in Redis
+    cache_key = f"point_calc_finishedStages:{steamid32}-{style}"
+    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_point_calc_finishedMaps.format(
+            style, style, steamid32, style
+        )
+    )
+
+    if len(xquery) <= 0:
+        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

@@ -243,3 +243,8 @@
 sql_stray_rankCommand						= "SELECT name, points FROM ck_playerrank WHERE style = 0 ORDER BY points DESC LIMIT {}, 1;"
 sql_stray_rankCommandSelf					= "SELECT name, points FROM ck_playerrank WHERE steamid = '{}' AND style = 0;"
 sql_stray_selectPlayerRankUnknown			= "SELECT steamid, name, points FROM ck_playerrank WHERE name LIKE '%{}%' ORDER BY points DESC LIMIT 0, 1;"
+
+
+## point calc
+sql_stray_point_calc_finishedStages			= "SELECT mapname, stage, (select count(1)+1 from ck_wrcps b where a.mapname=b.mapname and a.runtimepro > b.runtimepro and a.style = b.style and a.stage = b.stage) AS `rank` FROM ck_wrcps a where steamid = '{}' AND style = {};"
+sql_stray_point_calc_finishedMaps			= "SELECT mapname, (select count(1)+1 from ck_playertimes b where a.mapname=b.mapname and a.runtimepro > b.runtimepro AND b.style = {}) AS `rank`, (SELECT count(1) FROM ck_playertimes b WHERE a.mapname = b.mapname AND b.style = {}) as total, (SELECT tier FROM `ck_maptier` b WHERE a.mapname = b.mapname) as tier FROM ck_playertimes a where steamid = '{}' AND style = {};"