enable changing paid state

src/model/role.rs

@@ -3,8 +3,8 @@ use sqlx::{FromRow, SqlitePool};
 
 #[derive(FromRow, Serialize, Clone)]
 pub struct Role {
-    id: i64,
-    name: String,
+    pub(crate) id: i64,
+    pub(crate) name: String,
 }
 
 impl Role {
@@ -30,6 +30,21 @@ WHERE id like ?
         .ok()
     }
 
+    pub async fn find_by_name(db: &SqlitePool, name: &str) -> Option<Self> {
+        sqlx::query_as!(
+            Self,
+            "
+SELECT id, name
+FROM role 
+WHERE name like ?
+        ",
+            name
+        )
+        .fetch_one(db)
+        .await
+        .ok()
+    }
+
     pub async fn mails_from_role(&self, db: &SqlitePool) -> Vec<String> {
         let query = format!(
             "SELECT u.mail

src/model/user.rs

@@ -14,7 +14,7 @@ use rocket::{
 use serde::{Deserialize, Serialize};
 use sqlx::{FromRow, Sqlite, SqlitePool, Transaction};
 
-use super::{family::Family, log::Log, tripdetails::TripDetails, Day};
+use super::{family::Family, log::Log, role::Role, tripdetails::TripDetails, Day};
 use crate::tera::admin::user::UserEditForm;
 
 const RENNRUDERBEITRAG: i32 = 11000;
@@ -105,6 +105,8 @@ pub(crate) struct Fee {
     pub(crate) sum_in_cents: i32,
     pub(crate) parts: Vec<(String, i32)>,
     pub(crate) name: String,
+    pub(crate) user_ids: String,
+    pub(crate) paid: bool,
 }
 
 impl Fee {
@@ -113,6 +115,8 @@ impl Fee {
             sum_in_cents: 0,
             name: "".into(),
             parts: Vec::new(),
+            user_ids: "".into(),
+            paid: false,
         }
     }
 
@@ -122,8 +126,18 @@ impl Fee {
         self.parts.push((desc, price_in_cents));
     }
 
-    pub fn name(&mut self, name: String) {
-        self.name = name;
+    pub fn add_person(&mut self, user: &User) {
+        if !self.name.is_empty() {
+            self.name.push_str(" + ");
+            self.user_ids.push_str("&");
+        }
+        self.name.push_str(&user.name);
+
+        self.user_ids.push_str(&format!("user_ids[]={}", user.id));
+    }
+
+    pub fn paid(&mut self) {
+        self.paid = true;
     }
 
     pub fn merge(&mut self, fee: Fee) {
@@ -144,20 +158,22 @@ impl User {
         if let Some(family) = Family::find_by_opt_id(db, self.family_id).await {
             let mut names = String::new();
             for member in family.members(db).await {
-                if !names.is_empty() {
-                    names.push_str(" + ");
+                fee.add_person(&member);
+                if member.has_role(db, "paid").await {
+                    fee.paid();
                 }
-                names.push_str(&member.name);
                 fee.merge(member.fee_without_families(db).await);
             }
-            fee.name(names);
             if family.amount_family_members(db).await > 2 {
                 fee.add("Familie 3+ Personen".into(), FAMILY_THREE_OR_MORE);
             } else {
                 fee.add("Familie 2 Personen".into(), FAMILY_TWO);
             }
         } else {
-            fee.name(self.name.clone());
+            fee.add_person(&self);
+            if self.has_role(db, "paid").await {
+                fee.paid();
+            }
             fee.merge(self.fee_without_families(db).await);
         }
 
@@ -452,17 +468,38 @@ ORDER BY last_access DESC
             .unwrap();
 
         for role_id in data.roles.into_keys() {
-            sqlx::query!(
-                "INSERT INTO user_role(user_id, role_id) VALUES (?, ?)",
-                self.id,
-                role_id
+            self.add_role(
+                db,
+                &Role::find_by_id(db, role_id.parse::<i32>().unwrap())
+                    .await
+                    .unwrap(),
             )
-            .execute(db)
-            .await
-            .unwrap();
+            .await;
         }
     }
 
+    pub async fn add_role(&self, db: &SqlitePool, role: &Role) {
+        sqlx::query!(
+            "INSERT INTO user_role(user_id, role_id) VALUES (?, ?)",
+            self.id,
+            role.id
+        )
+        .execute(db)
+        .await
+        .unwrap();
+    }
+
+    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(); // just to make sure...
         let Some(user) = User::find_by_name(db, name).await else {