Skip to content

Commit 11f21cb

Browse files
committed
send_chargelog_to_user: add month to mail subject
1 parent 9ff3cee commit 11f21cb

File tree

1 file changed

+15
-12
lines changed

1 file changed

+15
-12
lines changed

backend/src/routes/send_chargelog_to_user.rs

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ fn render_chargelog_email(
4242
month: &str,
4343
filename: &str,
4444
lang: &str,
45-
) -> actix_web::Result<(String, &'static str)> {
45+
) -> actix_web::Result<(String, String)> {
4646
let (body, subject) = match lang {
4747
"de" | "de-DE" => {
4848
let template = ChargelogDETemplate {
@@ -51,9 +51,13 @@ fn render_chargelog_email(
5151
filename,
5252
};
5353
match template.render() {
54-
Ok(b) => (b, "Dein Ladelog"),
54+
Ok(b) => (b, format!("Dein Ladelog für {}", month)),
5555
Err(e) => {
56-
log::error!("Failed to render German chargelog email template for user '{}': {}", user_name, e);
56+
log::error!(
57+
"Failed to render German chargelog email template for user '{}': {}",
58+
user_name,
59+
e
60+
);
5761
return Err(crate::error::Error::InternalError.into());
5862
}
5963
}
@@ -65,9 +69,13 @@ fn render_chargelog_email(
6569
filename,
6670
};
6771
match template.render() {
68-
Ok(b) => (b, "Your Charge Log"),
72+
Ok(b) => (b, format!("Your Charge Log for {}", month)),
6973
Err(e) => {
70-
log::error!("Failed to render English chargelog email template for user '{}': {}", user_name, e);
74+
log::error!(
75+
"Failed to render English chargelog email template for user '{}': {}",
76+
user_name,
77+
e
78+
);
7179
return Err(crate::error::Error::InternalError.into());
7280
}
7381
}
@@ -124,16 +132,11 @@ pub async fn send_chargelog(
124132

125133
let month = chrono::Utc::now().format("%B %Y").to_string();
126134

127-
let (body, subject) = render_chargelog_email(
128-
&user.name,
129-
&month,
130-
&payload.filename,
131-
&lang_str,
132-
)?;
135+
let (body, subject) = render_chargelog_email(&user.name, &month, &payload.filename, &lang_str)?;
133136

134137
send_email_with_attachment(
135138
&user.email,
136-
subject,
139+
&subject,
137140
body,
138141
payload.chargelog.clone(),
139142
&payload.filename,

0 commit comments

Comments
 (0)