move managing events to own role

src/tera/admin/planned_event.rs

@@ -10,7 +10,7 @@ use sqlx::SqlitePool;
 use crate::model::{
     planned_event::PlannedEvent,
     tripdetails::{TripDetails, TripDetailsToAdd},
-    user::AdminUser,
+    user::PlannedEventUser,
 };
 
 //TODO: add constraints (e.g. planned_amount_cox > 0)
@@ -25,7 +25,7 @@ struct AddPlannedEventForm<'r> {
 async fn create(
     db: &State<SqlitePool>,
     data: Form<AddPlannedEventForm<'_>>,
-    _admin: AdminUser,
+    _admin: PlannedEventUser,
 ) -> Flash<Redirect> {
     let data = data.into_inner();
 
@@ -36,7 +36,7 @@ async fn create(
 
     PlannedEvent::create(db, data.name, data.planned_amount_cox, trip_details).await;
 
-    Flash::success(Redirect::to("/"), "Event hinzugefügt")
+    Flash::success(Redirect::to("/planned"), "Event hinzugefügt")
 }
 
 //TODO: add constraints (e.g. planned_amount_cox > 0)
@@ -54,7 +54,7 @@ struct UpdatePlannedEventForm<'r> {
 async fn update(
     db: &State<SqlitePool>,
     data: Form<UpdatePlannedEventForm<'_>>,
-    _admin: AdminUser,
+    _admin: PlannedEventUser,
 ) -> Flash<Redirect> {
     match PlannedEvent::find_by_id(db, data.id).await {
         Some(planned_event) => {
@@ -68,20 +68,20 @@ async fn update(
                     data.is_locked,
                 )
                 .await;
-            Flash::success(Redirect::to("/"), "Successfully edited the event")
+            Flash::success(Redirect::to("/planned"), "Event erfolgreich bearbeitet")
         }
-        None => Flash::error(Redirect::to("/"), "Planned event id not found"),
+        None => Flash::error(Redirect::to("/planned"), "Planned event id not found"),
     }
 }
 
 #[get("/planned-event/<id>/delete")]
-async fn delete(db: &State<SqlitePool>, id: i64, _admin: AdminUser) -> Flash<Redirect> {
+async fn delete(db: &State<SqlitePool>, id: i64, _admin: PlannedEventUser) -> Flash<Redirect> {
     match PlannedEvent::find_by_id(db, id).await {
         Some(planned_event) => {
             planned_event.delete(db).await;
-            Flash::success(Redirect::to("/"), "Event gelöscht")
+            Flash::success(Redirect::to("/planned"), "Event gelöscht")
         }
-        None => Flash::error(Redirect::to("/"), "PlannedEvent does not exist"),
+        None => Flash::error(Redirect::to("/planned"), "PlannedEvent does not exist"),
     }
 }
 
@@ -120,7 +120,7 @@ mod test {
         let response = req.dispatch().await;
 
         assert_eq!(response.status(), Status::SeeOther);
-        assert_eq!(response.headers().get("Location").next(), Some("/"));
+        assert_eq!(response.headers().get("Location").next(), Some("/planned"));
 
         let flash_cookie = response
             .cookies()
@@ -151,7 +151,7 @@ mod test {
         let response = req.dispatch().await;
 
         assert_eq!(response.status(), Status::SeeOther);
-        assert_eq!(response.headers().get("Location").next(), Some("/"));
+        assert_eq!(response.headers().get("Location").next(), Some("/planned"));
 
         let flash_cookie = response
             .cookies()
@@ -187,7 +187,7 @@ mod test {
         let response = req.dispatch().await;
 
         assert_eq!(response.status(), Status::SeeOther);
-        assert_eq!(response.headers().get("Location").next(), Some("/"));
+        assert_eq!(response.headers().get("Location").next(), Some("/planned"));
 
         let flash_cookie = response
             .cookies()
@@ -196,7 +196,7 @@ mod test {
 
         assert_eq!(
             flash_cookie.value(),
-            "7:successSuccessfully edited the event"
+            "7:successEvent erfolgreich bearbeitet"
         );
 
         let event = PlannedEvent::find_by_id(&db, 1).await.unwrap();
@@ -224,7 +224,7 @@ mod test {
         let response = req.dispatch().await;
 
         assert_eq!(response.status(), Status::SeeOther);
-        assert_eq!(response.headers().get("Location").next(), Some("/"));
+        assert_eq!(response.headers().get("Location").next(), Some("/planned"));
 
         let flash_cookie = response
             .cookies()
@@ -255,7 +255,7 @@ mod test {
         let response = req.dispatch().await;
 
         assert_eq!(response.status(), Status::SeeOther);
-        assert_eq!(response.headers().get("Location").next(), Some("/"));
+        assert_eq!(response.headers().get("Location").next(), Some("/planned"));
 
         let flash_cookie = response
             .cookies()

src/tera/cox.rs

@@ -34,7 +34,7 @@ async fn create(
     //)
     //.await;
 
-    Flash::success(Redirect::to("/"), "Ausfahrt erfolgreich erstellt.")
+    Flash::success(Redirect::to("/planned"), "Ausfahrt erfolgreich erstellt.")
 }
 
 #[derive(FromForm)]
@@ -66,16 +66,19 @@ async fn update(
         )
         .await
         {
-            Ok(_) => Flash::success(Redirect::to("/"), "Ausfahrt erfolgreich aktualisiert."),
+            Ok(_) => Flash::success(
+                Redirect::to("/planned"),
+                "Ausfahrt erfolgreich aktualisiert.",
+            ),
             Err(TripUpdateError::NotYourTrip) => {
-                Flash::error(Redirect::to("/"), "Nicht deine Ausfahrt!")
+                Flash::error(Redirect::to("/planned"), "Nicht deine Ausfahrt!")
             }
             Err(TripUpdateError::TripDetailsDoesNotExist) => {
-                Flash::error(Redirect::to("/"), "Ausfahrt gibt's nicht")
+                Flash::error(Redirect::to("/planned"), "Ausfahrt gibt's nicht")
             }
         }
     } else {
-        Flash::error(Redirect::to("/"), "Ausfahrt gibt's nicht")
+        Flash::error(Redirect::to("/planned"), "Ausfahrt gibt's nicht")
     }
 }
 
@@ -92,21 +95,21 @@ async fn join(db: &State<SqlitePool>, planned_event_id: i64, cox: CoxUser) -> Fl
                     ),
                 )
                 .await;
-                Flash::success(Redirect::to("/"), "Danke für's helfen!")
+                Flash::success(Redirect::to("/planned"), "Danke für's helfen!")
             }
             Err(CoxHelpError::AlreadyRegisteredAsCox) => {
-                Flash::error(Redirect::to("/"), "Du hilfst bereits aus!")
+                Flash::error(Redirect::to("/planned"), "Du hilfst bereits aus!")
             }
             Err(CoxHelpError::AlreadyRegisteredAsRower) => Flash::error(
-                Redirect::to("/"),
+                Redirect::to("/planned"),
                 "Du hast dich bereits als Ruderer angemeldet!",
             ),
             Err(CoxHelpError::DetailsLocked) => {
-                Flash::error(Redirect::to("/"), "Boot ist bereits eingeteilt.")
+                Flash::error(Redirect::to("/planned"), "Boot ist bereits eingeteilt.")
             }
         }
     } else {
-        Flash::error(Redirect::to("/"), "Event gibt's nicht")
+        Flash::error(Redirect::to("/planned"), "Event gibt's nicht")
     }
 }
 
