diff --git a/src/model/mod.rs b/src/model/mod.rs index 0115c70..1029bf2 100644 --- a/src/model/mod.rs +++ b/src/model/mod.rs @@ -3,22 +3,23 @@ use serde::Serialize; use sqlx::SqlitePool; use self::{ - planned_event::{PlannedEvent, PlannedEventWithUser}, - trip::{Trip, TripWithUser}, + planned_event::{PlannedEvent, PlannedEventWithUserAndTriptype}, + trip::{Trip, TripWithUserAndType}, }; pub mod log; pub mod planned_event; pub mod trip; pub mod tripdetails; +pub mod triptype; pub mod user; pub mod usertrip; #[derive(Serialize)] pub struct Day { day: NaiveDate, - planned_events: Vec, - trips: Vec, + planned_events: Vec, + trips: Vec, } impl Day {