fix seeding + better projects page

Author: ImShyMike

frontend/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "rustytime",
 	"private": false,
-	"version": "0.2.1",
+	"version": "0.2.2",
 	"license": "AGPL-3.0",
 	"type": "module",
 	"repository": {

frontend/src/routes/projects/+page.svelte

@@ -5,15 +5,15 @@
 	import LucideGithub from '~icons/lucide/github';
 	import LucideExternalLink from '~icons/lucide/external-link';
 	import StatCard from '$lib/components/ui/StatCard.svelte';
-	import { formatDuration, formatRelativeTime, creationDateFormatter } from '$lib/utils/time';
+	import { formatRelativeTime, creationDateFormatter } from '$lib/utils/time';
 
 	interface Props {
 		data: PageData;
 	}
 
 	type EnhancedProject = Project & {
 		createdAtFormatted: string;
-		createdAtRelative: string | null;
+		lastUpdated: string | null;
 		repoLabel: string | null;
 	};
 
@@ -35,32 +35,45 @@
 		}
 	};
 
-	const formattedProjects = $derived.by((): EnhancedProject[] => {
+	const sortedProjects = $derived.by((): Project[] => {
 		if (!projectsData?.projects) {
 			return [];
 		}
 
-		return projectsData.projects.map((project) => {
+		return [...projectsData.projects].sort((a, b) => {
+			const dateA = a.updated_at ? new Date(a.updated_at).getTime() : 0;
+			const dateB = b.updated_at ? new Date(b.updated_at).getTime() : 0;
+			return dateB - dateA;
+		});
+	});
+
+	const formattedProjects = $derived.by((): EnhancedProject[] => {
+		if (!sortedProjects.length) {
+			return [];
+		}
+
+		return sortedProjects.map((project) => {
 			const createdDate = project.created_at ? new Date(project.created_at) : null;
-			const isValidDate = createdDate && !Number.isNaN(createdDate.getTime());
+			const updatedDate = project.updated_at ? new Date(project.updated_at) : null;
+			const isCreatedAtValid = createdDate && !Number.isNaN(createdDate.getTime());
+			const isUpdatedAtValid = updatedDate && !Number.isNaN(updatedDate.getTime());
 
 			return {
 				...project,
 				createdAtFormatted:
-					isValidDate && createdDate ? creationDateFormatter.format(createdDate) : 'Unknown',
-				createdAtRelative: isValidDate && createdDate ? formatRelativeTime(createdDate) : null,
+					isCreatedAtValid && createdDate ? creationDateFormatter.format(createdDate) : 'Unknown',
+				lastUpdated: isUpdatedAtValid && updatedDate ? formatRelativeTime(updatedDate) : null,
 				repoLabel: project.repo_url ? formatRepoLabel(project.repo_url) : null
 			} satisfies EnhancedProject;
 		});
 	});
 
-	const totalTrackedSeconds = $derived(
-		formattedProjects.reduce(
-			(accumulator, project) => accumulator + (project.total_seconds ?? 0),
-			0
-		)
-	);
-	const totalTrackedTime = $derived(formatDuration(totalTrackedSeconds));
+	const lastUpdatedProject = $derived.by<EnhancedProject | null>(() => formattedProjects[0] ?? null);
+	const lastUpdatedProjectLabel = $derived.by<string>(() => {
+		const project = formattedProjects[0];
+		return project?.lastUpdated ? `Updated ${project.lastUpdated}` : 'Awaiting activity';
+	});
+
 	const projectCount = $derived(formattedProjects.length);
 	const repoCount = $derived(
 		formattedProjects.filter((project) => Boolean(project.repo_url)).length
@@ -79,13 +92,20 @@
 			<!-- Project Statistics -->
 			{#if formattedProjects.length}
 				<div class="grid grid-cols-1 gap-4 mb-8 sm:grid-cols-2">
-					<StatCard title="Total tracked time" value={totalTrackedTime} />
-
 					<StatCard
 						title="Total projects"
 						value={projectCount}
-						subvalue="({repoCount} with repositories)"
+						subvalue="{repoCount} with repositories"
 					/>
+
+					{#if lastUpdatedProject}
+						<StatCard
+							title="Last updated project"
+							value={lastUpdatedProject.name ?? 'Unknown project'}
+							subvalue={lastUpdatedProjectLabel}
+						/>
+					{/if}
+					
 				</div>
 
 				<!-- Project List -->
@@ -125,8 +145,8 @@
 									<span class="text-sm font-semibold text-ctp-subtext0"
 										>{project.createdAtFormatted}</span
 									>
-									{#if project.createdAtRelative}
-										<span class="text-xs text-ctp-overlay1">{project.createdAtRelative}</span>
+									{#if project.lastUpdated}
+										<span class="text-xs text-ctp-overlay1">Last updated {project.lastUpdated}</span>
 									{/if}
 								</div>
 							</div>

rustytime/Cargo.lock

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

rustytime/Cargo.toml

@@ -1,13 +1,13 @@
 #![cfg(feature = "seed")]
 
+use crate::db::connection::DbPool;
+use crate::handlers::user::store_heartbeats_in_db;
 use crate::models::heartbeat::{NewHeartbeat, SourceType};
 use crate::models::user::User;
-use crate::schema::heartbeats;
 use chrono::Utc;
-use diesel::prelude::*;
 use ipnetwork::{IpNetwork, Ipv4Network};
-use rand::Rng;
 use rand::prelude::IndexedRandom;
+use rand::Rng;
 use std::net::Ipv4Addr;
 use tracing::{info, warn};
 
@@ -29,41 +29,38 @@ struct HeartbeatParams<'a> {
     user_agent: &'a str,
 }
 
-pub fn seed_database(conn: &mut PgConnection) -> Result<(), Box<dyn std::error::Error>> {
+pub async fn seed_database(pool: &DbPool) -> Result<(), Box<dyn std::error::Error>> {
     info!("🔄 Starting database seeding...");
 
-    let Ok(user) = create_dummy_user(conn) else {
-        warn!("⚠️  Dummy user already exists, skipping seeding.");
-        return Ok(());
+    let user = {
+        let mut conn = pool.get()?;
+
+        if let Some(existing_user) = User::find_by_github_id(&mut conn, -1)? {
+            warn!("⚠️  Dummy user already exists (id: {}), skipping seeding.", existing_user.id);
+            return Ok(());
+        }
+
+        User::create_or_update(
+            &mut conn,
+            -1,
+            "Test User",
+            "https://avatars.githubusercontent.com/u/999999",
+        )?
     };
+
     info!(
         "✅ Created dummy user: {} (API Key: {})",
         user.name, user.api_key
     );
 
-    generate_random_heartbeats(conn, user.id, TOTAL_HEARTBEATS)?;
+    generate_random_heartbeats(pool, user.id, TOTAL_HEARTBEATS).await?;
 
     info!("✅ Database seeding completed successfully!");
     Ok(())
 }
-
-fn create_dummy_user(conn: &mut PgConnection) -> Result<User, Box<dyn std::error::Error>> {
-    if User::find_by_github_id(conn, -1)?.is_some() {
-        return Err("Dummy user already exists".into());
-    }
-
-    let user = User::create_or_update(
-        conn,
-        -1,
-        "Test User",
-        "https://avatars.githubusercontent.com/u/999999",
-    )?;
-
-    Ok(user)
-}
-
-fn generate_random_heartbeats(
-    conn: &mut PgConnection,
+ 
+async fn generate_random_heartbeats(
+    pool: &DbPool,
     user_id: i32,
     count: usize,
 ) -> Result<(), Box<dyn std::error::Error>> {
@@ -81,18 +78,25 @@ fn generate_random_heartbeats(
         user_agent: USER_AGENT,
     };
 
-    let mut heartbeats = Vec::with_capacity(count);
+    let mut batch = Vec::with_capacity(BATCH_SIZE);
+
     for _ in 0..count {
         let heartbeat = generate_random_heartbeat(&mut rng, user_id, &params);
-        heartbeats.push(heartbeat);
+        batch.push(heartbeat);
+
+        if batch.len() == BATCH_SIZE {
+            let current_batch: Vec<_> = batch.drain(..).collect();
+            store_heartbeats_in_db(pool, current_batch).await?;
+        }
     }
 
-    for batch in heartbeats.chunks(BATCH_SIZE) {
-        diesel::insert_into(heartbeats::table)
-            .values(batch)
-            .execute(conn)?;
+    if !batch.is_empty() {
+        let current_batch: Vec<_> = batch.drain(..).collect();
+        store_heartbeats_in_db(pool, current_batch).await?;
     }
 
+    info!("✅ Inserted {} heartbeats into the database", count);
+
     Ok(())
 }
 
@@ -137,7 +141,7 @@ fn generate_random_heartbeat<R: Rng>(
         is_write: Some(rng.random_bool(0.5)),
         editor: Some("vscode".to_string()),
         operating_system: Some("linux".to_string()),
-        machine: "test-machine".to_string(),
+        machine: Some("test-machine".to_string()),
         user_agent: params.user_agent.to_string(),
         lines: Some(rng.random_range(1..=1000)),
         project_root_count: None,
@@ -147,5 +151,6 @@ fn generate_random_heartbeat<R: Rng>(
         lineno: Some(rng.random_range(1..=100)),
         cursorpos: Some(rng.random_range(0..500)),
         source_type: SourceType::SEEDING.to_string().into(),
+        project_id: None,
     }
 }

rustytime/src/db/seed.rs

@@ -60,8 +60,7 @@ pub async fn projects_dashboard(
             created_at: proj.created_at,
             updated_at: proj.updated_at,
             total_seconds: time,
-            human_readable_total: human_readable_duration(time, TimeFormat::HourMinute)
-                .human_readable,
+            human_readable_total: human_readable_duration(time, TimeFormat::NoDays).human_readable,
         })
         .collect();
 

rustytime/src/handlers/projects.rs

@@ -209,7 +209,7 @@ pub async fn get_statusbar_today(
 }
 
 /// Store heartbeats in the database
-async fn store_heartbeats_in_db(
+pub async fn store_heartbeats_in_db(
     pool: &DbPool,
     new_heartbeats: Vec<NewHeartbeat>,
 ) -> Result<Vec<Heartbeat>, diesel::result::Error> {

rustytime/src/handlers/user.rs

@@ -50,12 +50,7 @@ async fn main() {
     // seed database if enabled
     #[cfg(feature = "seed")]
     {
-        let mut conn = pool.get().unwrap_or_else(|e| {
-            error!("❌ Failed to get database connection for seeding: {}", e);
-            std::process::exit(1);
-        });
-
-        let result = db::seed::seed_database(&mut conn);
+        let result = db::seed::seed_database(&pool).await;
         match result {
             Ok(_) => info!("✅ Database seeding completed"),
             Err(e) => {