From 2003ff0e59d76be6d3467ea0edbe39c727d6221b Mon Sep 17 00:00:00 2001 From: Philipp Hofer Date: Sun, 9 Mar 2025 19:17:34 +0100 Subject: [PATCH 1/3] add unit test for previous bug --- seeds.sql | 1 + src/model/trip.rs | 77 ++++++++++++++++++++++++++++++++--------------- 2 files changed, 53 insertions(+), 25 deletions(-) diff --git a/seeds.sql b/seeds.sql index caa32a2..24129af 100644 --- a/seeds.sql +++ b/seeds.sql @@ -53,6 +53,7 @@ INSERT INTO "planned_event" (name, planned_amount_cox, trip_details_id) VALUES(' INSERT INTO "trip_details" (planned_starting_time, max_people, day, notes) VALUES('11:00', 1, date('now', '+1 day'), 'trip_details for trip from cox'); INSERT INTO "trip" (cox_id, trip_details_id) VALUES(4, 2); +INSERT INTO "trip_details" (planned_starting_time, max_people, day, notes) VALUES('10:00', 2, date('now'), 'same trip_details as id=1'); INSERT INTO "trip_type" (name, desc, question, icon) VALUES ('Regatta', 'Regatta!', 'Kein normales Event. Das ist eine Regatta! Willst du wirklich teilnehmen?', '🏅'); INSERT INTO "trip_type" (name, desc, question, icon) VALUES ('Lange Ausfahrt', 'Lange Ausfahrt!', 'Das ist eine lange Ausfahrt! Willst du wirklich teilnehmen?', '💪'); INSERT INTO "trip_type" (name, desc, question, icon) VALUES ('Wanderfahrt', 'Wanderfahrt!', 'Kein normales Event. Das ist eine Wanderfahrt! Bitte überprüfe ob du alle Anforderungen erfüllst. Willst du wirklich teilnehmen?', '⛱'); diff --git a/src/model/trip.rs b/src/model/trip.rs index a37a8bf..dd817a4 100644 --- a/src/model/trip.rs +++ b/src/model/trip.rs @@ -91,33 +91,31 @@ impl Trip { trip_details.planned_starting_time, ) .await; - if same_starting_datetime.len() > 1 { - for notify in same_starting_datetime { - // don't notify oneself - if notify.id == trip_details.id { - continue; - } + for notify in same_starting_datetime { + // don't notify oneself + if notify.id == trip_details.id { + continue; + } - // don't notify people who have cancelled their trip - if notify.cancelled() { - continue; - } + // don't notify people who have cancelled their trip + if notify.cancelled() { + continue; + } - if let Some(trip) = Trip::find_by_trip_details(db, notify.id).await { - let user_earlier_trip = User::find_by_id(db, trip.cox_id as i32).await.unwrap(); - Notification::create( - db, - &user_earlier_trip, - &format!( - "{} hat eine Ausfahrt zur selben Zeit ({} um {}) wie du erstellt", - user.name, trip.day, trip.planned_starting_time - ), - "Neue Ausfahrt zur selben Zeit", - None, - None, - ) - .await; - } + if let Some(trip) = Trip::find_by_trip_details(db, notify.id).await { + let user_earlier_trip = User::find_by_id(db, trip.cox_id as i32).await.unwrap(); + Notification::create( + db, + &user_earlier_trip, + &format!( + "{} hat eine Ausfahrt zur selben Zeit ({} um {}) wie du erstellt", + user.name, trip.day, trip.planned_starting_time + ), + "Neue Ausfahrt zur selben Zeit", + None, + None, + ) + .await; } } } @@ -486,6 +484,7 @@ mod test { use crate::{ model::{ event::Event, + notification::Notification, trip::{self, TripDeleteError}, tripdetails::TripDetails, user::{SteeringUser, User}, @@ -517,6 +516,34 @@ mod test { assert!(Trip::find_by_id(&pool, 1).await.is_some()); } + #[sqlx::test] + fn test_notification_cox_if_same_datetime() { + let pool = testdb!(); + let cox = SteeringUser::new( + &pool, + User::find_by_name(&pool, "cox".into()).await.unwrap(), + ) + .await + .unwrap(); + let trip_details = TripDetails::find_by_id(&pool, 1).await.unwrap(); + Trip::new_own(&pool, &cox, trip_details).await; + + let cox2 = SteeringUser::new( + &pool, + User::find_by_name(&pool, "cox2".into()).await.unwrap(), + ) + .await + .unwrap(); + let trip_details = TripDetails::find_by_id(&pool, 3).await.unwrap(); + Trip::new_own(&pool, &cox2, trip_details).await; + + let last_notification = &Notification::for_user(&pool, &cox).await[0]; + + assert!(last_notification + .message + .starts_with("cox2 hat eine Ausfahrt zur selben Zeit")); + } + #[sqlx::test] fn test_get_day_cox_trip() { let pool = testdb!(); -- 2.47.2 From 86e5482c6f134c92f1c2bc5b35b9f41ad2c32e3f Mon Sep 17 00:00:00 2001 From: Philipp Hofer Date: Sun, 9 Mar 2025 19:20:56 +0100 Subject: [PATCH 2/3] update id's --- src/model/notification.rs | 2 +- src/model/tripdetails.rs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/model/notification.rs b/src/model/notification.rs index b7dce96..8a49f37 100644 --- a/src/model/notification.rs +++ b/src/model/notification.rs @@ -292,7 +292,7 @@ mod test { assert_eq!(rower_notification.category, "Absage Ausfahrt"); assert_eq!( rower_notification.action_after_reading.as_deref(), - Some("remove_user_trip_with_trip_details_id:3") + Some("remove_user_trip_with_trip_details_id:4") ); // Cox received notification diff --git a/src/model/tripdetails.rs b/src/model/tripdetails.rs index df5204e..ff813cb 100644 --- a/src/model/tripdetails.rs +++ b/src/model/tripdetails.rs @@ -339,7 +339,7 @@ mod test { } ) .await, - 3, + 4, ); assert_eq!( TripDetails::create( @@ -354,7 +354,7 @@ mod test { } ) .await, - 4, + 5, ); } -- 2.47.2 From 18d9f5135423ce9ea57d6beb851a8f777859359c Mon Sep 17 00:00:00 2001 From: Philipp Hofer Date: Wed, 26 Mar 2025 20:56:39 +0100 Subject: [PATCH 3/3] fix kiosk error --- src/tera/stat.rs | 31 +++++++++++++++++++++++++++++-- 1 file changed, 29 insertions(+), 2 deletions(-) diff --git a/src/tera/stat.rs b/src/tera/stat.rs index f1823bf..3665b4c 100644 --- a/src/tera/stat.rs +++ b/src/tera/stat.rs @@ -47,12 +47,13 @@ async fn index(db: &State, user: DonauLinzUser, year: Option) - async fn index_kiosk(db: &State, _kiosk: KioskCookie, year: Option) -> Template { let stat = Stat::people(db, year).await; let club_km = Stat::sum_people(db, year).await; + let club_trips = Stat::trips_people(db, year).await; let guest_km = Stat::guest(db, year).await; let kiosk = true; Template::render( "stat.people", - context!(stat, kiosk, show_kiosk_header: true, guest_km, club_km), + context!(stat, kiosk, show_kiosk_header: true, guest_km, club_km, club_trips), ) } @@ -61,4 +62,30 @@ pub fn routes() -> Vec { } #[cfg(test)] -mod test {} +mod test { + use rocket::{http::Status, local::asynchronous::Client}; + use sqlx::SqlitePool; + + use crate::testdb; + + #[sqlx::test] + fn test_kiosk_stat() { + let db = testdb!(); + + let rocket = rocket::build().manage(db.clone()); + let rocket = crate::tera::config(rocket); + + let client = Client::tracked(rocket).await.unwrap(); + // "Log in" + let req = client.get("/log/kiosk/ekrv2019/Linz"); + let _ = req.dispatch().await; + + // `/stat` should be viewable + let req = client.get("/stat"); + let response = req.dispatch().await; + + assert_eq!(response.status(), Status::Ok); + let text = response.into_string().await.unwrap(); + assert!(text.contains("Statistik")); + } +} -- 2.47.2