From de567eedec74265ede2b8f00528b969598be262e Mon Sep 17 00:00:00 2001
From: philipp <philipp@hofer.link>
Date: Fri, 25 Oct 2024 18:29:50 +0200
Subject: [PATCH] switch from cox to steeringuser, which contains both cox +
 bootsfuehrer

---
 src/model/notification.rs              |  4 +--
 src/model/trip.rs                      | 34 +++++++++++++-------------
 src/model/user.rs                      |  6 ++++-
 src/model/usertrip.rs                  |  8 +++---
 src/tera/boatdamage.rs                 |  4 +--
 src/tera/cox.rs                        | 16 +++++++-----
 templates/boatdamages.html.tera        |  2 +-
 templates/includes/buttons.html.tera   |  2 +-
 templates/includes/forms/log.html.tera |  2 +-
 templates/log.html.tera                |  4 +--
 templates/planned.html.tera            | 12 ++++-----
 11 files changed, 51 insertions(+), 43 deletions(-)

diff --git a/src/model/notification.rs b/src/model/notification.rs
index ab592c3..0b193ae 100644
--- a/src/model/notification.rs
+++ b/src/model/notification.rs
@@ -195,7 +195,7 @@ mod test {
             notification::Notification,
             trip::Trip,
             tripdetails::{TripDetails, TripDetailsToAdd},
-            user::{CoxUser, User},
+            user::{SteeringUser, User},
             usertrip::UserTrip,
         },
         testdb,
