Compare commits
No commits in common. "243838fd44351e4047d61ea0665006c3a3a76a88" and "2889d40d5539079dde8c59d939409ecd866c7ba3" have entirely different histories.
243838fd44
...
2889d40d55
@ -259,9 +259,10 @@ WHERE trip_details.id=?
|
||||
let coxes = Registration::all_cox(db, self.id).await;
|
||||
for user in coxes {
|
||||
if let Some(user) = User::find_by_name(db, &user.name).await {
|
||||
let notes = match update.notes {
|
||||
Some(n) if !n.is_empty() => format!("Grund der Absage: {n}"),
|
||||
_ => String::from(""),
|
||||
let notes = if let Some(notes) = update.notes {
|
||||
format!("Grund der Absage: {notes}")
|
||||
} else {
|
||||
String::from("")
|
||||
};
|
||||
Notification::create(
|
||||
db,
|
||||
@ -281,9 +282,10 @@ WHERE trip_details.id=?
|
||||
let rower = Registration::all_rower(db, self.trip_details_id).await;
|
||||
for user in rower {
|
||||
if let Some(user) = User::find_by_name(db, &user.name).await {
|
||||
let notes = match update.notes {
|
||||
Some(n) if !n.is_empty() => format!("Grund der Absage: {n}"),
|
||||
_ => String::from(""),
|
||||
let notes = if let Some(notes) = update.notes {
|
||||
format!("Grund der Absage: {notes}")
|
||||
} else {
|
||||
String::from("")
|
||||
};
|
||||
|
||||
Notification::create(
|
||||
|
@ -135,12 +135,22 @@ ORDER BY read_at DESC, created_at DESC;
|
||||
.await
|
||||
.unwrap();
|
||||
|
||||
println!("in mark_read");
|
||||
|
||||
if let Some(action) = self.action_after_reading.as_ref() {
|
||||
println!("{action:#?}");
|
||||
// User read notification about cancelled trip/event
|
||||
let re = Regex::new(r"^remove_user_trip_with_trip_details_id:(\d+)$").unwrap();
|
||||
if let Some(caps) = re.captures(action) {
|
||||
println!("in 2nd if");
|
||||
if let Some(matched) = caps.get(1) {
|
||||
println!("in 3rd if");
|
||||
if let Ok(number) = matched.as_str().parse::<i32>() {
|
||||
println!("number: {number}");
|
||||
println!(
|
||||
"DELETE FROM user_trip WHERE user_id = {} AND trip_details_id = {}",
|
||||
self.user_id, number
|
||||
);
|
||||
let _ = sqlx::query!(
|
||||
"DELETE FROM user_trip WHERE user_id = ? AND trip_details_id = ?",
|
||||
self.user_id,
|
||||
|
@ -223,9 +223,10 @@ WHERE day=?
|
||||
.rower;
|
||||
for user in rowers {
|
||||
if let Some(user) = User::find_by_name(db, &user.name).await {
|
||||
let notes = match update.notes {
|
||||
Some(n) if !n.is_empty() => format!("Grund der Absage: {n}"),
|
||||
_ => String::from(""),
|
||||
let notes = if let Some(notes) = update.notes {
|
||||
format!("Grund der Absage: {notes}")
|
||||
} else {
|
||||
String::from("")
|
||||
};
|
||||
|
||||
Notification::create(
|
||||
|
Loading…
Reference in New Issue
Block a user