migration.sql

@@ -2,6 +2,10 @@ CREATE TABLE IF NOT EXISTS "user" (
 	"id" integer NOT NULL PRIMARY KEY AUTOINCREMENT,
 	"name" text NOT NULL UNIQUE,
 	"pw" text, 
+	"is_cox" boolean NOT NULL DEFAULT FALSE,
+	"is_admin" boolean NOT NULL DEFAULT FALSE,
+	"is_guest" boolean NOT NULL DEFAULT TRUE,
+	"is_tech" boolean NOT NULL DEFAULT FALSE,
 	"deleted" boolean NOT NULL DEFAULT FALSE,
 	"last_access" DATETIME,
 	"dob" text,
@@ -11,17 +15,6 @@ CREATE TABLE IF NOT EXISTS "user" (
 	"dirty_dozen" text
 );
 
-CREATE TABLE IF NOT EXISTS "role" (
-	"id" integer NOT NULL PRIMARY KEY AUTOINCREMENT,
-	"name" text NOT NULL UNIQUE
-);
-
-CREATE TABLE IF NOT EXISTS "user_role" (
-	"user_id" INTEGER NOT NULL REFERENCES user(id),
-	"role_id" INTEGER NOT NULL REFERENCES role(id),
-	CONSTRAINT unq UNIQUE (user_id, role_id) 
-);
-
 CREATE TABLE IF NOT EXISTS "trip_type" (
 	"id" integer NOT NULL PRIMARY KEY AUTOINCREMENT,
 	"name" text NOT NULL UNIQUE,

seeds.sql

@@ -1,19 +1,10 @@
-INSERT INTO "role" (name) VALUES ('admin');
+INSERT INTO "user" (name, is_cox, is_admin, is_guest, pw) VALUES('admin', true, true, false, '$argon2id$v=19$m=19456,t=2,p=1$dS/X5/sPEKTj4Rzs/CuvzQ$4P4NCw4Ukhv80/eQYTsarHhnw61JuL1KMx/L9dm82YM');
-INSERT INTO "role" (name) VALUES ('cox');
+INSERT INTO "user" (name, is_cox, is_admin, is_guest, pw) VALUES('rower', false, false, false, '$argon2id$v=19$m=19456,t=2,p=1$dS/X5/sPEKTj4Rzs/CuvzQ$jWKzDmI0jqT2dqINFt6/1NjVF4Dx15n07PL1ZMBmFsY');
-INSERT INTO "role" (name) VALUES ('scheckbuch');
+INSERT INTO "user" (name, is_cox, is_admin, is_guest, pw) VALUES('guest', false, false, true, '$argon2id$v=19$m=19456,t=2,p=1$dS/X5/sPEKTj4Rzs/CuvzQ$GF6gizbI79Bh0zA9its8S0gram956v+YIV8w8VpwJnQ');
-INSERT INTO "role" (name) VALUES ('tech');
+INSERT INTO "user" (name, is_cox, is_admin, is_guest, pw) VALUES('cox', true, false, false, '$argon2id$v=19$m=19456,t=2,p=1$dS/X5/sPEKTj4Rzs/CuvzQ$lnWzHx3DdqS9GQyWYel82kIotZuK2wk9EyfhPFtjNzs');
-INSERT INTO "user" (name, pw) VALUES('admin', '$argon2id$v=19$m=19456,t=2,p=1$dS/X5/sPEKTj4Rzs/CuvzQ$4P4NCw4Ukhv80/eQYTsarHhnw61JuL1KMx/L9dm82YM');
-INSERT INTO "user_role" (user_id, role_id) VALUES(1,1);
-INSERT INTO "user_role" (user_id, role_id) VALUES(1,2);
-INSERT INTO "user" (name, pw) VALUES('rower', '$argon2id$v=19$m=19456,t=2,p=1$dS/X5/sPEKTj4Rzs/CuvzQ$jWKzDmI0jqT2dqINFt6/1NjVF4Dx15n07PL1ZMBmFsY');
-INSERT INTO "user" (name, pw) VALUES('guest', '$argon2id$v=19$m=19456,t=2,p=1$dS/X5/sPEKTj4Rzs/CuvzQ$GF6gizbI79Bh0zA9its8S0gram956v+YIV8w8VpwJnQ');
-INSERT INTO "user_role" (user_id, role_id) VALUES(3,3);
-INSERT INTO "user" (name, pw) VALUES('cox', '$argon2id$v=19$m=19456,t=2,p=1$dS/X5/sPEKTj4Rzs/CuvzQ$lnWzHx3DdqS9GQyWYel82kIotZuK2wk9EyfhPFtjNzs');
-INSERT INTO "user_role" (user_id, role_id) VALUES(4,2);
 INSERT INTO "user" (name) VALUES('new');
-INSERT INTO "user" (name, pw) VALUES('cox2', '$argon2id$v=19$m=19456,t=2,p=1$dS/X5/sPEKTj4Rzs/CuvzQ$lnWzHx3DdqS9GQyWYel82kIotZuK2wk9EyfhPFtjNzs');
+INSERT INTO "user" (name, is_cox, is_admin, is_guest, pw) VALUES('cox2', true, false, false, '$argon2id$v=19$m=19456,t=2,p=1$dS/X5/sPEKTj4Rzs/CuvzQ$lnWzHx3DdqS9GQyWYel82kIotZuK2wk9EyfhPFtjNzs');
-INSERT INTO "user_role" (user_id, role_id) VALUES(6,2);
+INSERT INTO "user" (name, is_cox, is_admin, is_guest, pw) VALUES('rower2', false, false, false, '$argon2id$v=19$m=19456,t=2,p=1$dS/X5/sPEKTj4Rzs/CuvzQ$jWKzDmI0jqT2dqINFt6/1NjVF4Dx15n07PL1ZMBmFsY');
-INSERT INTO "user" (name,  pw) VALUES('rower2', '$argon2id$v=19$m=19456,t=2,p=1$dS/X5/sPEKTj4Rzs/CuvzQ$jWKzDmI0jqT2dqINFt6/1NjVF4Dx15n07PL1ZMBmFsY');
 
 INSERT INTO "trip_details" (planned_starting_time, max_people, day, notes) VALUES('10:00', 2, '1970-01-01', 'trip_details for a planned event');
 INSERT INTO "planned_event" (name, planned_amount_cox, trip_details_id) VALUES('test-planned-event', 2, 1);

src/model/boat.rs

@@ -89,7 +89,7 @@ impl Boat {
             .ok()
     }
 
-    pub async fn shipmaster_allowed(&self, db: &SqlitePool, user: &User) -> bool {
+    pub async fn shipmaster_allowed(&self, user: &User) -> bool {
         if let Some(owner_id) = self.owner {
             return owner_id == user.id;
         }
@@ -98,23 +98,7 @@ impl Boat {
             return true;
         }
 
-        user.has_role(db, "cox").await
+        user.is_cox
-    }
-
-    pub async fn shipmaster_allowed_tx(
-        &self,
-        db: &mut Transaction<'_, Sqlite>,
-        user: &User,
-    ) -> bool {
-        if let Some(owner_id) = self.owner {
-            return owner_id == user.id;
-        }
-
-        if self.amount_seats == 1 {
-            return true;
-        }
-
-        user.has_role_tx(db, "cox").await
     }
 
     pub async fn is_locked(&self, db: &SqlitePool) -> bool {
@@ -172,10 +156,10 @@ ORDER BY amount_seats DESC
     }
 
     pub async fn for_user(db: &SqlitePool, user: &User) -> Vec<BoatWithDetails> {
-        if user.has_role(db, "admin").await {
+        if user.is_admin {
             return Self::all(db).await;
         }
-        let boats = if user.has_role(db, "cox").await {
+        let boats = if user.is_cox {
             sqlx::query_as!(
             Boat,
             "

src/model/boatdamage.rs

@@ -141,7 +141,7 @@ ORDER BY created_at DESC
         .map_err(|e| e.to_string())?;
 
         let user = User::find_by_id(db, boat.user_id_fixed).await.unwrap();
-        if user.has_role(db, "tech").await {
+        if user.is_tech {
             return self
                 .verified(
                     db,
@@ -162,7 +162,7 @@ ORDER BY created_at DESC
         boat: BoatDamageVerified<'_>,
     ) -> Result<(), String> {
         if let Some(verifier) = User::find_by_id(db, boat.user_id_verified).await {
-            if !verifier.has_role(db, "tech").await {
+            if !verifier.is_tech {
                 Log::create(db, format!("User {verifier:?} tried to verify boat {boat:?}. The user is no tech. Manually craftted request?")).await;
                 return Err("You are not allowed to verify the boat!".into());
             }

src/model/logbook.rs

@@ -272,7 +272,7 @@ ORDER BY departure DESC
         if let Ok(log_to_finalize) = TryInto::<LogToFinalize>::try_into(log.clone()) {
             //TODO: fix clone() above
 
-            if !boat.shipmaster_allowed(db, created_by_user).await {
+            if !boat.shipmaster_allowed(created_by_user).await {
                 return Err(LogbookCreateError::UserNotAllowedToUseBoat);
             }
 
@@ -343,7 +343,7 @@ ORDER BY departure DESC
             }
         }
 
-        if !boat.shipmaster_allowed(db, created_by_user).await {
+        if !boat.shipmaster_allowed(created_by_user).await {
             return Err(LogbookCreateError::UserNotAllowedToUseBoat);
         }
 
@@ -452,7 +452,7 @@ ORDER BY departure DESC
             return Err(LogbookUpdateError::SteeringPersonNotInRowers);
         }
 
-        if !boat.shipmaster_allowed_tx(db, user).await && self.shipmaster != user.id {
+        if !boat.shipmaster_allowed(user).await && self.shipmaster != user.id {
             //second part: shipmaster has entered a different user, then the user should be able to
             //`home` it
             return Err(LogbookUpdateError::UserNotAllowedToUseBoat);
@@ -471,7 +471,7 @@ ORDER BY departure DESC
             return Err(LogbookUpdateError::ArrivalNotAfterDeparture);
         }
         let today = Utc::now().date_naive();
-        if arr.date() != today && !user.has_role_tx(db, "admin").await {
+        if arr.date() != today && !user.is_admin {
             return Err(LogbookUpdateError::OnlyAllowedToEndTripsEndingToday);
         }
 
@@ -506,7 +506,7 @@ ORDER BY departure DESC
     pub async fn delete(&self, db: &SqlitePool, user: &User) -> Result<(), LogbookDeleteError> {
         Log::create(db, format!("{user:?} deleted trip: {self:?}")).await;
 
-        if user.has_role(db, "admin").await || user.id == self.shipmaster {
+        if user.is_admin || user.id == self.shipmaster {
             sqlx::query!("DELETE FROM logbook WHERE id=?", self.id)
                 .execute(db)
                 .await

src/model/mod.rs

@@ -14,7 +14,6 @@ pub mod log;
 pub mod logbook;
 pub mod logtype;
 pub mod planned_event;
-pub mod role;
 pub mod rower;
 pub mod stat;
 pub mod trip;

src/model/planned_event.rs

@@ -6,7 +6,7 @@ use ics::{
     Event, ICalendar,
 };
 use serde::Serialize;
-use sqlx::{FromRow, SqlitePool, Row};
+use sqlx::{FromRow, SqlitePool};
 
 use super::{tripdetails::TripDetails, triptype::TripType, user::User};
 
@@ -47,28 +47,27 @@ pub struct Registration {
 
 impl Registration {
     pub async fn all_rower(db: &SqlitePool, trip_details_id: i64) -> Vec<Registration> {
-        sqlx::query(
+        sqlx::query!(
-            &format!(
             r#"
 SELECT
     (SELECT name FROM user WHERE user_trip.user_id = user.id) as "name?", 
     user_note,
     user_id,
     (SELECT created_at FROM user WHERE user_trip.user_id = user.id) as registered_at,
-    (SELECT EXISTS (SELECT 1 FROM user_role WHERE user_role.user_id = user_trip.user_id AND user_role.role_id = (SELECT id FROM role WHERE name = 'scheckbuch'))) as is_guest
+    (SELECT is_guest FROM user WHERE user_trip.user_id = user.id) as is_guest
-FROM user_trip WHERE trip_details_id = {} 
+FROM user_trip WHERE trip_details_id = ? 
-        "#,trip_details_id),
+        "#,
+            trip_details_id,
         )
         .fetch_all(db)
         .await
         .unwrap()
         .into_iter()
-        .map(|r| 
+        .map(|r| Registration {
-            Registration {
+            name: r.name.or(r.user_note).unwrap(), //Ok, either name or user_note needs to be set
-            name: r.get::<Option<String>, usize>(0).or(r.get::<Option<String>, usize>(1)).unwrap(), //Ok, either name or user_note needs to be set
+            registered_at: r.registered_at,
-            registered_at: r.get::<String,usize>(3),
+            is_guest: r.is_guest,
-            is_guest: r.get::<bool, usize>(4),
+            is_real_guest: r.user_id.is_none(),
-            is_real_guest: r.get::<Option<i64>, usize>(2).is_none(),
         })
         .collect()
     }
@@ -79,7 +78,8 @@ FROM user_trip WHERE trip_details_id = {}
             "
 SELECT
     (SELECT name FROM user WHERE cox_id = id) as name,
-    (SELECT created_at FROM user WHERE cox_id = id) as registered_at
+    (SELECT created_at FROM user WHERE cox_id = id) as registered_at,
+    (SELECT is_guest FROM user WHERE cox_id = id) as is_guest
 FROM trip WHERE planned_event_id = ?
         ",
             trip_details_id
@@ -91,7 +91,7 @@ FROM trip WHERE planned_event_id = ?
         .map(|r| Registration {
             name: r.name,
             registered_at: r.registered_at,
-            is_guest: false,
+            is_guest: r.is_guest,
             is_real_guest: false,
         })
         .collect() //Okay, as PlannedEvent can only be created with proper DB backing

src/model/role.rs

@@ -1,17 +0,0 @@
-use serde::Serialize;
-use sqlx::{FromRow, SqlitePool};
-
-#[derive(FromRow, Serialize, Clone)]
-pub struct Role {
-    id: i64,
-    name: String,
-}
-
-impl Role {
-    pub async fn all(db: &SqlitePool) -> Vec<Role> {
-        sqlx::query_as!(Role, "SELECT id, name FROM role")
-            .fetch_all(db)
-            .await
-            .unwrap()
-    }
-}

src/model/rower.rs

@@ -16,7 +16,7 @@ impl Rower {
         sqlx::query_as!(
             User,
             "
-SELECT id, name, pw, deleted, last_access, dob, weight, sex
+SELECT id, name, pw, is_cox, is_admin, is_guest, deleted, last_access, is_tech, dob, weight, sex
 FROM user
 WHERE id in (SELECT rower_id FROM rower WHERE logbook_id=?)
         ",

src/model/trip.rs

@@ -276,11 +276,10 @@ mod test {
     fn test_new_own() {
         let pool = testdb!();
 
-        let cox = CoxUser::new(
+        let cox: CoxUser = User::find_by_name(&pool, "cox".into())
-            &pool,
-            User::find_by_name(&pool, "cox".into()).await.unwrap(),
-        )
             .await
+            .unwrap()
+            .try_into()
             .unwrap();
 
         let trip_details = TripDetails::find_by_id(&pool, 1).await.unwrap();
@@ -302,11 +301,10 @@ mod test {
     fn test_new_succ_join() {
         let pool = testdb!();
 
-        let cox = CoxUser::new(
+        let cox: CoxUser = User::find_by_name(&pool, "cox2".into())
-            &pool,
-            User::find_by_name(&pool, "cox2".into()).await.unwrap(),
-        )
             .await
+            .unwrap()
+            .try_into()
             .unwrap();
 
         let planned_event = PlannedEvent::find_by_id(&pool, 1).await.unwrap();
@@ -318,11 +316,10 @@ mod test {
     fn test_new_failed_join_already_cox() {
         let pool = testdb!();
 
-        let cox = CoxUser::new(
+        let cox: CoxUser = User::find_by_name(&pool, "cox2".into())
-            &pool,
-            User::find_by_name(&pool, "cox2".into()).await.unwrap(),
-        )
             .await
+            .unwrap()
+            .try_into()
             .unwrap();
 
         let planned_event = PlannedEvent::find_by_id(&pool, 1).await.unwrap();
@@ -335,11 +332,10 @@ mod test {
     fn test_succ_update_own() {
         let pool = testdb!();
 
-        let cox = CoxUser::new(
+        let cox: CoxUser = User::find_by_name(&pool, "cox".into())
-            &pool,
-            User::find_by_name(&pool, "cox".into()).await.unwrap(),
-        )
             .await
+            .unwrap()
+            .try_into()
             .unwrap();
 
         let trip = Trip::find_by_id(&pool, 1).await.unwrap();
@@ -358,11 +354,10 @@ mod test {
     fn test_succ_update_own_with_triptype() {
         let pool = testdb!();
 
-        let cox = CoxUser::new(
+        let cox: CoxUser = User::find_by_name(&pool, "cox".into())
-            &pool,
-            User::find_by_name(&pool, "cox".into()).await.unwrap(),
-        )
             .await
+            .unwrap()
+            .try_into()
             .unwrap();
 
         let trip = Trip::find_by_id(&pool, 1).await.unwrap();
@@ -382,11 +377,10 @@ mod test {
     fn test_fail_update_own_not_your_trip() {
         let pool = testdb!();
 
-        let cox = CoxUser::new(
+        let cox: CoxUser = User::find_by_name(&pool, "cox2".into())
-            &pool,
-            User::find_by_name(&pool, "cox2".into()).await.unwrap(),
-        )
             .await
+            .unwrap()
+            .try_into()
             .unwrap();
 
         let trip = Trip::find_by_id(&pool, 1).await.unwrap();
@@ -403,11 +397,10 @@ mod test {
     fn test_succ_delete_by_planned_event() {
         let pool = testdb!();
 
-        let cox = CoxUser::new(
+        let cox: CoxUser = User::find_by_name(&pool, "cox".into())
-            &pool,
-            User::find_by_name(&pool, "cox".into()).await.unwrap(),
-        )
             .await
+            .unwrap()
+            .try_into()
             .unwrap();
 
         let planned_event = PlannedEvent::find_by_id(&pool, 1).await.unwrap();
@@ -426,11 +419,10 @@ mod test {
     fn test_succ_delete() {
         let pool = testdb!();
 
-        let cox = CoxUser::new(
+        let cox: CoxUser = User::find_by_name(&pool, "cox".into())
-            &pool,
-            User::find_by_name(&pool, "cox".into()).await.unwrap(),
-        )
             .await
+            .unwrap()
+            .try_into()
             .unwrap();
 
         let trip = Trip::find_by_id(&pool, 1).await.unwrap();
@@ -444,11 +436,10 @@ mod test {
     fn test_fail_delete_diff_cox() {
         let pool = testdb!();
 
-        let cox = CoxUser::new(
+        let cox: CoxUser = User::find_by_name(&pool, "cox2".into())
-            &pool,
-            User::find_by_name(&pool, "cox2".into()).await.unwrap(),
-        )
             .await
+            .unwrap()
+            .try_into()
             .unwrap();
 
         let trip = Trip::find_by_id(&pool, 1).await.unwrap();
@@ -466,11 +457,10 @@ mod test {
     fn test_fail_delete_someone_registered() {
         let pool = testdb!();
 
-        let cox = CoxUser::new(
+        let cox: CoxUser = User::find_by_name(&pool, "cox".into())
-            &pool,
-            User::find_by_name(&pool, "cox".into()).await.unwrap(),
-        )
             .await
+            .unwrap()
+            .try_into()
             .unwrap();
 
         let trip = Trip::find_by_id(&pool, 1).await.unwrap();

src/model/tripdetails.rs

@@ -120,7 +120,7 @@ ORDER BY day;",
 
     pub(crate) async fn user_allowed_to_change(&self, db: &SqlitePool, user: &User) -> bool {
         if self.belongs_to_event(db).await {
-            user.has_role(db, "admin").await
+            user.is_admin
         } else {
             self.user_is_cox(db, user).await != CoxAtTrip::No
         }

src/model/user.rs

@@ -21,6 +21,10 @@ pub struct User {
     pub id: i64,
     pub name: String,
     pub pw: Option<String>,
+    pub is_cox: bool,
+    pub is_admin: bool,
+    pub is_guest: bool,
+    pub is_tech: bool,
     pub dob: Option<String>,
     pub weight: Option<String>,
     pub sex: Option<String>,
@@ -28,35 +32,17 @@ pub struct User {
     pub last_access: Option<chrono::NaiveDateTime>,
 }
 
-#[derive(Debug, Serialize, Deserialize)]
-pub struct UserWithRoles {
-    #[serde(flatten)]
-    pub user: User,
-    pub roles: Vec<String>,
-}
-
-impl UserWithRoles {
-    pub async fn from_user(user: User, db: &SqlitePool) -> Self {
-        Self {
-            roles: user.roles(db).await,
-            user,
-        }
-    }
-}
-
 #[derive(Debug, Serialize, Deserialize)]
 pub struct UserWithWaterStatus {
     #[serde(flatten)]
     pub user: User,
     pub on_water: bool,
-    pub roles: Vec<String>,
 }
 
 impl UserWithWaterStatus {
     pub async fn from_user(user: User, db: &SqlitePool) -> Self {
         Self {
             on_water: user.on_water(db).await,
-            roles: user.roles(db).await,
             user,
         }
     }
@@ -105,56 +91,11 @@ impl User {
         .rowed_km
     }
 
-    pub async fn has_role(&self, db: &SqlitePool, role: &str) -> bool {
-        if sqlx::query!(
-            "SELECT * FROM user_role WHERE user_id=? AND role_id = (SELECT id FROM role WHERE name = ?)",
-            self.id,
-            role
-        )
-        .fetch_optional(db)
-        .await
-        .unwrap()
-        .is_some()
-        {
-            return true;
-        }
-
-        false
-    }
-
-    pub async fn roles(&self, db: &SqlitePool) -> Vec<String> {
-        sqlx::query!(
-            "SELECT r.name FROM role r JOIN user_role ur ON r.id = ur.role_id WHERE ur.user_id = ?;",
-            self.id
-        )
-            .fetch_all(db)
-        .await
-        .unwrap()
-        .into_iter().map(|r| r.name).collect()
-    }
-
-    pub async fn has_role_tx(&self, db: &mut Transaction<'_, Sqlite>, role: &str) -> bool {
-        if sqlx::query!(
-            "SELECT * FROM user_role WHERE user_id=? AND role_id = (SELECT id FROM role WHERE name = ?)",
-            self.id,
-            role
-        )
-        .fetch_optional(db.deref_mut())
-        .await
-        .unwrap()
-        .is_some()
-        {
-            return true;
-        }
-
-        false
-    }
-
     pub async fn find_by_id(db: &SqlitePool, id: i32) -> Option<Self> {
         sqlx::query_as!(
             Self,
             "
-SELECT id, name, pw, deleted, last_access, dob, weight, sex
+SELECT id, name, pw, is_cox, is_admin, is_guest, deleted, last_access, is_tech, dob, weight, sex
 FROM user 
 WHERE id like ?
         ",
@@ -169,7 +110,7 @@ WHERE id like ?
         sqlx::query_as!(
             Self,
             "
-SELECT id, name, pw, deleted, last_access, dob, weight, sex
+SELECT id, name, pw, is_cox, is_admin, is_guest, deleted, last_access, is_tech, dob, weight, sex
 FROM user 
 WHERE id like ?
         ",
@@ -184,7 +125,7 @@ WHERE id like ?
         sqlx::query_as!(
             Self,
             "
-SELECT id, name, pw, deleted, last_access, dob, weight, sex
+SELECT id, name, pw, is_cox, is_admin, is_guest, deleted, last_access, is_tech, dob, weight, sex
 FROM user 
 WHERE name like ?
         ",
@@ -226,7 +167,7 @@ WHERE name like ?
         sqlx::query_as!(
             Self,
             "
-SELECT id, name, pw, deleted, last_access, dob, weight, sex
+SELECT id, name, pw, is_cox, is_admin, is_guest, deleted, last_access, is_tech, dob, weight, sex
 FROM user
 WHERE deleted = 0
 ORDER BY last_access DESC
@@ -241,7 +182,7 @@ ORDER BY last_access DESC
         sqlx::query_as!(
             Self,
             "
-SELECT id, name, pw, deleted, last_access, dob, weight, sex
+SELECT id, name, pw, is_cox, is_admin, is_guest, deleted, last_access, is_tech, dob, weight, sex
 FROM user
 WHERE deleted = 0 AND dob != '' and weight != '' and sex != ''
 ORDER BY name 
@@ -256,9 +197,9 @@ ORDER BY name
         sqlx::query_as!(
             Self,
             "
-SELECT id, name, pw, deleted, last_access, dob, weight, sex
+SELECT id, name, pw, is_cox, is_admin, is_guest, deleted, last_access, is_tech, dob, weight, sex
 FROM user
-WHERE deleted = 0 AND (SELECT COUNT(*) FROM user_role WHERE user_id=user.id AND role_id = (SELECT id FROM role WHERE name = 'cox')) > 0
+WHERE deleted = 0 AND is_cox=true
 ORDER BY last_access DESC
         "
         )
@@ -267,8 +208,12 @@ ORDER BY last_access DESC
         .unwrap()
     }
 
-    pub async fn create(db: &SqlitePool, name: &str) -> bool {
+    pub async fn create(db: &SqlitePool, name: &str, is_guest: bool) -> bool {
-        sqlx::query!("INSERT INTO USER(name) VALUES (?)", name)
+        sqlx::query!(
+            "INSERT INTO USER(name, is_guest) VALUES (?,?)",
+            name,
+            is_guest,
+        )
         .execute(db)
         .await
         .is_ok()
@@ -276,7 +221,11 @@ ORDER BY last_access DESC
 
     pub async fn update(&self, db: &SqlitePool, data: UserEditForm) {
         sqlx::query!(
-            "UPDATE user SET dob = ?, weight = ?, sex = ? where id = ?",
+            "UPDATE user SET is_cox = ?, is_admin = ?, is_guest = ?, is_tech = ?, dob = ?, weight = ?, sex = ? where id = ?",
+            data.is_cox,
+            data.is_admin,
+            data.is_guest,
+            data.is_tech,
             data.dob,
             data.weight,
             data.sex,
@@ -285,23 +234,6 @@ ORDER BY last_access DESC
         .execute(db)
         .await
         .unwrap(); //Okay, because we can only create a User of a valid id
-
-        // handle roles
-        sqlx::query!("DELETE FROM user_role WHERE user_id = ?", self.id)
-            .execute(db)
-            .await
-            .unwrap();
-
-        for role_id in data.roles.into_keys() {
-            sqlx::query!(
-                "INSERT INTO user_role(user_id, role_id) VALUES (?, ?)",
-                self.id,
-                role_id
-            )
-            .execute(db)
-            .await
-            .unwrap();
-        }
     }
 
     pub async fn login(db: &SqlitePool, name: &str, pw: &str) -> Result<Self, LoginError> {
@@ -377,18 +309,18 @@ ORDER BY last_access DESC
 
     pub async fn get_days(&self, db: &SqlitePool) -> Vec<Day> {
         let mut days = Vec::new();
-        for i in 0..self.amount_days_to_show(db).await {
+        for i in 0..self.amount_days_to_show() {
             let date = (Local::now() + chrono::Duration::days(i)).date_naive();
 
-            if self.has_role(db, "scheckbuch").await {
+            if self.is_guest {
                 days.push(Day::new_guest(db, date, false).await);
             } else {
                 days.push(Day::new(db, date, false).await);
             }
         }
 
-        for date in TripDetails::pinned_days(db, self.amount_days_to_show(db).await - 1).await {
+        for date in TripDetails::pinned_days(db, self.amount_days_to_show() - 1).await {
-            if self.has_role(db, "scheckbuch").await {
+            if self.is_guest {
                 let day = Day::new_guest(db, date, true).await;
                 if !day.planned_events.is_empty() {
                     days.push(day);
@@ -400,8 +332,8 @@ ORDER BY last_access DESC
         days
     }
 
-    async fn amount_days_to_show(&self, db: &SqlitePool) -> i64 {
+    fn amount_days_to_show(&self) -> i64 {
-        if self.has_role(db, "cox").await {
+        if self.is_cox {
             let end_of_year = NaiveDate::from_ymd_opt(Local::now().year(), 12, 31).unwrap(); //Ok,
                                                                                              //december
                                                                                              //has 31
@@ -461,21 +393,28 @@ impl Deref for TechUser {
     }
 }
 
+impl TryFrom<User> for TechUser {
+    type Error = LoginError;
+
+    fn try_from(user: User) -> Result<Self, Self::Error> {
+        if user.is_tech {
+            Ok(TechUser { user })
+        } else {
+            Err(LoginError::NotATech)
+        }
+    }
+}
+
 #[async_trait]
 impl<'r> FromRequest<'r> for TechUser {
     type Error = LoginError;
 
     async fn from_request(req: &'r Request<'_>) -> request::Outcome<Self, Self::Error> {
-        let db = req.rocket().state::<SqlitePool>().unwrap();
-
         match User::from_request(req).await {
-            Outcome::Success(user) => {
+            Outcome::Success(user) => match user.try_into() {
-                if user.has_role(db, "tech").await {
+                Ok(user) => Outcome::Success(user),
-                    Outcome::Success(TechUser { user })
+                Err(_) => Outcome::Error((Status::Unauthorized, LoginError::NotACox)),
-                } else {
+            },
-                    Outcome::Error((Status::Unauthorized, LoginError::NotACox))
-                }
-            }
             Outcome::Error(f) => Outcome::Error(f),
             Outcome::Forward(f) => Outcome::Forward(f),
         }
@@ -494,12 +433,14 @@ impl Deref for CoxUser {
     }
 }
 
-impl CoxUser {
+impl TryFrom<User> for CoxUser {
-    pub async fn new(db: &SqlitePool, user: User) -> Option<Self> {
+    type Error = LoginError;
-        if user.has_role(db, "cox").await {
+
-            Some(CoxUser { user })
+    fn try_from(user: User) -> Result<Self, Self::Error> {
+        if user.is_cox {
+            Ok(CoxUser { user })
         } else {
-            None
+            Err(LoginError::NotACox)
         }
     }
 }
@@ -509,16 +450,11 @@ impl<'r> FromRequest<'r> for CoxUser {
     type Error = LoginError;
 
     async fn from_request(req: &'r Request<'_>) -> request::Outcome<Self, Self::Error> {
-        let db = req.rocket().state::<SqlitePool>().unwrap();
-
         match User::from_request(req).await {
-            Outcome::Success(user) => {
+            Outcome::Success(user) => match user.try_into() {
-                if user.has_role(db, "cox").await {
+                Ok(user) => Outcome::Success(user),
-                    Outcome::Success(CoxUser { user })
+                Err(_) => Outcome::Error((Status::Unauthorized, LoginError::NotACox)),
-                } else {
+            },
-                    Outcome::Error((Status::Unauthorized, LoginError::NotACox))
-                }
-            }
             Outcome::Error(f) => Outcome::Error(f),
             Outcome::Forward(f) => Outcome::Forward(f),
         }
@@ -530,20 +466,28 @@ pub struct AdminUser {
     pub(crate) user: User,
 }
 
+impl TryFrom<User> for AdminUser {
+    type Error = LoginError;
+
+    fn try_from(user: User) -> Result<Self, Self::Error> {
+        if user.is_admin {
+            Ok(AdminUser { user })
+        } else {
+            Err(LoginError::NotAnAdmin)
+        }
+    }
+}
+
 #[async_trait]
 impl<'r> FromRequest<'r> for AdminUser {
     type Error = LoginError;
 
     async fn from_request(req: &'r Request<'_>) -> request::Outcome<Self, Self::Error> {
-        let db = req.rocket().state::<SqlitePool>().unwrap();
         match User::from_request(req).await {
-            Outcome::Success(user) => {
+            Outcome::Success(user) => match user.try_into() {
-                if user.has_role(db, "admin").await {
+                Ok(user) => Outcome::Success(user),
-                    Outcome::Success(AdminUser { user })
+                Err(_) => Outcome::Error((Status::Unauthorized, LoginError::NotAnAdmin)),
-                } else {
+            },
-                    Outcome::Error((Status::Unauthorized, LoginError::NotACox))
-                }
-            }
             Outcome::Error(f) => Outcome::Error(f),
             Outcome::Forward(f) => Outcome::Forward(f),
         }
@@ -555,20 +499,28 @@ pub struct NonGuestUser {
     pub(crate) user: User,
 }
 
+impl TryFrom<User> for NonGuestUser {
+    type Error = LoginError;
+
+    fn try_from(user: User) -> Result<Self, Self::Error> {
+        if user.is_guest {
+            Err(LoginError::GuestNotAllowed)
+        } else {
+            Ok(NonGuestUser { user })
+        }
+    }
+}
+
 #[async_trait]
 impl<'r> FromRequest<'r> for NonGuestUser {
     type Error = LoginError;
 
     async fn from_request(req: &'r Request<'_>) -> request::Outcome<Self, Self::Error> {
-        let db = req.rocket().state::<SqlitePool>().unwrap();
         match User::from_request(req).await {
-            Outcome::Success(user) => {
+            Outcome::Success(user) => match user.try_into() {
-                if !user.has_role(db, "scheckbuch").await {
+                Ok(user) => Outcome::Success(user),
-                    Outcome::Success(NonGuestUser { user })
+                Err(_) => Outcome::Error((Status::Unauthorized, LoginError::NotAnAdmin)),
-                } else {
+            },
-                    Outcome::Error((Status::Unauthorized, LoginError::NotACox))
-                }
-            }
             Outcome::Error(f) => Outcome::Error(f),
             Outcome::Forward(f) => Outcome::Forward(f),
         }
@@ -577,8 +529,6 @@ impl<'r> FromRequest<'r> for NonGuestUser {
 
 #[cfg(test)]
 mod test {
-    use std::collections::HashMap;
-
     use crate::{tera::admin::user::UserEditForm, testdb};
 
     use super::User;
@@ -630,14 +580,17 @@ mod test {
     fn test_succ_create() {
         let pool = testdb!();
 
-        assert_eq!(User::create(&pool, "new-user-name".into()).await, true);
+        assert_eq!(
+            User::create(&pool, "new-user-name".into(), false).await,
+            true
+        );
     }
 
     #[sqlx::test]
     fn test_duplicate_name_create() {
         let pool = testdb!();
 
-        assert_eq!(User::create(&pool, "admin".into()).await, false);
+        assert_eq!(User::create(&pool, "admin".into(), false).await, false);
     }
 
     #[sqlx::test]
@@ -649,17 +602,19 @@ mod test {
             &pool,
             UserEditForm {
                 id: 1,
+                is_guest: false,
+                is_cox: false,
+                is_admin: false,
+                is_tech: false,
                 dob: None,
                 weight: None,
-                sex: Some("m".into()),
+                sex: None,
-                roles: HashMap::new(),
             },
         )
         .await;
 
         let user = User::find_by_id(&pool, 1).await.unwrap();
-
+        assert_eq!(user.is_admin, false);
-        assert_eq!(user.sex, Some("m".into()));
     }
 
     #[sqlx::test]

src/model/usertrip.rs

@@ -20,7 +20,7 @@ impl UserTrip {
             return Err(UserTripError::DetailsLocked);
         }
 
-        if user.has_role(db, "scheckbuch").await && !trip_details.allow_guests {
+        if user.is_guest && !trip_details.allow_guests {
             return Err(UserTripError::GuestNotAllowedForThisEvent);
         }
 
@@ -211,11 +211,10 @@ mod test {
     fn test_fail_create_is_cox_planned_event() {
         let pool = testdb!();
 
-        let cox = CoxUser::new(
+        let cox: CoxUser = User::find_by_name(&pool, "cox".into())
-            &pool,
-            User::find_by_name(&pool, "cox".into()).await.unwrap(),
-        )
             .await
+            .unwrap()
+            .try_into()
             .unwrap();
 
         let planned_event = PlannedEvent::find_by_id(&pool, 1).await.unwrap();

src/tera/admin/boat.rs

@@ -1,7 +1,7 @@
 use crate::model::{
     boat::{Boat, BoatToAdd, BoatToUpdate},
     location::Location,
-    user::{AdminUser, User, UserWithRoles},
+    user::{AdminUser, User},
 };
 use rocket::{
     form::Form,
@@ -30,10 +30,7 @@ async fn index(
     context.insert("boats", &boats);
     context.insert("locations", &locations);
     context.insert("users", &users);
-    context.insert(
+    context.insert("loggedin_user", &admin.user);
-        "loggedin_user",
-        &UserWithRoles::from_user(admin.user, db).await,
-    );
 
     Template::render("admin/boat/index", context.into_json())
 }

src/tera/admin/user.rs

@@ -1,10 +1,4 @@
-use std::collections::HashMap;
+use crate::model::user::{AdminUser, User};
-
-use crate::model::{
-    role::Role,
-    user::{AdminUser, User, UserWithRoles},
-};
-use futures::future::join_all;
 use rocket::{
     form::Form,
     get, post,
@@ -21,26 +15,14 @@ async fn index(
     admin: AdminUser,
     flash: Option<FlashMessage<'_>>,
 ) -> Template {
-    let user_futures: Vec<_> = User::all(db)
+    let users = User::all(db).await;
-        .await
-        .into_iter()
-        .map(|u| async move { UserWithRoles::from_user(u, db).await })
-        .collect();
-
-    let users: Vec<UserWithRoles> = join_all(user_futures).await;
-
-    let roles = Role::all(db).await;
 
     let mut context = Context::new();
     if let Some(msg) = flash {
         context.insert("flash", &msg.into_inner());
     }
     context.insert("users", &users);
-    context.insert("roles", &roles);
+    context.insert("loggedin_user", &admin.user);
-    context.insert(
-        "loggedin_user",
-        &UserWithRoles::from_user(admin.user, db).await,
-    );
 
     Template::render("admin/user/index", context.into_json())
 }
@@ -75,13 +57,16 @@ async fn delete(db: &State<SqlitePool>, _admin: AdminUser, user: i32) -> Flash<R
     }
 }
 
-#[derive(FromForm, Debug)]
+#[derive(FromForm)]
 pub struct UserEditForm {
     pub(crate) id: i32,
+    pub(crate) is_guest: bool,
+    pub(crate) is_cox: bool,
+    pub(crate) is_admin: bool,
+    pub(crate) is_tech: bool,
     pub(crate) dob: Option<String>,
     pub(crate) weight: Option<String>,
     pub(crate) sex: Option<String>,
-    pub(crate) roles: HashMap<String, String>,
 }
 
 #[post("/user", data = "<data>")]
@@ -106,6 +91,7 @@ async fn update(
 #[derive(FromForm)]
 struct UserAddForm<'r> {
     name: &'r str,
+    is_guest: bool,
 }
 
 #[post("/user/new", data = "<data>")]
@@ -114,7 +100,7 @@ async fn create(
     data: Form<UserAddForm<'_>>,
     _admin: AdminUser,
 ) -> Flash<Redirect> {
-    if User::create(db, data.name).await {
+    if User::create(db, data.name, data.is_guest).await {
         Flash::success(Redirect::to("/admin/user"), "Successfully created user")
     } else {
         Flash::error(

src/tera/boatdamage.rs

@@ -13,7 +13,7 @@ use crate::{
     model::{
         boat::Boat,
         boatdamage::{BoatDamage, BoatDamageFixed, BoatDamageToAdd, BoatDamageVerified},
-        user::{CoxUser, NonGuestUser, TechUser, User, UserWithRoles},
+        user::{CoxUser, NonGuestUser, TechUser, User},
     },
     tera::log::KioskCookie,
 };
@@ -57,10 +57,7 @@ async fn index(
 
     context.insert("boatdamages", &boatdamages);
     context.insert("boats", &boats);
-    context.insert(
+    context.insert("loggedin_user", &user.user);
-        "loggedin_user",
-        &UserWithRoles::from_user(user.user, db).await,
-    );
 
     Template::render("boatdamages", context.into_json())
 }

src/tera/ergo.rs

@@ -18,7 +18,7 @@ use tera::Context;
 
 use crate::model::{
     log::Log,
-    user::{AdminUser, User, UserWithRoles},
+    user::{AdminUser, User},
 };
 
 #[derive(Serialize)]
@@ -51,7 +51,7 @@ async fn send(db: &State<SqlitePool>, _user: AdminUser) -> Template {
 
     Template::render(
         "ergo.final",
-        context!(loggedin_user: &UserWithRoles::from_user(_user.user, db).await, thirty, dozen),
+        context!(loggedin_user: &_user.user, thirty, dozen),
     )
 }
 
@@ -120,7 +120,7 @@ async fn index(db: &State<SqlitePool>, user: User, flash: Option<FlashMessage<'_
     if let Some(msg) = flash {
         context.insert("flash", &msg.into_inner());
     }
-    context.insert("loggedin_user", &UserWithRoles::from_user(user, db).await);
+    context.insert("loggedin_user", &user);
     context.insert("users", &users);
     context.insert("thirty", &thirty);
     context.insert("dozen", &dozen);

src/tera/log.rs

@@ -23,7 +23,7 @@ use crate::model::{
         LogbookUpdateError,
     },
     logtype::LogType,
-    user::{NonGuestUser, User, UserWithRoles, UserWithWaterStatus},
+    user::{NonGuestUser, User, UserWithWaterStatus},
 };
 
 pub struct KioskCookie(String);
@@ -76,10 +76,7 @@ async fn index(
     context.insert("coxes", &coxes);
     context.insert("users", &users);
     context.insert("logtypes", &logtypes);
-    context.insert(
+    context.insert("loggedin_user", &user.user);
-        "loggedin_user",
-        &UserWithRoles::from_user(user.user, db).await,
-    );
     context.insert("on_water", &on_water);
     context.insert("distances", &distances);
 
@@ -90,10 +87,7 @@ async fn index(
 async fn show(db: &State<SqlitePool>, user: NonGuestUser) -> Template {
     let logs = Logbook::completed(db).await;
 
-    Template::render(
+    Template::render("log.completed", context!(logs, loggedin_user: &user.user))
-        "log.completed",
-        context!(logs, loggedin_user: &UserWithRoles::from_user(user.user, db).await),
-    )
 }
 
 #[get("/show")]
@@ -238,7 +232,7 @@ async fn create_kiosk(
     )
     .await;
 
-    create_logbook(db, data, &NonGuestUser { user: creator }).await //TODO: fixme
+    create_logbook(db, data, &NonGuestUser::try_from(creator).unwrap()).await //TODO: fixme
 }
 
 async fn home_logbook(
@@ -285,11 +279,12 @@ async fn home_kiosk(
         db,
         data,
         logbook_id,
-        &NonGuestUser {
+        &NonGuestUser::try_from(
-            user: User::find_by_id(db, logbook.shipmaster as i32)
+            User::find_by_id(db, logbook.shipmaster as i32)
                 .await
                 .unwrap(), //TODO: fixme
-        },
+        )
+        .unwrap(),
     )
     .await
 }

src/tera/mod.rs

@@ -16,7 +16,7 @@ use crate::model::{
     log::Log,
     tripdetails::TripDetails,
     triptype::TripType,
-    user::{User, UserWithRoles},
+    user::User,
     usertrip::{UserTrip, UserTripDeleteError, UserTripError},
 };
 
@@ -47,7 +47,7 @@ async fn wikiauth(db: &State<SqlitePool>, login: Form<LoginForm<'_>>) -> String
 async fn index(db: &State<SqlitePool>, user: User, flash: Option<FlashMessage<'_>>) -> Template {
     let mut context = Context::new();
 
-    if user.has_role(db, "cox").await || user.has_role(db, "admin").await {
+    if user.is_cox || user.is_admin {
         let triptypes = TripType::all(db).await;
         context.insert("trip_types", &triptypes);
     }
@@ -57,8 +57,8 @@ async fn index(db: &State<SqlitePool>, user: User, flash: Option<FlashMessage<'_
     if let Some(msg) = flash {
         context.insert("flash", &msg.into_inner());
     }
-    context.insert("loggedin_user", &UserWithRoles::from_user(user, db).await);
 
+    context.insert("loggedin_user", &user);
     context.insert("days", &days);
     Template::render("index", context.into_json())
 }

src/tera/stat.rs

@@ -4,7 +4,7 @@ use sqlx::SqlitePool;
 
 use crate::model::{
     stat::{self, Stat},
-    user::{NonGuestUser, UserWithRoles},
+    user::NonGuestUser,
 };
 
 use super::log::KioskCookie;
@@ -16,7 +16,7 @@ async fn index_boat(db: &State<SqlitePool>, user: NonGuestUser, year: Option<i32
 
     Template::render(
         "stat.boats",
-        context!(loggedin_user: &UserWithRoles::from_user(user.user, db).await, stat, kiosk),
+        context!(loggedin_user: &user.user, stat, kiosk),
     )
 }
 
@@ -41,7 +41,7 @@ async fn index(db: &State<SqlitePool>, user: NonGuestUser, year: Option<i32>) ->
 
     Template::render(
         "stat.people",
-        context!(loggedin_user: &UserWithRoles::from_user(user.user, db).await, stat, personal, kiosk, guest_km),
+        context!(loggedin_user: &user.user, stat, personal, kiosk, guest_km),
     )
 }
 

staging-diff.sql

@@ -1,95 +0,0 @@
-CREATE TABLE IF NOT EXISTS "role" (
-	"id" integer NOT NULL PRIMARY KEY AUTOINCREMENT,
-	"name" text NOT NULL UNIQUE
-);
-INSERT INTO "role" (name) VALUES ('admin');
-INSERT INTO "role" (name) VALUES ('cox');
-INSERT INTO "role" (name) VALUES ('scheckbuch');
-INSERT INTO "role" (name) VALUES ('tech');
-
-CREATE TABLE IF NOT EXISTS "user_role" (
-	"user_id" INTEGER NOT NULL REFERENCES user(id),
-	"role_id" INTEGER NOT NULL REFERENCES role(id),
-	CONSTRAINT unq UNIQUE (user_id, role_id) 
-);
-
-INSERT INTO "user_role" (user_id, role_id) VALUES (11,1); -- Marie Admin
-INSERT INTO "user_role" (user_id, role_id) VALUES (40,1); -- PH Admin
-
--- cox
-INSERT INTO "user_role" (user_id, role_id) VALUES (1,2);
-INSERT INTO "user_role" (user_id, role_id) VALUES (3,2);
-INSERT INTO "user_role" (user_id, role_id) VALUES (11,2);
-INSERT INTO "user_role" (user_id, role_id) VALUES (14,2);
-INSERT INTO "user_role" (user_id, role_id) VALUES (24,2);
-INSERT INTO "user_role" (user_id, role_id) VALUES (33,2);
-INSERT INTO "user_role" (user_id, role_id) VALUES (34,2);
-INSERT INTO "user_role" (user_id, role_id) VALUES (38,2);
-INSERT INTO "user_role" (user_id, role_id) VALUES (39,2);
-INSERT INTO "user_role" (user_id, role_id) VALUES (40,2);
-INSERT INTO "user_role" (user_id, role_id) VALUES (46,2);
-INSERT INTO "user_role" (user_id, role_id) VALUES (48,2);
-INSERT INTO "user_role" (user_id, role_id) VALUES (57,2);
-INSERT INTO "user_role" (user_id, role_id) VALUES (69,2);
-INSERT INTO "user_role" (user_id, role_id) VALUES (70,2);
-INSERT INTO "user_role" (user_id, role_id) VALUES (75,2);
-INSERT INTO "user_role" (user_id, role_id) VALUES (83,2);
-INSERT INTO "user_role" (user_id, role_id) VALUES (86,2);
-INSERT INTO "user_role" (user_id, role_id) VALUES (90,2);
-INSERT INTO "user_role" (user_id, role_id) VALUES (96,2);
-INSERT INTO "user_role" (user_id, role_id) VALUES (105,2);
-INSERT INTO "user_role" (user_id, role_id) VALUES (106,2);
-
--- scheckbuch
-INSERT INTO "user_role" (user_id, role_id) VALUES (109,3);
-INSERT INTO "user_role" (user_id, role_id) VALUES (112,3);
-INSERT INTO "user_role" (user_id, role_id) VALUES (113,3);
-INSERT INTO "user_role" (user_id, role_id) VALUES (114,3);
-INSERT INTO "user_role" (user_id, role_id) VALUES (115,3);
-INSERT INTO "user_role" (user_id, role_id) VALUES (116,3);
-INSERT INTO "user_role" (user_id, role_id) VALUES (118,3);
-INSERT INTO "user_role" (user_id, role_id) VALUES (119,3);
-INSERT INTO "user_role" (user_id, role_id) VALUES (120,3);
-INSERT INTO "user_role" (user_id, role_id) VALUES (121,3);
-INSERT INTO "user_role" (user_id, role_id) VALUES (122,3);
-INSERT INTO "user_role" (user_id, role_id) VALUES (123,3);
-INSERT INTO "user_role" (user_id, role_id) VALUES (124,3);
-INSERT INTO "user_role" (user_id, role_id) VALUES (126,3);
-INSERT INTO "user_role" (user_id, role_id) VALUES (127,3);
-INSERT INTO "user_role" (user_id, role_id) VALUES (128,3);
-INSERT INTO "user_role" (user_id, role_id) VALUES (129,3);
-INSERT INTO "user_role" (user_id, role_id) VALUES (130,3);
-INSERT INTO "user_role" (user_id, role_id) VALUES (131,3);
-INSERT INTO "user_role" (user_id, role_id) VALUES (132,3);
-INSERT INTO "user_role" (user_id, role_id) VALUES (133,3);
-INSERT INTO "user_role" (user_id, role_id) VALUES (135,3);
-INSERT INTO "user_role" (user_id, role_id) VALUES (136,3);
-INSERT INTO "user_role" (user_id, role_id) VALUES (137,3);
-INSERT INTO "user_role" (user_id, role_id) VALUES (138,3);
-INSERT INTO "user_role" (user_id, role_id) VALUES (139,3);
-INSERT INTO "user_role" (user_id, role_id) VALUES (140,3);
-INSERT INTO "user_role" (user_id, role_id) VALUES (141,3);
-INSERT INTO "user_role" (user_id, role_id) VALUES (142,3);
-INSERT INTO "user_role" (user_id, role_id) VALUES (143,3);
-INSERT INTO "user_role" (user_id, role_id) VALUES (144,3);
-INSERT INTO "user_role" (user_id, role_id) VALUES (145,3);
-INSERT INTO "user_role" (user_id, role_id) VALUES (146,3);
-INSERT INTO "user_role" (user_id, role_id) VALUES (147,3);
-INSERT INTO "user_role" (user_id, role_id) VALUES (153,3);
-INSERT INTO "user_role" (user_id, role_id) VALUES (154,3);
-INSERT INTO "user_role" (user_id, role_id) VALUES (155,3);
-INSERT INTO "user_role" (user_id, role_id) VALUES (159,3);
-INSERT INTO "user_role" (user_id, role_id) VALUES (669,3);
-INSERT INTO "user_role" (user_id, role_id) VALUES (670,3);
-INSERT INTO "user_role" (user_id, role_id) VALUES (671,3);
-INSERT INTO "user_role" (user_id, role_id) VALUES (672,3);
-INSERT INTO "user_role" (user_id, role_id) VALUES (673,3);
-INSERT INTO "user_role" (user_id, role_id) VALUES (674,3);
-INSERT INTO "user_role" (user_id, role_id) VALUES (675,3);
-INSERT INTO "user_role" (user_id, role_id) VALUES (676,3);
-INSERT INTO "user_role" (user_id, role_id) VALUES (677,3);
-INSERT INTO "user_role" (user_id, role_id) VALUES (678,3);
-
--- tech
-INSERT INTO "user_role" (user_id, role_id) VALUES (38,4);
-INSERT INTO "user_role" (user_id, role_id) VALUES (69,4);

templates/admin/user/index.html.tera

@@ -18,6 +18,10 @@
 						<label for="name" class="sr-only">Name</label>
 						<input type="text" name="name" class="relative block rounded-md border-0 py-1.5 px-2 text-gray-900 ring-1 ring-inset ring-gray-300 placeholder:text-gray-400 focus:ring-2 focus:ring-inset focus:ring-primary-600 sm:text-sm sm:leading-6 mb-2 md:mb-0" placeholder="Name"/>
 					</div>
+					<div class="flex items-center">
+						<label for="is_guest" class="flex items-center cursor-pointer hover:text-gray-100"><input type="checkbox" id="is_guest" name="is_guest" class="h-4 w-4 accent-gray-200 mr-2" checked="true"/>
+							Scheckbuch</label>
+					</div>
 				</div>
 			</div>
 			<div class="text-right">
@@ -49,9 +53,10 @@
                 {% endif %}
               </div>
               <div class="grid sm:grid-cols-2 lg:grid-cols-4 gap-3">
-	      	{% for role in roles %}
+                {{ macros::checkbox(label='Scheckbuch', name='is_guest', id=loop.index , checked=user.is_guest) }}
-                	{{ macros::checkbox(label=role.name, name="roles[" ~ role.id ~ "]", id=loop.index , checked=role.name in user.roles) }}
+                {{ macros::checkbox(label='Steuerberechtigter', name='is_cox', id=loop.index , checked=user.is_cox) }}
-		{% endfor%}
+                {{ macros::checkbox(label='Technical', name='is_tech', id=loop.index , checked=user.is_tech) }}
+                {{ macros::checkbox(label='Admin', name='is_admin', id=loop.index , checked=user.is_admin) }}
                 {{ macros::input(label='DOB', name='dob', id=loop.index, type="text", value=user.dob) }}
                 {{ macros::input(label='Weight (kg)', name='weight', id=loop.index, type="text", value=user.weight) }}
                 {{ macros::input(label='Sex', name='sex', id=loop.index, type="text", value=user.sex) }}

templates/boatdamages.html.tera

@@ -57,10 +57,10 @@
         {% 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 "cox" in loggedin_user.roles %}
+          {% if loggedin_user.is_cox %}
             <form action="/boatdamage/{{ boatdamage.id }}/fixed" method="post" class="flex justify-between mt-3">
               <input type="text" name="desc" value="{{ boatdamage.desc }}" class="grow input rounded-s" />
-              {% if "tech" in loggedin_user.roles %}
+              {% if loggedin_user.is_tech %}
                 <input type="submit" class="btn btn-primary" style="border-top-left-radius: 0; border-bottom-left-radius: 0;" value="Repariert und verifiziert" />
               {% else %}
                 <input type="submit" class="btn btn-primary" style="border-top-left-radius: 0; border-bottom-left-radius: 0;" value="Repariert" />
@@ -72,7 +72,7 @@
         {% if boatdamage.verified_at %}
           <small class="block text-gray-600 dark:text-gray-100">Verifziert von {{ boatdamage.user_verified.name }} am/um {{ boatdamage.verified_at | date(format='%d.%m.%Y (%H:%M)') }}</small>
         {% else %}
-          {% if "tech" in loggedin_user.roles and boatdamage.fixed_at  %}
+          {% if loggedin_user.is_tech and boatdamage.fixed_at  %}
             <form action="/boatdamage/{{ boatdamage.id }}/verified" method="post" class="flex justify-between mt-3">
               <input type="text" name="desc" value="{{ boatdamage.desc }}" class="grow input rounded-s"/>
               <input type="submit" class="btn btn-dark" style="border-top-left-radius: 0; border-bottom-left-radius: 0;"  value="Verifiziert" />

templates/ergo.html.tera

@@ -132,7 +132,7 @@
       </details>
       </div>
 
-      {% if "admin" in loggedin_user.roles %}
+      {% if loggedin_user.is_admin %}
           <div class="bg-white dark:bg-primary-900 text-black dark:text-white rounded-md block shadow grid gap-3">
             <h2 class="h2">Update</h2>
             

templates/includes/buttons.html.tera

@@ -1,4 +1,4 @@
-{% if "cox" in loggedin_user.roles %}
+{% if loggedin_user.is_cox %}
 	<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" class="group btn btn-primary filter-trips-js" data-action="filter-days" id="filterdays-js" aria-pressed="false">
 			{% include "includes/funnel-icon" %}

templates/includes/forms/log.html.tera

@@ -85,7 +85,7 @@
 						{% set_global sel = true %}
 					{% endif %}
 				{% endfor %}
-				<option value="{{ user.id }}" {% if sel %} selected {% endif %} {% if user.on_water %} disabled="disabled" {% endif %} data-custom-properties='{"is_cox": {{ "cox" in user.roles }}, "steers": {{ user.id == steering_person_id }}, "cox_on_boat": {{ user.id == cox_on_boat}}}'>
+				<option value="{{ user.id }}" {% if sel %} selected {% endif %} {% if user.on_water %} disabled="disabled" {% endif %} data-custom-properties='{"is_cox": {{ user.is_cox }}, "steers": {{ user.id == steering_person_id }}, "cox_on_boat": {{ user.id == cox_on_boat}}}'>
 					{{user.name}}
 					{% if user.on_water %}
 						(am Wasser)

templates/includes/macros.html.tera

@@ -19,7 +19,7 @@
           {% include "includes/question-icon" %}
           <span class="sr-only">FAQs</span>
         </a>
-        {% if "scheckbuch" in loggedin_user.roles and loggedin_user.weight and loggedin_user.sex and loggedin_user.dob %}
+        {% if loggedin_user.is_guest and loggedin_user.weight and loggedin_user.sex and loggedin_user.dob %}
           <a
             href="#"
             class="inline-flex justify-center rounded-md bg-primary-600 mx-1 px-3 py-2 text-sm font-semibold text-white hover:bg-primary-500 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-primary-600 cursor-pointer"
@@ -42,7 +42,7 @@
             </div>
           </div>
 	      {% endif %}
-        {% if "scheckbuch" not in loggedin_user.roles %}
+        {% if not loggedin_user.is_guest %}
         <a
           href="#"
           class="inline-flex justify-center rounded-md bg-primary-600 mx-1 px-3 py-2 text-sm font-semibold text-white hover:bg-primary-500 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-primary-600 cursor-pointer"
@@ -85,7 +85,7 @@
             >
               Bootsauswertung
             </a>
-            {% if "admin" in loggedin_user.roles %}
+            {% if loggedin_user.is_admin %}
             <a
               href="/admin/boat"
               class="block w-100 py-2 hover:text-primary-600 border-t"
@@ -102,7 +102,7 @@
           </div>
         </div>
         {% endif %}
-	      {% if "admin" in loggedin_user.roles %}
+	      {% if loggedin_user.is_admin %}
         <a
           href="/admin/user"
           class="inline-flex justify-center rounded-md bg-primary-600 mx-1 px-3 py-2 text-sm font-semibold text-white hover:bg-primary-500 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-primary-600 cursor-pointer"

templates/index.html.tera

@@ -71,7 +71,7 @@
 												{# --- END Row Buttons --- #}
 
 												{# --- START Cox Buttons --- #}
-												{% if "cox" in loggedin_user.roles %}
+												{% if loggedin_user.is_cox %}
 													{% set_global cur_user_participates = false %}
 													{% for cox in planned_event.cox %}
 														{% if cox.name == loggedin_user.name %}
@@ -111,11 +111,11 @@
 												{# --- START List Rowers --- #}
 												{% if planned_event.max_people > 0 %}
 													{% set amount_cur_rower = planned_event.rower | length %}
-													{{ macros::box(participants=planned_event.rower, empty_seats=planned_event.max_people - amount_cur_rower, bg='primary-100', color='black', trip_details_id=planned_event.trip_details_id, allow_removing="admin" in loggedin_user.roles) }}
+													{{ macros::box(participants=planned_event.rower, empty_seats=planned_event.max_people - amount_cur_rower, bg='primary-100', color='black', trip_details_id=planned_event.trip_details_id, allow_removing=loggedin_user.is_admin) }}
 												{% endif %}
 												{# --- END List Rowers --- #}
 
-													{% if "admin" in loggedin_user.roles %}
+													{% if loggedin_user.is_admin %}
 														<form action="/join/{{ planned_event.trip_details_id }}" method="get" />
 															{{ macros::input(label='Gast', class="input rounded-t", name='user_note', type='text', required=true) }}
 															<input value="Gast hinzufügen" class="btn btn-primary w-full rounded-t-none-important" type="submit"/>
@@ -127,7 +127,7 @@
 													<div class="text-primary-900 bg-primary-50 text-center p-1 mb-4">Gäste willkommen!</div>
 												{% endif %}
 
-												{% if "admin" in loggedin_user.roles %}
+												{% if loggedin_user.is_admin %}
 
 													{# --- START Edit Form --- #}
 													<div class="bg-gray-100 dark:bg-primary-900 p-3 mt-4 rounded-md">
@@ -258,9 +258,9 @@
 				</div>
 
 				{# --- START Add Buttons --- #}
-				{% if "admin" in loggedin_user.roles or "cox" in loggedin_user.roles %}
+				{% if loggedin_user.is_admin or loggedin_user.is_cox %}
-					<div class="grid {% if "admin" in loggedin_user.roles %} grid-cols-2 {% endif %} text-center">
+					<div class="grid {% if loggedin_user.is_admin %} grid-cols-2 {% endif %} text-center">
-						{% if "admin" in loggedin_user.roles %}
+						{% if loggedin_user.is_admin %}
 							<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 rounded-bl-md text-sm font-semibold">
 								<span class="absolute inset-y-0 left-0 flex items-center pl-3">
 									{% include "includes/plus-icon" %}
@@ -269,8 +269,8 @@
 							</a>
 						{% endif %}
 
-						{% if "cox" in loggedin_user.roles %}
+						{% if loggedin_user.is_cox%}
-							<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 "admin" in loggedin_user.roles %} rounded-br-md {% else %} rounded-b-md {% endif %}">
+							<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 loggedin_user.is_admin %} rounded-br-md {% else %} rounded-b-md {% endif %}">
 								<span class="absolute inset-y-0 left-0 flex items-center pl-3">
 									{% include "includes/plus-icon" %}
 								</span>
@@ -285,10 +285,10 @@
 	</div>
 </div>
 
-{% if "cox" in loggedin_user.roles %}
+{% if loggedin_user.is_cox %}
 	{% include "forms/trip" %}
 {% endif %}
 
-{% if "admin" in loggedin_user.roles %}
+{% if loggedin_user.is_admin %}
 	{% include "forms/event" %}
 {% endif %}{% endblock content %}

templates/log.html.tera

@@ -24,7 +24,7 @@
 			<div class="md:col-span-3 bg-white dark:bg-primary-900 rounded-md shadow">
 				<h2 class="h2">Neue Ausfahrt</h2>
 				<div class="p-3">
-					{{ log::new(only_ones="cox" not in loggedin_user.roles, shipmaster=loggedin_user.id) }}
+					{{ log::new(only_ones=loggedin_user.is_cox==false, shipmaster=loggedin_user.id) }}
 				</div>
 			</div>
 			<div class="bg-white dark:bg-primary-900 rounded-md shadow">
@@ -33,7 +33,7 @@
 				{% 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=loggedin_user.is_cox==false) }}
 						{% else %}
 							{{ log::show(log=log, state="on_water", only_ones=true) }}
 						{% endif %}