be able to update data individually; Fixes #951

src/model/user/mod.rs

@@ -1,4 +1,7 @@
-use std::ops::{Deref, DerefMut};
+use std::{
+    fmt::Display,
+    ops::{Deref, DerefMut},
+};
 
 use argon2::{password_hash::SaltString, Argon2, PasswordHasher};
 use chrono::{Datelike, Local, NaiveDate};
@@ -29,6 +32,7 @@ use super::{
 use crate::{tera::admin::user::UserEditForm, AMOUNT_DAYS_TO_SHOW_TRIPS_AHEAD};
 use scheckbuch::ScheckbuchUser;
 
+mod basic;
 mod fee;
 mod scheckbuch;
 
@@ -53,6 +57,12 @@ pub struct User {
     pub user_token: String,
 }
 
+impl Display for User {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        write!(f, "{}", self.name)
+    }
+}
+
 #[derive(Debug, Serialize, Deserialize)]
 pub struct UserWithDetails {
     #[serde(flatten)]
@@ -585,26 +595,6 @@ ORDER BY last_access DESC
         Ok(())
     }
 
-    pub async fn add_role(&self, db: &SqlitePool, role: &Role) -> Result<(), String> {
-        sqlx::query!(
-            "INSERT INTO user_role(user_id, role_id) VALUES (?, ?)",
-            self.id,
-            role.id
-        )
-        .execute(db)
-        .await
-        .map_err(|_| {
-            format!(
-                "User already has a role in the cluster '{}'",
-                role.cluster
-                    .clone()
-                    .expect("db trigger can't activate on empty string")
-            )
-        })?;
-
-        Ok(())
-    }
-
     async fn send_end_mail_scheckbuch(
         &self,
         db: &mut Transaction<'_, Sqlite>,
@@ -658,17 +648,6 @@ ASKÖ Ruderverein Donau Linz", self.name),
         Ok(())
     }
 
-    pub async fn remove_role(&self, db: &SqlitePool, role: &Role) {
-        sqlx::query!(
-            "DELETE FROM user_role WHERE user_id = ? and role_id = ?",
-            self.id,
-            role.id
-        )
-        .execute(db)
-        .await
-        .unwrap();
-    }
-
     pub async fn login(db: &SqlitePool, name: &str, pw: &str) -> Result<Self, LoginError> {
         let name = name.trim().to_lowercase(); // just to make sure...
         let Some(user) = User::find_by_name(db, &name).await else {
@@ -1000,6 +979,12 @@ macro_rules! special_user {
                 }
             }
         }
+
+        impl std::fmt::Display for $name {
+            fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+                write!(f, "{}", self.name)
+            }
+        }
     };
     (@check_roles $user:ident, $db:ident, $(+$role:expr),* $(,-$neg_role:expr)*) => {
         {