implement is_locked for trip_details

src/tera/admin/planned_event.rs

@@ -47,6 +47,7 @@ struct UpdatePlannedEventForm<'r> {
     max_people: i32,
     notes: Option<&'r str>,
     always_show: bool,
+    is_locked: bool,
 }
 
 #[put("/planned-event", data = "<data>")]
@@ -64,6 +65,7 @@ async fn update(
                     data.max_people,
                     data.notes,
                     data.always_show,
+                    data.is_locked,
                 )
                 .await;
             Flash::success(Redirect::to("/"), "Successfully edited the event")

src/tera/cox.rs

@@ -9,7 +9,7 @@ use sqlx::SqlitePool;
 use crate::model::{
     log::Log,
     planned_event::PlannedEvent,
-    trip::{CoxHelpError, Trip, TripDeleteError, TripUpdateError},
+    trip::{CoxHelpError, Trip, TripDeleteError, TripHelpDeleteError, TripUpdateError},
     tripdetails::{TripDetails, TripDetailsToAdd},
     user::CoxUser,
 };
@@ -43,6 +43,7 @@ struct EditTripForm<'r> {
     notes: Option<&'r str>,
     trip_type: Option<i64>,
     always_show: bool,
+    is_locked: bool,
 }
 
 #[post("/trip/<trip_id>", data = "<data>")]
@@ -61,6 +62,7 @@ async fn update(
             data.notes,
             data.trip_type,
             data.always_show,
+            data.is_locked,
         )
         .await
         {
@@ -99,6 +101,9 @@ async fn join(db: &State<SqlitePool>, planned_event_id: i64, cox: CoxUser) -> Fl
                 Redirect::to("/"),
                 "Du hast dich bereits als Ruderer angemeldet!",
             ),
+            Err(CoxHelpError::DetailsLocked) => {
+                Flash::error(Redirect::to("/"), "Boot ist bereits eingeteilt.")
+            }
         }
     } else {
         Flash::error(Redirect::to("/"), "Event gibt's nicht")
@@ -129,19 +134,25 @@ async fn remove_trip(db: &State<SqlitePool>, trip_id: i64, cox: CoxUser) -> Flas
 #[get("/remove/<planned_event_id>")]
 async fn remove(db: &State<SqlitePool>, planned_event_id: i64, cox: CoxUser) -> Flash<Redirect> {
     if let Some(planned_event) = PlannedEvent::find_by_id(db, planned_event_id).await {
-        if Trip::delete_by_planned_event(db, &cox, &planned_event).await {
-            Log::create(
-                db,
-                format!(
-                    "Cox {} deleted registration for planned_event.id={}",
-                    cox.name, planned_event_id
-                ),
-            )
-            .await;
+        match Trip::delete_by_planned_event(db, &cox, &planned_event).await {
+            Ok(_) => {
+                Log::create(
+                    db,
+                    format!(
+                        "Cox {} deleted registration for planned_event.id={}",
+                        cox.name, planned_event_id
+                    ),
+                )
+                .await;
 
-            Flash::success(Redirect::to("/"), "Erfolgreich abgemeldet!")
-        } else {
-            Flash::error(Redirect::to("/"), "Steuermann hilft nicht aus...")
+                return Flash::success(Redirect::to("/"), "Erfolgreich abgemeldet!");
+            }
+            Err(TripHelpDeleteError::DetailsLocked) => {
+                return Flash::error(Redirect::to("/"), "Boot bereits eingeteilt");
+            }
+            Err(TripHelpDeleteError::CoxNotHelping) => {
+                return Flash::error(Redirect::to("/"), "Steuermann hilft nicht aus...")
+            }
         }
     } else {
         Flash::error(Redirect::to("/"), "Planned_event does not exist.")

src/tera/mod.rs

@@ -16,7 +16,7 @@ use crate::model::{
     tripdetails::TripDetails,
     triptype::TripType,
     user::User,
-    usertrip::{UserTrip, UserTripError},
+    usertrip::{UserTrip, UserTripDeleteError, UserTripError},
 };
 
 mod admin;
@@ -81,6 +81,10 @@ async fn join(db: &State<SqlitePool>, trip_details_id: i64, user: User) -> Flash
             Redirect::to("/"),
             "Bei dieser Ausfahrt können leider keine Gäste mitfahren.",
         ),
+        Err(UserTripError::DetailsLocked) => Flash::error(
+            Redirect::to("/"),
+            "Das Boot ist bereits eingeteilt. Bitte kontaktiere den Schiffsführer (Nummern siehe Signalgruppe) falls du dich doch abmelden willst.",
+        ),
     }
 }
 
@@ -90,18 +94,32 @@ async fn remove(db: &State<SqlitePool>, trip_details_id: i64, user: User) -> Fla
         return Flash::error(Redirect::to("/"), "TripDetailsId does not exist");
     };
 
-    UserTrip::delete(db, &user, &trip_details).await;
+    match UserTrip::delete(db, &user, &trip_details).await {
+        Ok(_) => {
+            Log::create(
+                db,
+                format!(
+                    "User {} unregistered for trip_details.id={}",
+                    user.name, trip_details_id
+                ),
+            )
+            .await;
 
-    Log::create(
-        db,
-        format!(
-            "User {} unregistered for trip_details.id={}",
-            user.name, trip_details_id
-        ),
-    )
-    .await;
+            Flash::success(Redirect::to("/"), "Erfolgreich abgemeldet!")
+        }
+        Err(UserTripDeleteError::DetailsLocked) => {
+            Log::create(
+                db,
+                format!(
+                    "User {} tried to unregister for locked trip_details.id={}",
+                    user.name, trip_details_id
+                ),
+            )
+            .await;
 
-    Flash::success(Redirect::to("/"), "Erfolgreich abgemeldet!")
+            Flash::error(Redirect::to("/"), "Das Boot ist bereits eingeteilt. Bitte kontaktiere den Schiffsführer (Nummern siehe Signalgruppe) falls du dich doch abmelden willst.")
+        }
+    }
 }
 
 #[catch(401)] //unauthorized