feat: percentile display

Author: 7086cmd

routers/users_v2_router.py

@@ -161,28 +161,28 @@ async def get_user_time_statistics_v2(
         "on-campus": {
             "value": user_time["on-campus"],
             "group": find_percentile_threshold(
-                group_indicators["on-campus"], user_time["on-campus"]
+                group_indicators["on-campus"], user_time["on-campus"], "on-campus"
             ),
             "grade": find_percentile_threshold(
-                grade_indicators["on-campus"], user_time["on-campus"]
+                grade_indicators["on-campus"], user_time["on-campus"], "on-campus"
             ),
         },
         "off-campus": {
             "value": user_time["off-campus"],
             "group": find_percentile_threshold(
-                group_indicators["off-campus"], user_time["off-campus"]
+                group_indicators["off-campus"], user_time["off-campus"], "off-campus"
             ),
             "grade": find_percentile_threshold(
-                grade_indicators["off-campus"], user_time["off-campus"]
+                grade_indicators["off-campus"], user_time["off-campus"], "off-campus"
             ),
         },
         "social-practice": {
             "value": user_time["social-practice"],
             "group": find_percentile_threshold(
-                group_indicators["social-practice"], user_time["social-practice"]
+                group_indicators["social-practice"], user_time["social-practice"], "social-practice"
             ),
             "grade": find_percentile_threshold(
-                grade_indicators["social-practice"], user_time["social-practice"]
+                grade_indicators["social-practice"], user_time["social-practice"], "social-practice"
             ),
         },
     }

util/calculate.py

@@ -2,6 +2,7 @@
 from datetime import datetime
 from typing import Any
 
+from config import BASE_ON_CAMPUS, BASE_OFF_CAMPUS, BASE_SOCIAL_PRACTICE
 from database import db
 
 
@@ -74,8 +75,16 @@ async def calculate_user_time(
     return result
 
 
-def find_percentile_threshold(percentiles: dict[str, float], target: float):
-    for key, value in percentiles.items():
-        if target <= value:
+def find_percentile_threshold(percentiles: dict[str, float], target: float, mode: str) -> float:
+    thresholds = {
+        'on-campus': BASE_ON_CAMPUS,
+        'off-campus': BASE_OFF_CAMPUS,
+        'social-practice': BASE_SOCIAL_PRACTICE,
+    }
+    if target >= thresholds[mode]:
+        return 100
+    percentiles = sorted(percentiles.items(), key=lambda item: item[1], reverse=True)
+    for key, value in percentiles:
+        if target >= value:
             return int(key.replace("%", ""))
     return 100