add more logs
All checks were successful
CI/CD Pipeline / test (push) Successful in 10m15s
CI/CD Pipeline / deploy-staging (push) Successful in 4m56s
CI/CD Pipeline / deploy-main (push) Has been skipped

This commit is contained in:
2024-03-16 20:42:41 +01:00
parent d1fa3e0336
commit c068713572
2 changed files with 27 additions and 8 deletions

View File

@@ -2,6 +2,7 @@ use std::collections::HashMap;
use crate::model::{
family::Family,
log::Log,
logbook::Logbook,
role::Role,
user::{AdminUser, User, UserWithRoles, VorstandUser},
@@ -163,10 +164,15 @@ async fn scheckbuch(
#[get("/user/fees/paid?<user_ids>")]
async fn fees_paid(
db: &State<SqlitePool>,
_admin: AdminUser,
admin: AdminUser,
user_ids: Vec<i32>,
referer: Referer,
) -> Flash<Redirect> {
Log::create(
db,
format!("{admin:?} set fees paid for user_ids: {user_ids:?}"),
)
.await;
let mut res = String::new();
for user_id in user_ids {
let user = User::find_by_id(db, user_id).await.unwrap();
@@ -204,8 +210,9 @@ async fn resetpw(db: &State<SqlitePool>, _admin: AdminUser, user: i32) -> Flash<
}
#[get("/user/<user>/delete")]
async fn delete(db: &State<SqlitePool>, _admin: AdminUser, user: i32) -> Flash<Redirect> {
async fn delete(db: &State<SqlitePool>, admin: AdminUser, user: i32) -> Flash<Redirect> {
let user = User::find_by_id(db, user).await;
Log::create(db, format!("{admin:?} deleted user: {user:?}")).await;
match user {
Some(user) => {
user.delete(db).await;
@@ -239,9 +246,14 @@ pub struct UserEditForm {
async fn update(
db: &State<SqlitePool>,
data: Form<UserEditForm>,
_admin: AdminUser,
admin: AdminUser,
) -> Flash<Redirect> {
let user = User::find_by_id(db, data.id).await;
Log::create(
db,
format!("{admin:?} updated user from {user:?} to {data:?}"),
)
.await;
let Some(user) = user else {
return Flash::error(
Redirect::to("/admin/user"),
@@ -254,7 +266,7 @@ async fn update(
Flash::success(Redirect::to("/admin/user"), "Successfully updated user")
}
#[derive(FromForm)]
#[derive(FromForm, Debug)]
struct UserAddForm<'r> {
name: &'r str,
}
@@ -263,8 +275,9 @@ struct UserAddForm<'r> {
async fn create(
db: &State<SqlitePool>,
data: Form<UserAddForm<'_>>,
_admin: AdminUser,
admin: AdminUser,
) -> Flash<Redirect> {
Log::create(db, format!("{admin:?} created new user: {data:?}")).await;
if User::create(db, data.name).await {
Flash::success(Redirect::to("/admin/user"), "Successfully created user")
} else {