more updates after meeting

src/tera/board/boathouse.rs

@@ -1,17 +1,16 @@
 use crate::model::{
     boat::Boat,
     boathouse::Boathouse,
-    user::{AdminUser, UserWithDetails, VorstandUser},
+    user::{AllowedToUpdateBoathouse, UserWithDetails, VorstandUser},
 };
 use rocket::{
-    FromForm, Route, State,
     form::Form,
     get, post,
     request::FlashMessage,
     response::{Flash, Redirect},
-    routes,
+    routes, FromForm, Route, State,
 };
-use rocket_dyn_templates::{Template, tera::Context};
+use rocket_dyn_templates::{tera::Context, Template};
 use sqlx::SqlitePool;
 
 #[get("/boathouse")]
@@ -38,6 +37,11 @@ async fn index(
     let boathouse = Boathouse::get(db).await;
     context.insert("boathouse", &boathouse);
 
+    let allowed_to_edit = AllowedToUpdateBoathouse::new(db, &admin.user)
+        .await
+        .is_some();
+    context.insert("allowed_to_edit", &boathouse);
+
     context.insert(
         "loggedin_user",
         &UserWithDetails::from_user(admin.into_inner(), db).await,
@@ -57,36 +61,29 @@ pub struct FormBoathouseToAdd {
 async fn new<'r>(
     db: &State<SqlitePool>,
     data: Form<FormBoathouseToAdd>,
-    _admin: AdminUser,
+    user: AllowedToUpdateBoathouse,
 ) -> Flash<Redirect> {
-    match Boathouse::create(db, data.into_inner()).await {
+    match Boathouse::create(db, &user, data.into_inner()).await {
         Ok(_) => Flash::success(Redirect::to("/board/boathouse"), "Boot hinzugefügt"),
         Err(e) => Flash::error(Redirect::to("/board/boathouse"), e),
     }
 }
 
 #[get("/boathouse/<boathouse_id>/delete")]
-async fn delete(db: &State<SqlitePool>, _admin: AdminUser, boathouse_id: i32) -> Flash<Redirect> {
+async fn delete(
+    db: &State<SqlitePool>,
+    user: AllowedToUpdateBoathouse,
+    boathouse_id: i32,
+) -> Flash<Redirect> {
     let boat = Boathouse::find_by_id(db, boathouse_id).await;
     match boat {
         Some(boat) => {
-            boat.delete(db).await;
+            boat.delete(db, &user).await;
             Flash::success(Redirect::to("/board/boathouse"), "Bootsplatz gelöscht")
         }
         None => Flash::error(Redirect::to("/board/boathouse"), "Boatplace does not exist"),
     }
 }
-//#[post("/boat/new", data = "<data>")]
-//async fn create(
-//    db: &State<SqlitePool>,
-//    data: Form<BoatToAdd<'_>>,
-//    _admin: AdminUser,
-//) -> Flash<Redirect> {
-//    match Boat::create(db, data.into_inner()).await {
-//        Ok(_) => Flash::success(Redirect::to("/admin/boat"), "Boot hinzugefügt"),
-//        Err(e) => Flash::error(Redirect::to("/admin/boat"), e),
-//    }
-//}
 
 pub fn routes() -> Vec<Route> {
     routes![index, new, delete]