feat: send mail on new assignment
This commit is contained in:
parent
6833887254
commit
44c6cddf52
20
db/sql/user/read_by_availability_id.sql
Normal file
20
db/sql/user/read_by_availability_id.sql
Normal file
@ -0,0 +1,20 @@
|
|||||||
|
SELECT
|
||||||
|
user_.id,
|
||||||
|
name,
|
||||||
|
email,
|
||||||
|
password,
|
||||||
|
salt,
|
||||||
|
role AS "role: Role",
|
||||||
|
function AS "function: UserFunction",
|
||||||
|
areaId,
|
||||||
|
locked,
|
||||||
|
lastLogin,
|
||||||
|
receiveNotifications
|
||||||
|
FROM
|
||||||
|
user_,
|
||||||
|
availability
|
||||||
|
WHERE
|
||||||
|
availability.id = $1
|
||||||
|
AND availability.userId = user_.id
|
||||||
|
ORDER BY
|
||||||
|
id;
|
@ -1,5 +1,5 @@
|
|||||||
use chrono::{DateTime, Utc};
|
use chrono::{DateTime, Utc};
|
||||||
use sqlx::PgPool;
|
use sqlx::{PgPool, query_file};
|
||||||
|
|
||||||
use super::{Area, Function, Result, Role, UserChangeset, UserFunction};
|
use super::{Area, Function, Result, Role, UserChangeset, UserFunction};
|
||||||
|
|
||||||
@ -290,6 +290,32 @@ impl User {
|
|||||||
Ok(result)
|
Ok(result)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub async fn read_by_availability_id(
|
||||||
|
pool: &PgPool,
|
||||||
|
availability_id: i32,
|
||||||
|
) -> Result<Option<User>> {
|
||||||
|
let record = query_file!("sql/user/read_by_availability_id.sql", availability_id)
|
||||||
|
.fetch_optional(pool)
|
||||||
|
.await?;
|
||||||
|
|
||||||
|
let result = record.map(|r| User {
|
||||||
|
id: r.id,
|
||||||
|
name: r.name.clone(),
|
||||||
|
email: r.email.clone(),
|
||||||
|
password: r.password.clone(),
|
||||||
|
salt: r.salt.clone(),
|
||||||
|
role: r.role,
|
||||||
|
function: r.function.clone(),
|
||||||
|
area_id: r.areaid,
|
||||||
|
area: None,
|
||||||
|
locked: r.locked,
|
||||||
|
last_login: r.lastlogin,
|
||||||
|
receive_notifications: r.receivenotifications,
|
||||||
|
});
|
||||||
|
|
||||||
|
Ok(result)
|
||||||
|
}
|
||||||
|
|
||||||
pub async fn update(pool: &PgPool, id: i32, changeset: UserChangeset) -> Result<()> {
|
pub async fn update(pool: &PgPool, id: i32, changeset: UserChangeset) -> Result<()> {
|
||||||
sqlx::query!(
|
sqlx::query!(
|
||||||
"UPDATE user_ SET name = $1, email = $2, role = $3, function = $4, areaId = $5 WHERE id = $6;",
|
"UPDATE user_ SET name = $1, email = $2, role = $3, function = $4, areaId = $5 WHERE id = $6;",
|
||||||
|
@ -4,6 +4,7 @@ use sqlx::PgPool;
|
|||||||
|
|
||||||
use crate::{
|
use crate::{
|
||||||
endpoints::assignment::PlanEventPersonalTablePartialTemplate,
|
endpoints::assignment::PlanEventPersonalTablePartialTemplate,
|
||||||
|
mail::Mailer,
|
||||||
utils::{
|
utils::{
|
||||||
event_planning_template::{
|
event_planning_template::{
|
||||||
generate_availability_assignment_list, generate_status_whether_staff_is_required,
|
generate_availability_assignment_list, generate_status_whether_staff_is_required,
|
||||||
@ -24,6 +25,7 @@ pub async fn delete(
|
|||||||
user: web::ReqData<User>,
|
user: web::ReqData<User>,
|
||||||
pool: web::Data<PgPool>,
|
pool: web::Data<PgPool>,
|
||||||
query: web::Query<AssignmentDeleteQuery>,
|
query: web::Query<AssignmentDeleteQuery>,
|
||||||
|
mailer: web::Data<Mailer>,
|
||||||
) -> Result<impl Responder, ApplicationError> {
|
) -> Result<impl Responder, ApplicationError> {
|
||||||
let Some(event) = Event::read_by_id_including_location(pool.get_ref(), query.event).await?
|
let Some(event) = Event::read_by_id_including_location(pool.get_ref(), query.event).await?
|
||||||
else {
|
else {
|
||||||
@ -45,6 +47,16 @@ pub async fn delete(
|
|||||||
|
|
||||||
Assignment::delete(pool.get_ref(), event.id, assignment.availability_id).await?;
|
Assignment::delete(pool.get_ref(), event.id, assignment.availability_id).await?;
|
||||||
|
|
||||||
|
let user_of_availability =
|
||||||
|
User::read_by_availability_id(pool.get_ref(), assignment.availability_id)
|
||||||
|
.await?
|
||||||
|
.unwrap();
|
||||||
|
if user_of_availability.receive_notifications {
|
||||||
|
mailer
|
||||||
|
.send_assignment_deleted_mail(&user_of_availability, &assignment.function, &event)
|
||||||
|
.await?;
|
||||||
|
}
|
||||||
|
|
||||||
let availabilities = generate_availability_assignment_list(pool.get_ref(), &event).await?;
|
let availabilities = generate_availability_assignment_list(pool.get_ref(), &event).await?;
|
||||||
let (
|
let (
|
||||||
further_posten_required,
|
further_posten_required,
|
||||||
|
@ -4,6 +4,7 @@ use sqlx::PgPool;
|
|||||||
|
|
||||||
use crate::{
|
use crate::{
|
||||||
endpoints::assignment::PlanEventPersonalTablePartialTemplate,
|
endpoints::assignment::PlanEventPersonalTablePartialTemplate,
|
||||||
|
mail::Mailer,
|
||||||
utils::{
|
utils::{
|
||||||
event_planning_template::{
|
event_planning_template::{
|
||||||
generate_availability_assignment_list, generate_status_whether_staff_is_required,
|
generate_availability_assignment_list, generate_status_whether_staff_is_required,
|
||||||
@ -29,6 +30,7 @@ pub async fn post(
|
|||||||
user: web::ReqData<User>,
|
user: web::ReqData<User>,
|
||||||
pool: web::Data<PgPool>,
|
pool: web::Data<PgPool>,
|
||||||
query: web::Query<AssignmentQuery>,
|
query: web::Query<AssignmentQuery>,
|
||||||
|
mailer: web::Data<Mailer>,
|
||||||
) -> Result<impl Responder, ApplicationError> {
|
) -> Result<impl Responder, ApplicationError> {
|
||||||
if user.role != Role::Admin && user.role != Role::AreaManager {
|
if user.role != Role::Admin && user.role != Role::AreaManager {
|
||||||
return Err(ApplicationError::Unauthorized);
|
return Err(ApplicationError::Unauthorized);
|
||||||
@ -59,6 +61,16 @@ pub async fn post(
|
|||||||
|
|
||||||
Assignment::create(pool.get_ref(), event.id, query.availability, changeset).await?;
|
Assignment::create(pool.get_ref(), event.id, query.availability, changeset).await?;
|
||||||
|
|
||||||
|
let user_of_availability =
|
||||||
|
User::read_by_availability_id(pool.get_ref(), context.availability_id)
|
||||||
|
.await?
|
||||||
|
.unwrap();
|
||||||
|
if user_of_availability.receive_notifications {
|
||||||
|
mailer
|
||||||
|
.send_assignment_created_mail(&user_of_availability, &function, &event)
|
||||||
|
.await?;
|
||||||
|
}
|
||||||
|
|
||||||
let availabilities = generate_availability_assignment_list(pool.get_ref(), &event).await?;
|
let availabilities = generate_availability_assignment_list(pool.get_ref(), &event).await?;
|
||||||
|
|
||||||
let (
|
let (
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
use askama::Template;
|
use askama::Template;
|
||||||
use brass_db::models::{Assignment, Event, Function, User};
|
use brass_db::models::{Event, Function, User};
|
||||||
use lettre::{
|
use lettre::{
|
||||||
message::{Mailbox, MultiPart, SinglePart},
|
message::{Mailbox, MultiPart, SinglePart},
|
||||||
Address, AsyncTransport, Message,
|
Address, AsyncTransport, Message,
|
||||||
@ -18,14 +18,14 @@ impl Mailer {
|
|||||||
pub async fn send_assignment_created_mail(
|
pub async fn send_assignment_created_mail(
|
||||||
&self,
|
&self,
|
||||||
user: &User,
|
user: &User,
|
||||||
assignment: &Assignment,
|
assigned_function: &Function,
|
||||||
event: &Event,
|
event: &Event,
|
||||||
) -> Result<(), ApplicationError> {
|
) -> Result<(), ApplicationError> {
|
||||||
let message = build(
|
let message = build(
|
||||||
&self.hostname,
|
&self.hostname,
|
||||||
&user.name,
|
&user.name,
|
||||||
&user.email,
|
&user.email,
|
||||||
&assignment.function,
|
&assigned_function,
|
||||||
event,
|
event,
|
||||||
)?;
|
)?;
|
||||||
self.transport.send(message).await?;
|
self.transport.send(message).await?;
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
use askama::Template;
|
use askama::Template;
|
||||||
use brass_db::models::{Assignment, Event, Function, User};
|
use brass_db::models::{Event, Function, User};
|
||||||
use lettre::{
|
use lettre::{
|
||||||
message::{Mailbox, MultiPart, SinglePart},
|
message::{Mailbox, MultiPart, SinglePart},
|
||||||
Address, AsyncTransport, Message,
|
Address, AsyncTransport, Message,
|
||||||
@ -18,14 +18,14 @@ impl Mailer {
|
|||||||
pub async fn send_assignment_deleted_mail(
|
pub async fn send_assignment_deleted_mail(
|
||||||
&self,
|
&self,
|
||||||
user: &User,
|
user: &User,
|
||||||
assignment: &Assignment,
|
assigned_function: &Function,
|
||||||
event: &Event,
|
event: &Event,
|
||||||
) -> Result<(), ApplicationError> {
|
) -> Result<(), ApplicationError> {
|
||||||
let message = build(
|
let message = build(
|
||||||
&self.hostname,
|
&self.hostname,
|
||||||
&user.name,
|
&user.name,
|
||||||
&user.email,
|
&user.email,
|
||||||
&assignment.function,
|
&assigned_function,
|
||||||
event,
|
event,
|
||||||
)?;
|
)?;
|
||||||
self.transport.send(message).await?;
|
self.transport.send(message).await?;
|
||||||
|
@ -6,7 +6,7 @@
|
|||||||
|
|
||||||
<ul>
|
<ul>
|
||||||
<li>Name: {{ event.name }}</li>
|
<li>Name: {{ event.name }}</li>
|
||||||
<li>- Ort: {{ event.location.as_ref().unwrap().name }}</li>
|
<li>Ort: {{ event.location.as_ref().unwrap().name }}</li>
|
||||||
<li>Beginn: {{ event.start }}</li>
|
<li>Beginn: {{ event.start }}</li>
|
||||||
<li>Ende: {{ event.end }}</li>
|
<li>Ende: {{ event.end }}</li>
|
||||||
<li>Kleidungsordnung: {{ event.clothing.name }}</li>
|
<li>Kleidungsordnung: {{ event.clothing.name }}</li>
|
||||||
|
Loading…
x
Reference in New Issue
Block a user