@@ -231,7 +231,7 @@ mod test {
         UserTrip::create(&pool, &rower, &trip_details, None)
             .await
             .unwrap();
-        let cox = CoxUser::new(&pool, User::find_by_name(&pool, "cox").await.unwrap())
+        let cox = SteeringUser::new(&pool, User::find_by_name(&pool, "cox").await.unwrap())
             .await
             .unwrap();
         Trip::new_join(&pool, &cox, &event).await.unwrap();
diff --git a/src/model/trip.rs b/src/model/trip.rs
index dfeacc4..cefb1ce 100644
--- a/src/model/trip.rs
+++ b/src/model/trip.rs
@@ -9,7 +9,7 @@ use super::{
     notification::Notification,
     tripdetails::TripDetails,
     triptype::TripType,
-    user::{CoxUser, User},
+    user::{SteeringUser, User},
     usertrip::UserTrip,
 };
 
@@ -38,7 +38,7 @@ pub struct TripWithUserAndType {
 }
 
 pub struct TripUpdate<'a> {
-    pub cox: &'a CoxUser,
+    pub cox: &'a SteeringUser,
     pub trip: &'a Trip,
     pub max_people: i32,
     pub notes: Option<&'a str>,
@@ -62,7 +62,7 @@ impl TripWithUserAndType {
 
 impl Trip {
     /// Cox decides to create own trip.
-    pub async fn new_own(db: &SqlitePool, cox: &CoxUser, trip_details: TripDetails) {
+    pub async fn new_own(db: &SqlitePool, cox: &SteeringUser, trip_details: TripDetails) {
         let _ = sqlx::query!(
             "INSERT INTO trip (cox_id, trip_details_id) VALUES(?, ?)",
             cox.id,
@@ -207,7 +207,7 @@ WHERE trip.id=?
     /// Cox decides to help in a event.
     pub async fn new_join(
         db: &SqlitePool,
-        cox: &CoxUser,
+        cox: &SteeringUser,
         event: &Event,
     ) -> Result<(), CoxHelpError> {
         if event.is_rower_registered(db, cox).await {
@@ -360,7 +360,7 @@ WHERE day=?
 
     pub async fn delete_by_planned_event(
         db: &SqlitePool,
-        cox: &CoxUser,
+        cox: &SteeringUser,
         event: &Event,
     ) -> Result<(), TripHelpDeleteError> {
         if event.trip_details(db).await.is_locked {
@@ -387,7 +387,7 @@ WHERE day=?
     pub(crate) async fn delete(
         &self,
         db: &SqlitePool,
-        user: &CoxUser,
+        user: &SteeringUser,
     ) -> Result<(), TripDeleteError> {
         let registered_rower = Registration::all_rower(db, self.trip_details_id.unwrap()).await;
         if !registered_rower.is_empty() {
@@ -473,7 +473,7 @@ mod test {
             event::Event,
             trip::{self, TripDeleteError},
             tripdetails::TripDetails,
-            user::{CoxUser, User},
+            user::{SteeringUser, User},
             usertrip::UserTrip,
         },
         testdb,
@@ -488,7 +488,7 @@ mod test {
     fn test_new_own() {
         let pool = testdb!();
 
-        let cox = CoxUser::new(
+        let cox = SteeringUser::new(
             &pool,
             User::find_by_name(&pool, "cox".into()).await.unwrap(),
         )
@@ -515,7 +515,7 @@ mod test {
     fn test_new_succ_join() {
         let pool = testdb!();
 
-        let cox = CoxUser::new(
+        let cox = SteeringUser::new(
             &pool,
             User::find_by_name(&pool, "cox2".into()).await.unwrap(),
         )
@@ -531,7 +531,7 @@ mod test {
     fn test_new_failed_join_already_cox() {
         let pool = testdb!();
 
-        let cox = CoxUser::new(
+        let cox = SteeringUser::new(
             &pool,
             User::find_by_name(&pool, "cox2".into()).await.unwrap(),
         )
@@ -548,7 +548,7 @@ mod test {
     fn test_succ_update_own() {
         let pool = testdb!();
 
-        let cox = CoxUser::new(
+        let cox = SteeringUser::new(
             &pool,
             User::find_by_name(&pool, "cox".into()).await.unwrap(),
         )
@@ -576,7 +576,7 @@ mod test {
     fn test_succ_update_own_with_triptype() {
         let pool = testdb!();
 
-        let cox = CoxUser::new(
+        let cox = SteeringUser::new(
             &pool,
             User::find_by_name(&pool, "cox".into()).await.unwrap(),
         )
@@ -604,7 +604,7 @@ mod test {
     fn test_fail_update_own_not_your_trip() {
         let pool = testdb!();
 
-        let cox = CoxUser::new(
+        let cox = SteeringUser::new(
             &pool,
             User::find_by_name(&pool, "cox2".into()).await.unwrap(),
         )
@@ -629,7 +629,7 @@ mod test {
     fn test_succ_delete_by_planned_event() {
         let pool = testdb!();
 
-        let cox = CoxUser::new(
+        let cox = SteeringUser::new(
             &pool,
             User::find_by_name(&pool, "cox".into()).await.unwrap(),
         )
@@ -652,7 +652,7 @@ mod test {
     fn test_succ_delete() {
         let pool = testdb!();
 
-        let cox = CoxUser::new(
+        let cox = SteeringUser::new(
             &pool,
             User::find_by_name(&pool, "cox".into()).await.unwrap(),
         )
@@ -670,7 +670,7 @@ mod test {
     fn test_fail_delete_diff_cox() {
         let pool = testdb!();
 
-        let cox = CoxUser::new(
+        let cox = SteeringUser::new(
             &pool,
             User::find_by_name(&pool, "cox2".into()).await.unwrap(),
         )
@@ -692,7 +692,7 @@ mod test {
     fn test_fail_delete_someone_registered() {
         let pool = testdb!();
 
-        let cox = CoxUser::new(
+        let cox = SteeringUser::new(
             &pool,
             User::find_by_name(&pool, "cox".into()).await.unwrap(),
         )
diff --git a/src/model/user.rs b/src/model/user.rs
index 24127a9..466b5ea 100644
--- a/src/model/user.rs
+++ b/src/model/user.rs
@@ -50,16 +50,20 @@ pub struct UserWithDetails {
     #[serde(flatten)]
     pub user: User,
     pub amount_unread_notifications: i32,
+    pub allowed_to_steer: bool,
     pub on_water: bool,
     pub roles: Vec<String>,
 }
 
 impl UserWithDetails {
     pub async fn from_user(user: User, db: &SqlitePool) -> Self {
+        let allowed_to_steer =
+            user.has_role(db, "cox").await || user.has_role(db, "Bootsführer").await;
         Self {
             on_water: user.on_water(db).await,
             roles: user.roles(db).await,
             amount_unread_notifications: user.amount_unread_notifications(db).await,
+            allowed_to_steer,
             user,
         }
     }
@@ -1153,7 +1157,7 @@ macro_rules! special_user {
 }
 
 special_user!(TechUser, +"tech");
-special_user!(CoxUser, +"cox");
+special_user!(SteeringUser, +"cox", +"Bootsführer");
 special_user!(AdminUser, +"admin");
 special_user!(AllowedForPlannedTripsUser, +"Donau Linz", +"scheckbuch");
 special_user!(DonauLinzUser, +"Donau Linz", -"Unterstützend", -"Förderndes Mitglied");
diff --git a/src/model/usertrip.rs b/src/model/usertrip.rs
index f73a19a..4ea4341 100644
--- a/src/model/usertrip.rs
+++ b/src/model/usertrip.rs
@@ -5,7 +5,7 @@ use super::{
     notification::Notification,
     trip::{Trip, TripWithUserAndType},
     tripdetails::TripDetails,
-    user::{CoxUser, User},
+    user::{SteeringUser, User},
 };
 use crate::model::tripdetails::{Action, CoxAtTrip::Yes};
 
@@ -197,7 +197,7 @@ impl UserTrip {
         let mut add_info = "";
         if let Some(trip) = &trip_to_delete {
             let cox = User::find_by_id(db, trip.cox_id as i32).await.unwrap();
-            trip.delete(db, &CoxUser::new(db, cox).await.unwrap())
+            trip.delete(db, &SteeringUser::new(db, cox).await.unwrap())
                 .await
                 .unwrap();
             add_info = " Das war die letzte angemeldete Person. Nachdem nun alle Bescheid wissen, wird die Ausfahrt ab sofort nicht mehr angezeigt.";
@@ -270,7 +270,7 @@ pub enum UserTripDeleteError {
 mod test {
     use crate::{
         model::{
-            event::Event, trip::Trip, tripdetails::TripDetails, user::CoxUser,
+            event::Event, trip::Trip, tripdetails::TripDetails, user::SteeringUser,
             usertrip::UserTripError,
         },
         testdb,
@@ -353,7 +353,7 @@ mod test {
     fn test_fail_create_is_cox_planned_event() {
         let pool = testdb!();
 
-        let cox = CoxUser::new(
+        let cox = SteeringUser::new(
             &pool,
             User::find_by_name(&pool, "cox".into()).await.unwrap(),
         )
diff --git a/src/tera/boatdamage.rs b/src/tera/boatdamage.rs
index 246e5c6..ec80954 100644
--- a/src/tera/boatdamage.rs
+++ b/src/tera/boatdamage.rs
@@ -13,7 +13,7 @@ use crate::{
     model::{
         boat::Boat,
         boatdamage::{BoatDamage, BoatDamageFixed, BoatDamageToAdd, BoatDamageVerified},
-        user::{CoxUser, DonauLinzUser, TechUser, User, UserWithDetails},
+        user::{DonauLinzUser, SteeringUser, TechUser, User, UserWithDetails},
     },
     tera::log::KioskCookie,
 };
@@ -133,7 +133,7 @@ async fn fixed<'r>(
     db: &State<SqlitePool>,
     data: Form<FormBoatDamageFixed<'r>>,
     boatdamage_id: i32,
-    coxuser: CoxUser,
+    coxuser: SteeringUser,
 ) -> Flash<Redirect> {
     let boatdamage = BoatDamage::find_by_id(db, boatdamage_id).await.unwrap(); //TODO: Fix
     let boatdamage_fixed = BoatDamageFixed {
diff --git a/src/tera/cox.rs b/src/tera/cox.rs
index 3166fc6..dbee671 100644
--- a/src/tera/cox.rs
+++ b/src/tera/cox.rs
@@ -11,14 +11,14 @@ use crate::model::{
     log::Log,
     trip::{self, CoxHelpError, Trip, TripDeleteError, TripHelpDeleteError, TripUpdateError},
     tripdetails::{TripDetails, TripDetailsToAdd},
-    user::{AllowedToUpdateTripToAlwaysBeShownUser, CoxUser},
+    user::{AllowedToUpdateTripToAlwaysBeShownUser, SteeringUser},
 };
 
 #[post("/trip", data = "<data>")]
 async fn create(
     db: &State<SqlitePool>,
     data: Form<TripDetailsToAdd<'_>>,
-    cox: CoxUser,
+    cox: SteeringUser,
 ) -> 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
@@ -50,7 +50,7 @@ async fn update(
     db: &State<SqlitePool>,
     data: Form<EditTripForm<'_>>,
     trip_id: i64,
-    cox: CoxUser,
+    cox: SteeringUser,
 ) -> Flash<Redirect> {
     if let Some(trip) = Trip::find_by_id(db, trip_id).await {
         let update = trip::TripUpdate {
@@ -96,7 +96,7 @@ async fn toggle_always_show(
 }
 
 #[get("/join/<planned_event_id>")]
-async fn join(db: &State<SqlitePool>, planned_event_id: i64, cox: CoxUser) -> Flash<Redirect> {
+async fn join(db: &State<SqlitePool>, planned_event_id: i64, cox: SteeringUser) -> Flash<Redirect> {
     if let Some(planned_event) = Event::find_by_id(db, planned_event_id).await {
         match Trip::new_join(db, &cox, &planned_event).await {
             Ok(_) => {
@@ -130,7 +130,7 @@ async fn join(db: &State<SqlitePool>, planned_event_id: i64, cox: CoxUser) -> Fl
 }
 
 #[get("/remove/trip/<trip_id>")]
-async fn remove_trip(db: &State<SqlitePool>, trip_id: i64, cox: CoxUser) -> Flash<Redirect> {
+async fn remove_trip(db: &State<SqlitePool>, trip_id: i64, cox: SteeringUser) -> Flash<Redirect> {
     let trip = Trip::find_by_id(db, trip_id).await;
     match trip {
         None => Flash::error(Redirect::to("/planned"), "Trip gibt's nicht!"),
@@ -151,7 +151,11 @@ 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> {
+async fn remove(
+    db: &State<SqlitePool>,
+    planned_event_id: i64,
+    cox: SteeringUser,
+) -> Flash<Redirect> {
     if let Some(planned_event) = Event::find_by_id(db, planned_event_id).await {
         match Trip::delete_by_planned_event(db, &cox, &planned_event).await {
             Ok(_) => {
diff --git a/templates/boatdamages.html.tera b/templates/boatdamages.html.tera
index 5f44fc5..63751d1 100644
--- a/templates/boatdamages.html.tera
+++ b/templates/boatdamages.html.tera
@@ -56,7 +56,7 @@
                     {% if boatdamage.fixed_at %}
                         <small class="block text-gray-600 dark:text-gray-100">Repariert von {{ boatdamage.user_fixed.name }} am/um {{ boatdamage.fixed_at | date(format='%d.%m.%Y (%H:%M)') }}</small>
                     {% else %}
-                        {% if loggedin_user and "cox" in loggedin_user.roles %}
+                        {% if loggedin_user and loggedin_user.allowed_to_steer %}
                             <form action="/boatdamage/{{ boatdamage.id }}/fixed"
                                   method="post"
                                   class="flex justify-between mt-3">
diff --git a/templates/includes/buttons.html.tera b/templates/includes/buttons.html.tera
index 8e0dd0e..6f70d16 100644
--- a/templates/includes/buttons.html.tera
+++ b/templates/includes/buttons.html.tera
@@ -1,4 +1,4 @@
-{% if "cox" in loggedin_user.roles %}
+{% if loggedin_user.allowed_to_steer %}
     <div class="sm:col-span-2 lg:col-span-3 grid md:grid-cols-3 lg:grid-cols-4 xl:grid-cols-5 gap-3">
         <button type="button"
                 title="Toggle View"
diff --git a/templates/includes/forms/log.html.tera b/templates/includes/forms/log.html.tera
index 552c645..3c60a2b 100644
--- a/templates/includes/forms/log.html.tera
+++ b/templates/includes/forms/log.html.tera
@@ -93,7 +93,7 @@
                 <option value="{{ user.id }}"
                         {% if sel %}selected{% endif %}
                         {% if user.on_water %}disabled="disabled"{% endif %}
-                        data-custom-properties='{"is_cox": {{ "cox" in user.roles }}, "is_racing": {{ "Rennrudern" in user.roles }}, "steers": {{ user.id == steering_person_id }}, "cox_on_boat": {{ user.id == cox_on_boat }}, "searchableText": "{{ user.nickname }}"}'>
+                        data-custom-properties='{"is_cox": {{ user.allowed_to_steer }}, "is_racing": {{ "Rennrudern" in user.roles }}, "steers": {{ user.id == steering_person_id }}, "cox_on_boat": {{ user.id == cox_on_boat }}, "searchableText": "{{ user.nickname }}"}'>
                     {{ user.name }}
                     {% if user.on_water %}(am Wasser){% endif %}
                 </option>
diff --git a/templates/log.html.tera b/templates/log.html.tera
index aeae283..106d4d6 100644
--- a/templates/log.html.tera
+++ b/templates/log.html.tera
@@ -23,9 +23,9 @@
                     {% if on_water | length > 0 %}
                         {% for log in on_water %}
                             {% if log.shipmaster == loggedin_user.id %}
-                                {{ log::show(log=log, state="on_water", allowed_to_close=true, only_ones="cox" not in loggedin_user.roles) }}
+                                {{ log::show(log=log, state="on_water", allowed_to_close=true, only_ones=not loggedin_user.allowed_to_steer) }}
                             {% elif "Vorstand" in loggedin_user.roles %}
-                                {{ log::show(log=log, state="on_water", allowed_to_close=true, only_ones="cox" not in loggedin_user.roles) }}
+                                {{ log::show(log=log, state="on_water", allowed_to_close=true, only_ones=not loggedin_user.allowed_to_steer) }}
                             {% else %}
                                 {{ log::show(log=log, state="on_water", only_ones=true) }}
                             {% endif %}
diff --git a/templates/planned.html.tera b/templates/planned.html.tera
index e500be3..0fcf7bd 100644
--- a/templates/planned.html.tera
+++ b/templates/planned.html.tera
@@ -151,7 +151,7 @@
                                                 {% endif %}
                                                 {# --- END Row Buttons --- #}
                                                 {# --- START Cox Buttons --- #}
-                                                {% if "cox" in loggedin_user.roles %}
+                                                {% if loggedin_user.allowed_to_steer %}
                                                     {% set_global cur_user_participates = false %}
                                                     {% for cox in event.cox %}
                                                         {% if cox.name == loggedin_user.name %}
@@ -421,11 +421,11 @@
             {% endif %}
         </div>
         {# --- START Add Buttons --- #}
-        {% if "manage_events" in loggedin_user.roles or "cox" in loggedin_user.roles %}
-            <div class="grid {% if "manage_events" in loggedin_user.roles and "cox" in loggedin_user.roles %}grid-cols-2{% endif %} text-center">
+        {% if "manage_events" in loggedin_user.roles or loggedin_user.allowed_to_steer %}
+            <div class="grid {% if "manage_events" in loggedin_user.roles and loggedin_user.allowed_to_steer %}grid-cols-2{% endif %} text-center">
                 {% if "manage_events" in loggedin_user.roles %}
                     <a href="#" data-sidebar="true" data-trigger="sidebar" data-header="<strong>Event</strong> am {{ day.day| date(format='%d.%m.%Y') }} erstellen" data-day="{{ day.day }}" data-body="#addEventForm" class="relative inline-block w-full bg-primary-900 hover:bg-primary-950 focus:bg-primary-950 dark:bg-primary-950 text-white py-2 text-sm font-semibold
-                        {% if "cox" in loggedin_user.roles %}
+                        {% if loggedin_user.allowed_to_steer %}
                             rounded-bl-md
                         {% else %}
                             rounded-b-md
@@ -435,7 +435,7 @@
                         Event
                     </a>
                 {% endif %}
-                {% if "cox" in loggedin_user.roles %}
+                {% if loggedin_user.allowed_to_steer %}
                     <a href="#" data-sidebar="true" data-trigger="sidebar" data-header="<strong>Ausfahrt</strong> am {{ day.day| date(format='%d.%m.%Y') }} erstellen" data-day="{{ day.day }}" data-body="#sidebarForm" class="relative inline-block w-full py-2 text-primary-900 hover:text-primary-950 dark:bg-primary-600 dark:text-white dark:hover:bg-primary-500 dark:hover:text-white focus:text-primary-950 text-sm font-semibold bg-gray-100 hover:bg-gray-200 focus:bg-gray-200
                         {% if "manage_events" in loggedin_user.roles %}
                             rounded-br-md
@@ -454,7 +454,7 @@
 {% endfor %}
 </div>
 </div>
-{% if "cox" in loggedin_user.roles %}
+{% if loggedin_user.allowed_to_steer %}
     {% include "forms/trip" %}
 {% endif %}
 {% if "manage_events" in loggedin_user.roles %}