Implement stats, scoring and sorting

src/pages/11_Scoreboard.py

@@ -7,7 +7,7 @@ from shared_page import common_page_config
 from data_storage import get_all_users, get_all_rosters
 from domain.playoffs import CURRENT_PLAYOFF_WEEK, PLAYOFF_WEEK_TO_NAME
 from load_options import get_map_week_player_id_option, PlayerOption
-from stats import get_stats_map
+from stats import get_stats_map, get_scores_map
 
 
 POSITION_LABELS = [
@@ -54,18 +54,18 @@ def get_roster_html_str(week: int, user_map: dict[str, PlayerOption]) -> str:
         week_pos_label = f"{week}-{pos_label}"
         player = user_map.get(week_pos_label, PlayerOption.empty_player(week=week))
         player_stats = get_stats_map().get(week, {}).get(player.gsis_id, {})
-        players_str += get_player_html_str(player, player_stats)
+        player_score = get_scores_map().get(week, {}).get(player.gsis_id, 0.0)
+        players_str += get_player_html_str(player, player_stats, player_score)
     roster_str = f"""<div className='user__roster'>
     {players_str}
 </div>"""
     return roster_str
 
 
-def get_player_html_str(player_opt: PlayerOption, player_stats: dict[str, float]) -> str:
+def get_player_html_str(player_opt: PlayerOption, player_stats: dict[str, float], score: float) -> str:
     # TODO
     multiplier = 1
     game_status = " "
-    score = 0
     game_score = " "
     player_stats_str = get_player_stats_html_str(player_stats)
 
@@ -89,7 +89,7 @@ def get_player_html_str(player_opt: PlayerOption, player_stats: dict[str, float]
 			</div>
 			<div className="player__name">{player_opt.full_name}</div>
 			<div className="player__team">{player_opt.team}</div>
-			<span className="player__score">{score}</span>
+			<span className="player__score">{score: .0f}</span>
 			<span className='{multiplier_classes}'>{multiplier}X</span>
 			<span className="player__game-status">{game_status}</span>
 			<span className="player__game-score">{game_score}</span>
@@ -117,13 +117,11 @@ def get_player_stats_html_str(stats_dict: dict[str, float]) -> str:
     return stats_str
 
 
-def get_user_html_str(week: int, user_name: str, user_map: dict[str, PlayerOption]) -> str:
+def get_user_html_str(
+    week: int, user_name: str, user_map: dict[str, PlayerOption], week_score: float, place: int
+) -> str:
     user_str = ""
-
-    # TODO
-    place = 1
     score_type = "Score"
-    week_score = 0
     roster_html_str = get_roster_html_str(week, user_map)
     user_str += f"""
     <div className="user">
@@ -131,22 +129,44 @@ def get_user_html_str(week: int, user_name: str, user_map: dict[str, PlayerOptio
         <span className="user__username">{user_name}</span>
         <span className="user__username">{user_name}</span>
         <span className="user__score-type">{score_type}</span>
-        <span className="user__score-number">{week_score}</span>
+        <span className="user__score-number">{week_score: .0f}</span>
         {roster_html_str}
     </div>"""
     return user_str
 
 
+def assemble_user_scores(
+    player_scores_map: dict[int, dict[str, float]], roster_map: dict[int, dict[str, PlayerOption]]
+) -> dict[int, dict[int, float]]:
+    week_user_score_map: dict[int, dict[int, float]] = {w: {} for w in player_scores_map.keys()}
+    for user_id, user_roster_map in roster_map.items():
+        user_score = 0.0
+        for roster_key, player_id in user_roster_map.items():
+            week = int(roster_key[0])
+            user_score += player_scores_map.get(week, {}).get(player_id.gsis_id, 0.0)
+        week_user_score_map[week][user_id] = user_score
+    return week_user_score_map
+
+
 def display_masked_rosters(week: int):
     rosters = load_masked_rosters()
     users = get_users_df()
+    player_scores = get_scores_map()
+    user_scores = assemble_user_scores(player_scores, rosters)
 
     scoreboard_str = ""
 
     scoreboard_str += """<div className="scoreboard">"""
-    for row in users.itertuples():
+    sorted_user_rows = sorted(
+        users.itertuples(),
+        key=lambda x: user_scores.get(week, {}).get(x.user_id, 0.0),
+        reverse=True,
+    )
+    for i, row in enumerate(sorted_user_rows):
+        user_score = user_scores.get(week, {}).get(row.user_id, 0.0)
         user_roster_map = rosters.get(row.user_id, {})
-        scoreboard_str += get_user_html_str(week, row.name, user_roster_map)
+        user_place = i + 1
+        scoreboard_str += get_user_html_str(week, row.name, user_roster_map, user_score, user_place)
 
     scoreboard_str += """</div>"""
 

src/stats.py

@@ -11,6 +11,11 @@ class StatType:
     key: str
     score: float
 
+    def __post_init__(self):
+        STAT_KEY_MAP[self.key] = self
+
+
+STAT_KEY_MAP: dict[str, StatType] = {}
 
 RUSH_TD = StatType(key="RUSH TD", score=6.0)
 REC_TD = StatType(key="REC TD", score=6.0)
@@ -149,14 +154,14 @@ def assemble_nflverse_stats() -> dict[int, dict[str, dict[str, float]]]:
     return stat_map
 
 
-# 10 minute cache
-@st.cache_data(ttl=60 * 10)
 def get_live_stats() -> dict[int, dict[str, dict[str, float]]]:
     stat_map: dict[int, dict[str, dict[str, float]]] = {w: {} for w in NFLVERSE_STAT_WEEK_TO_PLAYOFF_WEEK.values()}
     # TODO - implement live stats
     return stat_map
 
 
+# 10 minute cache
+@st.cache_data(ttl=60 * 10)
 def get_stats_map() -> dict[int, dict[str, dict[str, float]]]:
     # use live stats if available
     stat_map = get_live_stats()
@@ -170,3 +175,21 @@ def get_stats_map() -> dict[int, dict[str, dict[str, float]]]:
             stat_map[week][player_id] = player_stats
 
     return stat_map
+
+
+# 10 minute cache
+@st.cache_data(ttl=60 * 10)
+def get_scores_map() -> dict[int, dict[str, float]]:
+    scores_map: dict[int, dict[str, float]] = {w: {} for w in NFLVERSE_STAT_WEEK_TO_PLAYOFF_WEEK.values()}
+
+    stat_map = get_stats_map()
+
+    for week, week_stats in stat_map.items():
+        for player_id, player_stats in week_stats.items():
+            score = 0.0
+            for stat_key, stat_value in player_stats.items():
+                stat_type = STAT_KEY_MAP[stat_key]
+                score += stat_type.score * stat_value
+            scores_map[week][player_id] = score
+
+    return scores_map