diff --git a/backend/src/ticket_data.rs b/backend/src/ticket_data.rs index 65e168c..3410c0d 100644 --- a/backend/src/ticket_data.rs +++ b/backend/src/ticket_data.rs @@ -1,6 +1,6 @@ use crate::{ models::{AutoIssuedTicket, IssuedTicket, NewTicket, Ticket}, - schema::{issued_tickets, tickets}, + schema::{drivers, issued_tickets, tickets}, }; use common::CommonTicket; use diesel::prelude::*; @@ -15,20 +15,19 @@ pub fn create_ticket(connection: &mut PgConnection, ticket: NewTicket) { pub fn get_tickets(connection: &mut PgConnection, driver_id: i32) -> Vec { //Chonky join function for the sake of my life :)) - let join = tickets::table - .left_join( - issued_tickets::table.on(tickets::id - .eq(issued_tickets::ticket) - .and(issued_tickets::driver.eq(driver_id))), - ) - .select(( - tickets::id, - tickets::category, - tickets::description, - tickets::issue_date, //only selecting the ticket tho :D - )) - .filter(tickets::id.eq(driver_id)); - let tickets_by_driver = join.load::(connection).expect("oh no!"); + let join = tickets::table.left_join( + issued_tickets::table.on(tickets::id + .eq(issued_tickets::ticket) + .and(issued_tickets::driver.eq(driver_id))), + ); + let queried_tickets = join.filter(issued_tickets::driver.eq(driver_id)); + let queried_tickets = join.select(( + tickets::id, + tickets::category, + tickets::description, + tickets::issue_date, + )); //only selecting the ticket tho :D + let tickets_by_driver = queried_tickets.load::(connection).expect("oh no!"); let common_ticket_output = tickets_by_driver .iter() .map(|ticket| CommonTicket {