Merge pull request #19 from MickeyPvX/fix/caching

fix: caching logic not working properly

Author: MickeyPvX

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "espn-ffl"
-version = "2.1.1"
+version = "2.1.2"
 edition = "2021"
 
 [dependencies]

Cargo.toml

@@ -12,7 +12,7 @@ use std::fmt;
 ///
 /// - **Server-side** (efficient): `Active`, `Injured`
 /// - **Client-side** (less efficient): Specific statuses like `Out`, `Doubtful`, etc.
-#[derive(Debug, Clone, clap::ValueEnum)]
+#[derive(Debug, Clone, PartialEq, Eq, Hash, clap::ValueEnum)]
 pub enum InjuryStatusFilter {
     /// Players who are active/healthy
     Active,
@@ -52,7 +52,7 @@ impl fmt::Display for InjuryStatusFilter {
 ///
 /// Allows filtering players by whether they are currently rostered
 /// on a fantasy team in your league.
-#[derive(Debug, Clone, clap::ValueEnum)]
+#[derive(Debug, Clone, PartialEq, Eq, Hash, clap::ValueEnum)]
 pub enum RosterStatusFilter {
     /// Players currently rostered on any team
     Rostered,
@@ -74,7 +74,7 @@ impl fmt::Display for RosterStatusFilter {
 ///
 /// Allows filtering players by the fantasy team they are currently on.
 /// Supports both team name (partial matching) and exact team ID matching.
-#[derive(Debug, Clone)]
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub enum FantasyTeamFilter {
     /// Filter by team name (supports partial matching)
     Name(String),

src/cli/types/filters.rs

@@ -163,13 +163,7 @@ pub async fn handle_player_data(params: PlayerDataParams) -> Result<()> {
         );
 
         // Get cached data directly from database
-        let cached_data = db.get_cached_player_data(
-            params.base.season,
-            params.base.week,
-            params.base.player_names.as_ref(),
-            params.base.positions.as_ref(),
-            params.projected,
-        )?;
+        let cached_data = db.get_cached_player_data(&params.base, params.projected)?;
 
         // Convert cached data to PlayerPoints format with status info in parallel
         let cached_player_points: Vec<PlayerPoints> = cached_data

src/commands/player_data.rs

@@ -104,44 +104,18 @@ pub async fn handle_projection_analysis(params: ProjectionAnalysisParams) -> Res
         }
     };
 
-    // Check if we already have projected data for this week (without filters)
-    let skip_api_call = !params.base.refresh
-        && params.base.player_names.is_none()
-        && params.base.positions.is_none()
-        && db.has_data_for_week(
-            params.base.season,
-            params.base.week,
-            params.base.player_names.as_ref(),
-            None,
-            Some(true),
-        )?; // Check for projected data
-
-    // Fetch ESPN projections for the target week
-    let players_val = if skip_api_call {
-        if !params.base.as_json {
-            println!("Using cached projection data for analysis...");
-        }
-        // Return empty JSON array to skip processing new data but continue with cached analysis
-        serde_json::Value::Array(vec![])
-    } else {
-        if !params.base.as_json {
-            println!(
-                "Fetching fresh ESPN projections for Week {}...",
-                params.base.week.as_u16()
-            );
-        }
-        get_player_data(PlayerDataRequest {
-            debug: false,
-            league_id,
-            player_names: params.base.player_names.clone(),
-            positions: params.base.positions.clone(),
-            season: params.base.season,
-            week: params.base.week,
-            injury_status_filter: params.base.injury_status.clone(),
-            roster_status_filter: params.base.roster_status.clone(),
-        })
-        .await?
-    };
+    // Fetch ESPN projections for the target week (get_player_data handles caching internally)
+    let players_val = get_player_data(PlayerDataRequest {
+        debug: false,
+        league_id,
+        player_names: params.base.player_names.clone(),
+        positions: params.base.positions.clone(),
+        season: params.base.season,
+        week: params.base.week,
+        injury_status_filter: params.base.injury_status.clone(),
+        roster_status_filter: params.base.roster_status.clone(),
+    })
+    .await?;
 
     let players: Vec<crate::espn::types::Player> = serde_json::from_value(players_val)?;
 

src/commands/projection_analysis.rs

@@ -21,6 +21,7 @@ use std::{
     sync::{Arc, Mutex},
 };
 
+use crate::cli::types::filters::{FantasyTeamFilter, InjuryStatusFilter, RosterStatusFilter};
 use crate::{LeagueId, PlayerId, Position, Season, Week};
 
 /// Path: ~/.cache/league_settings-{season}-{league_id}.json
@@ -79,6 +80,9 @@ pub struct PlayerDataCacheKey {
     pub player_names: Option<Vec<String>>,
     pub positions: Option<Vec<Position>>,
     pub projected: bool,
+    pub injury_status: Option<InjuryStatusFilter>,
+    pub roster_status: Option<RosterStatusFilter>,
+    pub fantasy_team_filter: Option<FantasyTeamFilter>,
 }
 
 impl CacheKey for PlayerDataCacheKey {
@@ -104,12 +108,38 @@ impl CacheKey for PlayerDataCacheKey {
             })
             .unwrap_or_else(|| "all_pos".to_string());
 
+        let injury_hash = self
+            .injury_status
+            .as_ref()
+            .map(|status| format!("inj_{}", status.to_string().to_lowercase()))
+            .unwrap_or_else(|| "all_inj".to_string());
+
+        let roster_hash = self
+            .roster_status
+            .as_ref()
+            .map(|status| format!("ros_{}", status.to_string().to_lowercase()))
+            .unwrap_or_else(|| "all_ros".to_string());
+
+        let team_hash = self
+            .fantasy_team_filter
+            .as_ref()
+            .map(|filter| match filter {
+                FantasyTeamFilter::Id(id) => format!("team_id_{}", id),
+                FantasyTeamFilter::Name(name) => {
+                    format!("team_name_{}", name.to_lowercase().replace(' ', "_"))
+                }
+            })
+            .unwrap_or_else(|| "all_teams".to_string());
+
         format!(
-            "player_data_s{}_w{}_{}_{}_{}",
+            "player_data_s{}_w{}_{}_{}_{}_{}_{}_{}",
             self.season.as_u16(),
             self.week.as_u16(),
             names_hash,
             positions_hash,
+            injury_hash,
+            roster_hash,
+            team_hash,
             if self.projected { "proj" } else { "actual" }
         )
     }
@@ -448,6 +478,9 @@ mod tests {
             player_names: Some(vec!["Josh Allen".to_string()]),
             positions: None,
             projected: false,
+            injury_status: None,
+            roster_status: None,
+            fantasy_team_filter: None,
         };
 
         let file_key = key.to_file_key();