@@ -114,18 +117,18 @@ async fn join(db: &State<SqlitePool>, planned_event_id: i64, cox: CoxUser) -> Fl
 async fn remove_trip(db: &State<SqlitePool>, trip_id: i64, cox: CoxUser) -> Flash<Redirect> {
     let trip = Trip::find_by_id(db, trip_id).await;
     match trip {
-        None => Flash::error(Redirect::to("/"), "Trip gibt's nicht!"),
+        None => Flash::error(Redirect::to("/planned"), "Trip gibt's nicht!"),
         Some(trip) => match trip.delete(db, &cox).await {
             Ok(_) => {
                 Log::create(db, format!("Cox {} deleted trip.id={}", cox.name, trip_id)).await;
-                Flash::success(Redirect::to("/"), "Erfolgreich gelöscht!")
+                Flash::success(Redirect::to("/planned"), "Erfolgreich gelöscht!")
             }
             Err(TripDeleteError::SomebodyAlreadyRegistered) => Flash::error(
-                Redirect::to("/"),
+                Redirect::to("/planned"),
                 "Ausfahrt kann nicht gelöscht werden, da bereits jemand registriert ist!",
             ),
             Err(TripDeleteError::NotYourTrip) => {
-                Flash::error(Redirect::to("/"), "Nicht deine Ausfahrt!")
+                Flash::error(Redirect::to("/planned"), "Nicht deine Ausfahrt!")
             }
         },
     }
@@ -145,17 +148,17 @@ async fn remove(db: &State<SqlitePool>, planned_event_id: i64, cox: CoxUser) ->
                 )
                 .await;
 
