fix(cache): tweak admin page caching + revert count estimate

Author: ImShyMike

rustytime/Cargo.lock

@@ -1,7 +1,7 @@
 [package]
 name = "rustytime-server"
 description = "🕒 blazingly fast time tracking for developers"
-version = "0.15.3"
+version = "0.15.4"
 edition = "2024"
 authors = ["ImShyMike"]
 readme = "../README.md"

rustytime/Cargo.toml

@@ -71,48 +71,34 @@ pub async fn admin_dashboard(
     let offset = query.offset.max(0);
 
     let cached = app_state.cache.admin.get(&());
-    let (total_users, total_heartbeats, heartbeats_last_hour, heartbeats_last_24h, daily_activity) =
-        if let Some(cached) = cached {
-            (
-                cached.total_users,
-                cached.total_heartbeats,
-                cached.heartbeats_last_hour,
-                cached.heartbeats_last_24h,
-                cached.daily_activity,
-            )
-        } else {
-            let mut conn = get_db_conn!(app_state);
-
-            let raw_daily_activity = db_query!(
-                Heartbeat::get_daily_activity_last_week(&mut conn),
-                "Failed to fetch daily activity"
-            );
-            let total_users = db_query!(User::count_total_users(&mut conn, false));
-            let total_heartbeats = db_query!(Heartbeat::count_total_heartbeats_estimate(&mut conn));
-            let heartbeats_last_hour = db_query!(Heartbeat::count_heartbeats_last_hour(&mut conn));
-            let heartbeats_last_24h = db_query!(Heartbeat::count_heartbeats_last_24h(&mut conn));
-
-            app_state.cache.admin.insert(
-                (),
-                CachedAdminStats {
-                    total_users,
-                    total_heartbeats,
-                    heartbeats_last_hour,
-                    heartbeats_last_24h,
-                    daily_activity: raw_daily_activity.clone(),
-                },
-            );
-
-            (
-                total_users,
+    let (total_heartbeats, daily_activity) = if let Some(cached) = cached {
+        (cached.total_heartbeats, cached.daily_activity)
+    } else {
+        let mut conn = get_db_conn!(app_state);
+
+        let raw_daily_activity = db_query!(
+            Heartbeat::get_daily_activity_last_week(&mut conn),
+            "Failed to fetch daily activity"
+        );
+        let total_heartbeats = db_query!(Heartbeat::count_total_heartbeats(&mut conn));
+
+        app_state.cache.admin.insert(
+            (),
+            CachedAdminStats {
                 total_heartbeats,
-                heartbeats_last_hour,
-                heartbeats_last_24h,
-                raw_daily_activity,
-            )
-        };
+                daily_activity: raw_daily_activity.clone(),
+            },
+        );
+
+        (total_heartbeats, raw_daily_activity)
+    };
 
     let mut conn = get_db_conn!(app_state);
+
+    let total_users = db_query!(User::count_total_users(&mut conn, false));
+    let heartbeats_last_hour = db_query!(Heartbeat::count_heartbeats_last_hour(&mut conn));
+    let heartbeats_last_24h = db_query!(Heartbeat::count_heartbeats_last_24h(&mut conn));
+
     let paginated_users = db_query!(
         User::list_users_paginated(&mut conn, limit, offset),
         "Failed to fetch users"

rustytime/src/handlers/page/admin.rs

@@ -12,12 +12,6 @@ use crate::schema::heartbeats::{self};
 use crate::utils::http::parse_user_agent;
 use crate::utils::time::{TimeFormat, human_readable_duration};
 
-#[derive(QueryableByName)]
-struct ApproximateRowCount {
-    #[diesel(sql_type = BigInt)]
-    count: i64,
-}
-
 diesel::define_sql_function! {
     /// Calculate user duration with filters
     #[allow(clippy::too_many_arguments)]
@@ -762,10 +756,8 @@ impl From<Heartbeat> for BulkResponseItem {
 }
 
 impl Heartbeat {
-    pub fn count_total_heartbeats_estimate(conn: &mut PgConnection) -> QueryResult<i64> {
-        diesel::sql_query("SELECT approximate_row_count('heartbeats') AS count")
-            .get_result::<ApproximateRowCount>(conn)
-            .map(|r| r.count)
+    pub fn count_total_heartbeats(conn: &mut PgConnection) -> QueryResult<i64> {
+        heartbeats::table.count().get_result(conn)
     }
 
     pub fn count_heartbeats_last_24h(conn: &mut PgConnection) -> QueryResult<i64> {

rustytime/src/models/heartbeat.rs

@@ -33,10 +33,7 @@ pub struct CachedLeaderboard {
 
 #[derive(Clone)]
 pub struct CachedAdminStats {
-    pub total_users: i64,
     pub total_heartbeats: i64,
-    pub heartbeats_last_hour: i64,
-    pub heartbeats_last_24h: i64,
     pub daily_activity: Vec<DailyActivity>,
 }
 
@@ -65,7 +62,7 @@ impl AppCache {
             admin: Arc::new(
                 Cache::builder()
                     .max_capacity(1)
-                    .time_to_live(Duration::from_secs(30)) // 30 second TTL
+                    .time_to_live(Duration::from_secs(300)) // 5 minute TTL
                     .build(),
             ),
         }