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

fix-spaces #567

Merged
philipp merged 3 commits from fix-spaces into staging 2024-06-02 14:53:07 +02:00
Conversation 0 Commits 3 Files Changed 1 +9 -22
3 changed files with 9 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 243838fd44 - Show all commits

14
src/model/event.rs
View File

@ -259,10 +259,9 @@ WHERE trip_details.id=?
let coxes = Registration::all_cox(db, self.id).await; let coxes = Registration::all_cox(db, self.id).await;
for user in coxes { for user in coxes {
if let Some(user) = User::find_by_name(db, &user.name).await { if let Some(user) = User::find_by_name(db, &user.name).await {
let notes = if let Some(notes) = update.notes { let notes = match update.notes {
format!("Grund der Absage: {notes}") Some(n) if !n.is_empty() => format!("Grund der Absage: {n}"),
} else { _ => String::from(""),
String::from("")
}; };
Notification::create( Notification::create(
db, db,
@ -282,10 +281,9 @@ WHERE trip_details.id=?
let rower = Registration::all_rower(db, self.trip_details_id).await; let rower = Registration::all_rower(db, self.trip_details_id).await;
for user in rower { for user in rower {
if let Some(user) = User::find_by_name(db, &user.name).await { if let Some(user) = User::find_by_name(db, &user.name).await {
let notes = if let Some(notes) = update.notes { let notes = match update.notes {
format!("Grund der Absage: {notes}") Some(n) if !n.is_empty() => format!("Grund der Absage: {n}"),
} else { _ => String::from(""),
String::from("")
}; };
Notification::create( Notification::create(

10
src/model/notification.rs
View File

@ -135,22 +135,12 @@ ORDER BY read_at DESC, created_at DESC;
.await .await
.unwrap(); .unwrap();
println!("in mark_read");
if let Some(action) = self.action_after_reading.as_ref() { if let Some(action) = self.action_after_reading.as_ref() {
println!("{action:#?}");
// User read notification about cancelled trip/event // User read notification about cancelled trip/event
let re = Regex::new(r"^remove_user_trip_with_trip_details_id:(\d+)$").unwrap(); let re = Regex::new(r"^remove_user_trip_with_trip_details_id:(\d+)$").unwrap();
if let Some(caps) = re.captures(action) { if let Some(caps) = re.captures(action) {
println!("in 2nd if");
if let Some(matched) = caps.get(1) { if let Some(matched) = caps.get(1) {
println!("in 3rd if");
if let Ok(number) = matched.as_str().parse::<i32>() { 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!( let _ = sqlx::query!(
"DELETE FROM user_trip WHERE user_id = ? AND trip_details_id = ?", "DELETE FROM user_trip WHERE user_id = ? AND trip_details_id = ?",
self.user_id, self.user_id,

7
src/model/trip.rs
View File

@ -223,10 +223,9 @@ WHERE day=?
.rower; .rower;
for user in rowers { for user in rowers {
if let Some(user) = User::find_by_name(db, &user.name).await { if let Some(user) = User::find_by_name(db, &user.name).await {
let notes = if let Some(notes) = update.notes { let notes = match update.notes {
format!("Grund der Absage: {notes}") Some(n) if !n.is_empty() => format!("Grund der Absage: {n}"),
} else { _ => String::from(""),
String::from("")
}; };
Notification::create( Notification::create(