many updates :-(

src/model/trip.rs

@@ -4,6 +4,7 @@ use sqlx::SqlitePool;
 
 use super::{
     event::{Event, Registration},
+    log::Log,
     notification::Notification,
     tripdetails::TripDetails,
     triptype::TripType,
@@ -329,18 +330,16 @@ WHERE day=?
             return Err(TripDeleteError::SomebodyAlreadyRegistered);
         }
 
-        if !self.is_trip_from_user(user.id) {
+        if !self.is_trip_from_user(user.id) && !user.has_role(db, "admin").await {
             return Err(TripDeleteError::NotYourTrip);
         }
 
-        sqlx::query!(
-            "DELETE FROM trip WHERE cox_id = ? AND id = ?",
-            user.id,
-            self.id
-        )
-        .execute(db)
-        .await
-        .unwrap(); //TODO: fixme
+        Log::create(db, format!("{} deleted trip: {:#?}", user.user.name, self)).await;
+
+        sqlx::query!("DELETE FROM trip WHERE id = ?", self.id)
+            .execute(db)
+            .await
+            .unwrap(); //TODO: fixme
 
         Ok(())
     }