allow non-cox to create ergo-trips

src/model/trip.rs

@@ -9,7 +9,7 @@ use super::{
     notification::Notification,
     tripdetails::TripDetails,
     triptype::TripType,
-    user::{SteeringUser, User},
+    user::{ErgoUser, SteeringUser, User},
     usertrip::UserTrip,
 };
 
@@ -38,7 +38,7 @@ pub struct TripWithUserAndType {
 }
 
 pub struct TripUpdate<'a> {
-    pub cox: &'a SteeringUser,
+    pub cox: &'a User,
     pub trip: &'a Trip,
     pub max_people: i32,
     pub notes: Option<&'a str>,
@@ -63,9 +63,23 @@ impl TripWithUserAndType {
 impl Trip {
     /// Cox decides to create own trip.
     pub async fn new_own(db: &SqlitePool, cox: &SteeringUser, trip_details: TripDetails) {
+        Self::perform_new(db, &cox.user, trip_details).await
+    }
+
+    pub async fn new_own_ergo(db: &SqlitePool, ergo: &ErgoUser, trip_details: TripDetails) {
+        let typ = trip_details.triptype(db).await;
+        if let Some(typ) = typ {
+            let allowed_type = TripType::find_by_id(db, 4).await.unwrap();
+            if typ == allowed_type {
+                Self::perform_new(db, &ergo.user, trip_details).await;
+            }
+        }
+    }
+
+    async fn perform_new(db: &SqlitePool, user: &User, trip_details: TripDetails) {
         let _ = sqlx::query!(
             "INSERT INTO trip (cox_id, trip_details_id) VALUES(?, ?)",
-            cox.id,
+            user.id,
             trip_details.id
         )
         .execute(db)
@@ -96,7 +110,7 @@ impl Trip {
                         &user,
                         &format!(
                             "{} hat eine Ausfahrt zur selben Zeit ({} um {}) wie du erstellt",
-                            cox.user.name, trip.day, trip.planned_starting_time
+                            user.name, trip.day, trip.planned_starting_time
                         ),
                         "Neue Ausfahrt zur selben Zeit",
                         None,
@@ -273,6 +287,12 @@ WHERE day=?
             return Err(TripUpdateError::NotYourTrip);
         }
 
+        if update.trip_type != Some(4) {
+            if !update.cox.allowed_to_steer(db).await {
+                return Err(TripUpdateError::TripTypeNotAllowed);
+            }
+        }
+
         let Some(trip_details_id) = update.trip.trip_details_id else {
             return Err(TripUpdateError::TripDetailsDoesNotExist); //TODO: Remove?
         };
@@ -314,7 +334,7 @@ WHERE day=?
                         &user,
                         &format!(
                             "Die Ausfahrt von {} am {} um {} wurde abgesagt. {} Bitte gib Bescheid, dass du die Info erhalten hast indem du auf ✓ klickst.",
-                            update.cox.user.name,
+                            update.cox.name,
                             update.trip.day,
                             update.trip.planned_starting_time,
                             notes
@@ -384,11 +404,7 @@ WHERE day=?
         Ok(())
     }
 
-    pub(crate) async fn delete(
-        &self,
-        db: &SqlitePool,
-        user: &SteeringUser,
-    ) -> Result<(), TripDeleteError> {
+    pub(crate) async fn delete(&self, db: &SqlitePool, user: &User) -> Result<(), TripDeleteError> {
         let registered_rower = Registration::all_rower(db, self.trip_details_id.unwrap()).await;
         if !registered_rower.is_empty() {
             return Err(TripDeleteError::SomebodyAlreadyRegistered);
@@ -398,7 +414,7 @@ WHERE day=?
             return Err(TripDeleteError::NotYourTrip);
         }
 
-        Log::create(db, format!("{} deleted trip: {:#?}", user.user.name, self)).await;
+        Log::create(db, format!("{} deleted trip: {:#?}", user.name, self)).await;
 
         sqlx::query!("DELETE FROM trip WHERE id = ?", self.id)
             .execute(db)
@@ -464,6 +480,7 @@ pub enum TripDeleteError {
 pub enum TripUpdateError {
     NotYourTrip,
     TripDetailsDoesNotExist,
+    TripTypeNotAllowed,
 }
 
 #[cfg(test)]