fix error where joining cox to planned_event is not dispaying properly. The problem was the restructuring commit 7569798b00 (diff-0496fd5ec13efcfc97602dc5784170a0dd124e6e) where I compared different ids
All checks were successful
CI/CD Pipeline / test (push) Successful in 10m45s
CI/CD Pipeline / deploy-staging (push) Has been skipped
CI/CD Pipeline / deploy-main (push) Has been skipped

This commit is contained in:
2023-12-28 18:14:11 +01:00
parent 44bc217452
commit a9fbb05944
4 changed files with 4 additions and 4 deletions

View File

@ -22,7 +22,7 @@ pub mod triptype;
pub mod user;
pub mod usertrip;
#[derive(Serialize)]
#[derive(Serialize, Debug)]
pub struct Day {
day: NaiveDate,
planned_events: Vec<PlannedEventWithUserAndTriptype>,

View File

@ -144,7 +144,7 @@ WHERE day=?",
let mut ret = Vec::new();
for event in events {
let cox = Registration::all_cox(db, event.trip_details_id).await;
let cox = Registration::all_cox(db, event.id).await;
let mut trip_type = None;
if let Some(trip_type_id) = event.trip_type_id {
trip_type = TripType::find_by_id(db, trip_type_id).await;

View File

@ -25,7 +25,7 @@ pub struct Trip {
is_locked: bool,
}
#[derive(Serialize)]
#[derive(Serialize, Debug)]
pub struct TripWithUserAndType {
#[serde(flatten)]
pub trip: Trip,