allow non-cox to create ergo-trips

src/tera/cox.rs

@@ -11,9 +11,32 @@ use crate::model::{
     log::Log,
     trip::{self, CoxHelpError, Trip, TripDeleteError, TripHelpDeleteError, TripUpdateError},
     tripdetails::{TripDetails, TripDetailsToAdd},
-    user::{AllowedToUpdateTripToAlwaysBeShownUser, SteeringUser},
+    user::{AllowedToUpdateTripToAlwaysBeShownUser, ErgoUser, SteeringUser, User},
 };
 
+#[post("/trip", data = "<data>", rank = 2)]
+async fn create_ergo(
+    db: &State<SqlitePool>,
+    data: Form<TripDetailsToAdd<'_>>,
+    cox: ErgoUser,
+) -> Flash<Redirect> {
+    let trip_details_id = TripDetails::create(db, data.into_inner()).await;
+    let trip_details = TripDetails::find_by_id(db, trip_details_id).await.unwrap(); //Okay, bc just
+                                                                                    //created
+    Trip::new_own_ergo(db, &cox, trip_details).await; //TODO: fix
+
+    //Log::create(
+    //    db,
+    //    format!(
+    //        "Cox {} created trip on {} @ {} for {} rower",
+    //        cox.name, trip_details.day, trip_details.planned_starting_time, trip_details.max_people,
+    //    ),
+    //)
+    //.await;
+
+    Flash::success(Redirect::to("/planned"), "Ausfahrt erfolgreich erstellt.")
+}
+
 #[post("/trip", data = "<data>")]
 async fn create(
     db: &State<SqlitePool>,
@@ -50,7 +73,7 @@ async fn update(
     db: &State<SqlitePool>,
     data: Form<EditTripForm<'_>>,
     trip_id: i64,
-    cox: SteeringUser,
+    cox: User,
 ) -> Flash<Redirect> {
     if let Some(trip) = Trip::find_by_id(db, trip_id).await {
         let update = trip::TripUpdate {
@@ -69,6 +92,10 @@ async fn update(
             Err(TripUpdateError::NotYourTrip) => {
                 Flash::error(Redirect::to("/planned"), "Nicht deine Ausfahrt!")
             }
+            Err(TripUpdateError::TripTypeNotAllowed) => Flash::error(
+                Redirect::to("/planned"),
+                "Du darfst nur Ergo-Events erstellen",
+            ),
             Err(TripUpdateError::TripDetailsDoesNotExist) => {
                 Flash::error(Redirect::to("/planned"), "Ausfahrt gibt's nicht")
             }
@@ -130,7 +157,7 @@ async fn join(db: &State<SqlitePool>, planned_event_id: i64, cox: SteeringUser)
 }
 
 #[get("/remove/trip/<trip_id>")]
-async fn remove_trip(db: &State<SqlitePool>, trip_id: i64, cox: SteeringUser) -> Flash<Redirect> {
+async fn remove_trip(db: &State<SqlitePool>, trip_id: i64, cox: User) -> Flash<Redirect> {
     let trip = Trip::find_by_id(db, trip_id).await;
     match trip {
         None => Flash::error(Redirect::to("/planned"), "Trip gibt's nicht!"),
@@ -185,6 +212,7 @@ async fn remove(
 pub fn routes() -> Vec<Route> {
     routes![
         create,
+        create_ergo,
         join,
         remove,
         remove_trip,

src/tera/planned.rs

@@ -29,7 +29,10 @@ async fn index(
 
     let mut context = Context::new();
 
-    if user.allowed_to_steer(db).await || user.has_role(db, "manage_events").await {
+    if user.allowed_to_steer(db).await
+        || user.has_role(db, "manage_events").await
+        || user.has_role(db, "ergo").await
+    {
         let triptypes = TripType::all(db).await;
         context.insert("trip_types", &triptypes);
     }