start with activity + fix tests

This commit is contained in:
2025-05-03 19:04:13 +02:00
parent d50501b362
commit e360c4f06b
8 changed files with 121 additions and 36 deletions

View File

@ -1,12 +1,25 @@
// TODO: put back in `src/model/user/mod.rs` once that is cleaned up
use super::{AllowedToEditPaymentStatusUser, ManageUserUser, User};
use crate::model::{family::Family, log::Log, mail::valid_mails, role::Role};
use crate::model::{activity::Activity, family::Family, log::Log, mail::valid_mails, role::Role};
use chrono::NaiveDate;
use rocket::{fs::TempFile, tokio::io::AsyncReadExt};
use sqlx::SqlitePool;
impl User {
pub(crate) async fn add_note(
&self,
db: &SqlitePool,
updated_by: &ManageUserUser,
note: &str,
) -> Result<(), String> {
let note = note.trim();
Activity::create(db, note, "relevant_for", None).await;
Ok(())
}
pub(crate) async fn update_mail(
&self,
db: &SqlitePool,

View File

@ -951,9 +951,7 @@ impl UserWithMembershipPdf {
#[cfg(test)]
mod test {
use std::collections::HashMap;
use crate::{tera::admin::user::UserEditForm, testdb};
use crate::testdb;
use super::User;
use sqlx::SqlitePool;
@ -1014,38 +1012,6 @@ mod test {
assert_eq!(User::create(&pool, "admin".into()).await, false);
}
#[sqlx::test]
fn test_update() {
let pool = testdb!();
let user = User::find_by_id(&pool, 1).await.unwrap();
user.update(
&pool,
UserEditForm {
id: 1,
dob: None,
weight: None,
sex: Some("m".into()),
roles: HashMap::new(),
member_since_date: None,
birthdate: None,
mail: None,
nickname: None,
notes: None,
phone: None,
address: None,
family_id: None,
membership_pdf: None,
},
)
.await
.unwrap();
let user = User::find_by_id(&pool, 1).await.unwrap();
assert_eq!(user.sex, Some("m".into()));
}
#[sqlx::test]
fn succ_login_with_test_db() {
let pool = testdb!();