Merge branch 'main' into allow-cancel-of-events

src/model/trip.rs

@@ -239,6 +239,12 @@ WHERE day=?
                     .await;
                 }
             }
+        } else {
+            Notification::delete_by_action(
+                db,
+                &format!("remove_user_trip_with_trip_details_id:{}", trip_details_id),
+            )
+            .await;
         }
 
         if max_people > 0 && was_already_cancelled {

src/model/tripdetails.rs

@@ -77,6 +77,12 @@ WHERE day = ? AND planned_starting_time = ?
             return;
         }
 
+        if self.max_people == 0 {
+            // Cox cancelled event, thus it's probably bad weather. Don't bother with sending
+            // notifications
+            return;
+        }
+
         if Trip::find_by_trip_details(db, self.id).await.is_none() {
             // This trip_details belongs to a planned_event, no need to do anything
             return;