Fix latest game of week mapping logic

src/pages/10_Set_Your_Lineup.py

@@ -6,7 +6,7 @@ from config import DEFAULT_ICON
 from shared_page import common_page_config
 
 from domain.constants import SEASON
-from domain.playoffs import PLAYOFF_WEEK_TO_NAME, CURRENT_PLAYOFF_WEEK, SCHEDULE_WEEK_TO_PLAYOFF_WEEK
+from domain.playoffs import PLAYOFF_WEEK_TO_NAME, CURRENT_PLAYOFF_WEEK, ROSTER_WEEK_TO_PLAYOFF_WEEK
 from domain.teams import SCHEDULE_NAME_TO_PFR_NAME_MAP, PLAYOFFS_TEAMS
 from queries.nflverse.github_data import get_weekly_rosters
 from queries.pfr.league_schedule import get_season_time_map
@@ -59,29 +59,28 @@ def player_options_from_df(df_options) -> dict[str, dict[int, list[PlayerOption]
     options_map = initialize_empty_options_map()
     for pos, pos_week_map in options_map.items():
         for week in pos_week_map.keys():
-            df_pos_week = df_options[
-                ((df_options.week.map(SCHEDULE_WEEK_TO_PLAYOFF_WEEK) == week) & (df_options.position == pos))
-            ]
+            df_pos_week = df_options[((df_options.week == week) & (df_options.position == pos))]
             if len(df_pos_week) > 0:
                 player_options_list = df_pos_week.apply(PlayerOption.from_series, axis=1).tolist()
                 options_map[pos][int(week)].extend(player_options_list)
     return options_map
 
 
-@st.cache_data(ttl=60 * 60 * 24)
+# @st.cache_data(ttl=60 * 60 * 24)
 def load_options():
     df_rosters = get_weekly_rosters()
 
     # get game schedules
     week_game_times = get_season_time_map(SEASON)
-    latest_game_time_defaults = {k: max(v) for k, v in week_game_times.items() if v}
+    latest_game_time_defaults = {k: max(v.values()) for k, v in week_game_times.items() if v}
 
     # sort
     sort_by_cols = ["position", "week", "fantasy_points"]
     df_rosters.sort_values(sort_by_cols, ascending=False, inplace=True)
 
     # filter data from non-playoffs
-    df_rosters = df_rosters[df_rosters.week.isin(SCHEDULE_WEEK_TO_PLAYOFF_WEEK.keys())]
+    df_rosters = df_rosters[df_rosters.week.isin(ROSTER_WEEK_TO_PLAYOFF_WEEK.keys())]
+    df_rosters["week"] = df_rosters["week"].map(ROSTER_WEEK_TO_PLAYOFF_WEEK)
     # set gametime
     if len(df_rosters) == 0:
         return initialize_empty_options_map()
@@ -92,9 +91,7 @@ def load_options():
         axis=1,
     )
 
-    df_rosters["in_playoffs"] = df_rosters.apply(
-        lambda x: x.team in PLAYOFFS_TEAMS[SCHEDULE_WEEK_TO_PLAYOFF_WEEK[x.week]], axis=1
-    )
+    df_rosters["in_playoffs"] = df_rosters.apply(lambda x: x.team in PLAYOFFS_TEAMS[x.week], axis=1)
 
     df_rosters = df_rosters[df_rosters.in_playoffs]
     player_options = player_options_from_df(df_rosters)