-                Flash::success(Redirect::to("/"), "Erfolgreich abgemeldet!")
+                Flash::success(Redirect::to("/planned"), "Erfolgreich abgemeldet!")
             }
             Err(TripHelpDeleteError::DetailsLocked) => {
-                Flash::error(Redirect::to("/"), "Boot bereits eingeteilt")
+                Flash::error(Redirect::to("/planned"), "Boot bereits eingeteilt")
             }
             Err(TripHelpDeleteError::CoxNotHelping) => {
-                Flash::error(Redirect::to("/"), "Steuermann hilft nicht aus...")
+                Flash::error(Redirect::to("/planned"), "Steuermann hilft nicht aus...")
             }
         }
     } else {
-        Flash::error(Redirect::to("/"), "Planned_event does not exist.")
+        Flash::error(Redirect::to("/planned"), "Planned_event does not exist.")
     }
 }
 
@@ -202,7 +205,7 @@ mod test {
         let response = req.dispatch().await;
 
         assert_eq!(response.status(), Status::SeeOther);
-        assert_eq!(response.headers().get("Location").next(), Some("/"));
+        assert_eq!(response.headers().get("Location").next(), Some("/planned"));
 
         let flash_cookie = response
             .cookies()
@@ -250,7 +253,7 @@ mod test {
         let response = req.dispatch().await;
 
         assert_eq!(response.status(), Status::SeeOther);
-        assert_eq!(response.headers().get("Location").next(), Some("/"));
+        assert_eq!(response.headers().get("Location").next(), Some("/planned"));
 
         let flash_cookie = response
             .cookies()
@@ -288,7 +291,7 @@ mod test {
         let response = req.dispatch().await;
 
         assert_eq!(response.status(), Status::SeeOther);
-        assert_eq!(response.headers().get("Location").next(), Some("/"));
+        assert_eq!(response.headers().get("Location").next(), Some("/planned"));
 
         let flash_cookie = response
             .cookies()
@@ -326,7 +329,7 @@ mod test {
         let response = req.dispatch().await;
 
         assert_eq!(response.status(), Status::SeeOther);
-        assert_eq!(response.headers().get("Location").next(), Some("/"));
+        assert_eq!(response.headers().get("Location").next(), Some("/planned"));
 
         let flash_cookie = response
             .cookies()
@@ -354,7 +357,7 @@ mod test {
         let response = req.dispatch().await;
 
         assert_eq!(response.status(), Status::SeeOther);
-        assert_eq!(response.headers().get("Location").next(), Some("/"));
+        assert_eq!(response.headers().get("Location").next(), Some("/planned"));
 
         let flash_cookie = response
             .cookies()
@@ -367,7 +370,7 @@ mod test {
         let response = req.dispatch().await;
 
         assert_eq!(response.status(), Status::SeeOther);
-        assert_eq!(response.headers().get("Location").next(), Some("/"));
+        assert_eq!(response.headers().get("Location").next(), Some("/planned"));
 
         let flash_cookie = response
             .cookies()
@@ -398,7 +401,7 @@ mod test {
         let response = req.dispatch().await;
 
         assert_eq!(response.status(), Status::SeeOther);
-        assert_eq!(response.headers().get("Location").next(), Some("/"));
+        assert_eq!(response.headers().get("Location").next(), Some("/planned"));
 
         let flash_cookie = response
             .cookies()
@@ -429,7 +432,7 @@ mod test {
         let response = req.dispatch().await;
 
         assert_eq!(response.status(), Status::SeeOther);
-        assert_eq!(response.headers().get("Location").next(), Some("/"));
+        assert_eq!(response.headers().get("Location").next(), Some("/planned"));
 
         let flash_cookie = response
             .cookies()
@@ -470,7 +473,7 @@ mod test {
         let response = req.dispatch().await;
 
         assert_eq!(response.status(), Status::SeeOther);
-        assert_eq!(response.headers().get("Location").next(), Some("/"));
+        assert_eq!(response.headers().get("Location").next(), Some("/planned"));
 
         let flash_cookie = response
             .cookies()
@@ -498,7 +501,7 @@ mod test {
         let response = req.dispatch().await;
 
         assert_eq!(response.status(), Status::SeeOther);
-        assert_eq!(response.headers().get("Location").next(), Some("/"));
+        assert_eq!(response.headers().get("Location").next(), Some("/planned"));
 
         let flash_cookie = response
             .cookies()
@@ -526,7 +529,7 @@ mod test {
         let response = req.dispatch().await;
 
         assert_eq!(response.status(), Status::SeeOther);
-        assert_eq!(response.headers().get("Location").next(), Some("/"));
+        assert_eq!(response.headers().get("Location").next(), Some("/planned"));
 
         let flash_cookie = response
             .cookies()