fix backend tests

src/model/event.rs

@@ -438,14 +438,14 @@ mod test {
     use crate::{model::tripdetails::TripDetails, testdb};
 
     use super::Event;
-    use chrono::NaiveDate;
+    use chrono::Local;
     use sqlx::SqlitePool;
 
     #[sqlx::test]
     fn test_get_day() {
         let pool = testdb!();
 
-        let res = Event::get_for_day(&pool, NaiveDate::from_ymd_opt(1970, 1, 1).unwrap()).await;
+        let res = Event::get_for_day(&pool, Local::now().date_naive()).await;
         assert_eq!(res.len(), 1);
     }
 
@@ -455,9 +455,9 @@ mod test {
 
         let trip_details = TripDetails::find_by_id(&pool, 1).await.unwrap();
 
-        Event::create(&pool, "new-event".into(), 2, &trip_details).await;
+        Event::create(&pool, "new-event".into(), 2, false, &trip_details).await;
 
-        let res = Event::get_for_day(&pool, NaiveDate::from_ymd_opt(1970, 1, 1).unwrap()).await;
+        let res = Event::get_for_day(&pool, Local::now().date_naive()).await;
         assert_eq!(res.len(), 2);
     }
 
@@ -468,7 +468,7 @@ mod test {
 
         planned_event.delete(&pool).await.unwrap();
 
-        let res = Event::get_for_day(&pool, NaiveDate::from_ymd_opt(1970, 1, 1).unwrap()).await;
+        let res = Event::get_for_day(&pool, Local::now().date_naive()).await;
         assert_eq!(res.len(), 0);
     }
 
@@ -476,7 +476,8 @@ mod test {
     fn test_ics() {
         let pool = testdb!();
 
+        let today = Local::now().date_naive().format("%Y%m%d").to_string();
         let actual = Event::get_ics_feed(&pool).await;
-        assert_eq!("BEGIN:VCALENDAR\r\nVERSION:2.0\r\nPRODID:ics-rs\r\nBEGIN:VEVENT\r\nUID:1@rudernlinz.at\r\nDTSTAMP:19900101T180000\r\nDTSTART:19700101T100000\r\nSUMMARY:test-planned-event \r\nEND:VEVENT\r\nEND:VCALENDAR\r\n", actual);
+        assert_eq!(format!("BEGIN:VCALENDAR\r\nVERSION:2.0\r\nPRODID:ics-rs\r\nBEGIN:VEVENT\r\nUID:1@rudernlinz.at\r\nDTSTAMP:19900101T180000\r\nDTSTART:{today}T100000\r\nSUMMARY:test-planned-event \r\nEND:VEVENT\r\nEND:VCALENDAR\r\n"), actual);
     }
 }

src/model/notification.rs

@@ -203,6 +203,7 @@ mod test {
         testdb,
     };
 
+    use chrono::Local;
     use sqlx::SqlitePool;
 
     #[sqlx::test]
@@ -213,17 +214,16 @@ mod test {
         let add_tripdetails = TripDetailsToAdd {
             planned_starting_time: "10:00",
             max_people: 4,
-            day: "1970-02-01".into(),
+            day: Local::now().date_naive().format("%Y-%m-%d").to_string(),
             notes: None,
             trip_type: None,
             allow_guests: false,
-            always_show: false,
         };
         let tripdetails_id = TripDetails::create(&pool, add_tripdetails).await;
         let trip_details = TripDetails::find_by_id(&pool, tripdetails_id)
             .await
             .unwrap();
-        Event::create(&pool, "new-event".into(), 2, &trip_details).await;
+        Event::create(&pool, "new-event".into(), 2, false, &trip_details).await;
         let event = Event::find_by_trip_details(&pool, trip_details.id)
             .await
             .unwrap();

src/model/trip.rs

@@ -82,7 +82,7 @@ impl Trip {
                 }
 
                 // don't notify people who have cancelled their trip
-                if notify.cancelled(db) {
+                if notify.cancelled() {
                     continue;
                 }
 
@@ -406,7 +406,7 @@ mod test {
         testdb,
     };
 
-    use chrono::NaiveDate;
+    use chrono::Local;
     use sqlx::SqlitePool;
 
     use super::Trip;
@@ -433,7 +433,8 @@ mod test {
     fn test_get_day_cox_trip() {
         let pool = testdb!();
 
-        let res = Trip::get_for_day(&pool, NaiveDate::from_ymd_opt(1970, 1, 2).unwrap()).await;
+        let tomorrow = Local::now().date_naive() + chrono::Duration::days(1);
+        let res = Trip::get_for_day(&pool, tomorrow).await;
         assert_eq!(res.len(), 1);
     }
 
@@ -489,7 +490,6 @@ mod test {
             max_people: 10,
             notes: None,
             trip_type: None,
-            always_show: false,
             is_locked: false,
         };
 
@@ -518,7 +518,6 @@ mod test {
             max_people: 10,
             notes: None,
             trip_type: Some(1),
-            always_show: false,
             is_locked: false,
         };
         assert!(Trip::update_own(&pool, &update).await.is_ok());
@@ -547,7 +546,6 @@ mod test {
             max_people: 10,
             notes: None,
             trip_type: None,
-            always_show: false,
             is_locked: false,
         };
         assert!(Trip::update_own(&pool, &update).await.is_err());

src/model/tripdetails.rs

@@ -94,7 +94,7 @@ WHERE day = ? AND planned_starting_time = ?
         .await.unwrap()
     }
 
-    pub fn cancelled(&self, db: &SqlitePool) -> bool {
+    pub fn cancelled(&self) -> bool {
         self.max_people == 0
     }
 
@@ -106,7 +106,7 @@ WHERE day = ? AND planned_starting_time = ?
             return;
         }
 
-        if self.cancelled(db) {
+        if self.cancelled() {
             // Cox cancelled event, thus it's probably bad weather. Don't bother with sending
             // notifications
             return;