diff --git a/src/api.rs b/src/api.rs index 3d99df9..4c36ef2 100644 --- a/src/api.rs +++ b/src/api.rs @@ -12,21 +12,31 @@ use common::{CommonAdmin, CommonDriver, CommonTicket}; #[get("api/ticket/{id}")] async fn api_ticket(id: web::Path) -> impl Responder { let fetched_ticket_data = get_ticket(&mut establish_connection(), *id); - //return struct as string - HttpResponse::Ok().body(format!("{:?}", fetched_ticket_data)) + //return struct values as string + HttpResponse::Ok().body(format!( + "Ticket ID: {}, Ticket Price: {}, Ticket Status: {}", + fetched_ticket_data.id, fetched_ticket_data.category, fetched_ticket_data.description + )) } // Getting admin data or smth idk #[get("api/admin/{id}")] async fn api_admin(id: web::Path) -> impl Responder { let fetched_admin_data = get_admin(&mut establish_connection(), *id); - HttpResponse::Ok().body(format!("{:?}", fetched_admin_data)) + //return struct values as string + HttpResponse::Ok().body(format!( + "Admin ID: {}, Admin Name: {}, Admin Email: {}", + fetched_admin_data.id, fetched_admin_data.name, fetched_admin_data.address + )) } #[get("api/driver/{id}")] async fn api_driver(id: web::Path) -> impl Responder { let fetched_driver_data = get_driver(&mut establish_connection(), *id); - HttpResponse::Ok().body(format!("{:?}", fetched_driver_data)) + HttpResponse::Ok().body(format!( + "Driver ID: {}, Driver Name: {}, Driver Email: {}", + fetched_driver_data.id, fetched_driver_data.name, fetched_driver_data.address + )) } #[get("api/test")] async fn api_test() -> impl Responder {