staging #374

Merged
philipp merged 5 commits from staging into main 2024-04-15 18:49:53 +02:00
2 changed files with 2 additions and 10 deletions
Showing only changes of commit 4b07c11bc3 - Show all commits

View File

@ -77,10 +77,7 @@ WHERE day = ? AND planned_starting_time = ?
return; return;
} }
if Trip::find_by_trip_details(db, trip_details.id) if Trip::find_by_trip_details(db, self.id).await.is_none() {
.await
.is_none()
{
// This trip_details belongs to a planned_event, no need to do anything // This trip_details belongs to a planned_event, no need to do anything
return; return;
}; };

View File

@ -1,11 +1,6 @@
use sqlx::SqlitePool; use sqlx::SqlitePool;
use super::{ use super::{notification::Notification, trip::Trip, tripdetails::TripDetails, user::User};
notification::Notification,
trip::{Trip, TripWithUserAndType},
tripdetails::TripDetails,
user::User,
};
use crate::model::tripdetails::{Action, CoxAtTrip::Yes}; use crate::model::tripdetails::{Action, CoxAtTrip::Yes};
pub struct UserTrip {} pub struct UserTrip {}