Merge branch 'main' into updates

src/model/trip.rs

@@ -76,23 +76,30 @@ impl Trip {
         .await;
         if same_starting_datetime.len() > 1 {
             for notify in same_starting_datetime {
-                if notify.id != trip_details.id {
+                // don't notify oneself
-                    // notify everyone except oneself
+                if notify.id == trip_details.id {
-                    if let Some(trip) = Trip::find_by_trip_details(db, notify.id).await {
+                    continue;
-                        let user = User::find_by_id(db, trip.cox_id as i32).await.unwrap();
+                }
-                        Notification::create(
+
-                            db,
+                // don't notify people who have cancelled their trip
-                            &user,
+                if notify.cancelled(db) {
-                            &format!(
+                    continue;
-                                "{} hat eine Ausfahrt zur selben Zeit ({} um {}) wie du erstellt",
+                }
-                                cox.user.name, trip.day, trip.planned_starting_time
+
-                            ),
+                if let Some(trip) = Trip::find_by_trip_details(db, notify.id).await {
-                            "Neue Ausfahrt zur selben Zeit",
+                    let user = User::find_by_id(db, trip.cox_id as i32).await.unwrap();
-                            None,
+                    Notification::create(
-                            None,
+                        db,
-                        )
+                        &user,
-                        .await;
+                        &format!(
-                    }
+                            "{} hat eine Ausfahrt zur selben Zeit ({} um {}) wie du erstellt",
+                            cox.user.name, trip.day, trip.planned_starting_time
+                        ),
+                        "Neue Ausfahrt zur selben Zeit",
+                        None,
+                        None,
+                    )
+                    .await;
                 }
             }
         }

src/model/tripdetails.rs

@@ -94,6 +94,10 @@ WHERE day = ? AND planned_starting_time = ?
         .await.unwrap()
     }
 
+    pub fn cancelled(&self, db: &SqlitePool) -> bool {
+        self.max_people == 0
+    }
+
     /// This function is called when a person registers to a trip or when the cox changes the
     /// amount of free places.
     pub async fn check_free_spaces(&self, db: &SqlitePool) {
@@ -102,7 +106,7 @@ WHERE day = ? AND planned_starting_time = ?
             return;
         }
 
-        if self.max_people == 0 {
+        if self.cancelled(db) {
             // Cox cancelled event, thus it's probably bad weather. Don't bother with sending
             // notifications
             return;