Ruderverein-Donau-Linz/rowt
1
1
Fork 1
Code Issues 49 Pull Requests Actions Packages Projects Wiki Activity

Merge pull request 'allow others to send fee reminder thus reducing my bus factor' (#915) from send-fee-reminder into staging
All checks were successful
CI/CD Pipeline / test (push) Successful in 16m53s
Details
CI/CD Pipeline / deploy-staging (push) Successful in 8m9s
Details
CI/CD Pipeline / deploy-main (push) Has been skipped
Details

Browse Source 
Reviewed-on: #915
This commit is contained in:
philipp
2025-04-17 20:44:45 +02:00
parent 3b25143a08 db429b6fe3
commit 8340e8b33f
5 changed files with 88 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
src/tera/admin/mail.rs
View File

@ -9,8 +9,8 @@ use sqlx::SqlitePool;
use crate::model::log::Log;
use crate::model::mail::Mail;
use crate::model::role::Role;
use crate::model::user::UserWithDetails;
use crate::model::user::{AdminUser, VorstandUser};
use crate::model::user::VorstandUser;
use crate::model::user::{AllowedToSendFeeReminderUser, UserWithDetails};
use crate::tera::Config;
#[get("/mail")]
@ -35,21 +35,51 @@ async fn index(
}
#[get("/mail/fee")]
async fn fee(db: &State<SqlitePool>, admin: AdminUser, config: &State<Config>) -> &'static str {
async fn fee(
db: &State<SqlitePool>,
admin: AllowedToSendFeeReminderUser,
config: &State<Config>,
) -> Flash<Redirect> {
Log::create(db, format!("{admin:?} trying to send fee")).await;
Mail::fees(db, config.smtp_pw.clone()).await;
"SUCC"
Mail::fees(db, config.smtp_pw.clone(), None).await;
Log::create(db, "Mail successfully sent".into()).await;
Flash::success(Redirect::to("/admin/mail"), "Mail versendet")
}
#[get("/mail/fee/test")]
async fn fee_test(
db: &State<SqlitePool>,
admin: AllowedToSendFeeReminderUser,
config: &State<Config>,
) -> Flash<Redirect> {
Log::create(db, format!("{admin:?} trying to send test fee")).await;
Mail::fees(db, config.smtp_pw.clone(), Some(admin.user)).await;
Log::create(db, "Mail successfully sent".into()).await;
Flash::success(Redirect::to("/admin/mail"), "Mail versendet")
}
#[get("/mail/fee-final")]
async fn fee_final(
db: &State<SqlitePool>,
admin: AdminUser,
admin: AllowedToSendFeeReminderUser,
config: &State<Config>,
) -> &'static str {
) -> Flash<Redirect> {
Log::create(db, format!("{admin:?} trying to send fee_final")).await;
Mail::fees_final(db, config.smtp_pw.clone()).await;
"SUCC"
Mail::fees_final(db, config.smtp_pw.clone(), None).await;
Log::create(db, "Mail successfully sent".into()).await;
Flash::success(Redirect::to("/admin/mail"), "Mail versendet")
}
#[get("/mail/fee-final/test")]
async fn fee_final_test(
db: &State<SqlitePool>,
admin: AllowedToSendFeeReminderUser,
config: &State<Config>,
) -> Flash<Redirect> {
Log::create(db, format!("{admin:?} trying to send test fee_final")).await;
Mail::fees_final(db, config.smtp_pw.clone(), Some(admin.user)).await;
Log::create(db, "Mail successfully sent".into()).await;
Flash::success(Redirect::to("/admin/mail"), "Mail versendet")
}
#[derive(FromForm, Debug)]
@ -79,7 +109,7 @@ async fn update(
}
pub fn routes() -> Vec<Route> {
routes![index, update, fee, fee_final]
routes![index, update, fee, fee_test, fee_final, fee_final_test]
}
#[cfg(test)]