BOOM

src/main.rs

@@ -1,5 +1,7 @@
 pub mod api;
+pub mod shadowrealmapi;
 use crate::api::*;
+use crate::shadowrealmapi::*;
 pub(crate) use actix_web::{App, HttpServer};
 
 //Main function where all the api calls are
@@ -11,6 +13,9 @@ async fn main() -> std::io::Result<()> {
             .service(api_ticket)
             .service(api_admin)
             .service(api_driver)
+            .service(api_json_ticket)
+            .service(api_json_admin)
+            .service(api_json_driver)
             .service(api_test)
     })
     .bind(("0.0.0.0", 48590))?

src/shadowrealmapi.rs

@@ -1,20 +1,38 @@
-//Json goodies? NAHH
-//Ticket Table Services
-// #[get("api/ticket/{id}")]
-// async fn api_ticket(id: web::Path<i32>) -> Json<CommonTicket> {
-//     let fetched_ticket_data = get_ticket(&mut establish_connection(), *id);
-//     Json(fetched_ticket_data)
-// }
-//
-// // Getting admin data or smth idk
-// #[get("api/admin/{id}")]
-// async fn api_admin(id: web::Path<i32>) -> Json<CommonAdmin> {
-//     let fetched_admin_data = get_admin(&mut establish_connection(), *id);
-//     Json(fetched_admin_data)
-// }
-//
-// #[get("api/driver/{id}")]
-// async fn api_driver(id: web::Path<i32>) -> Json<CommonDriver> {
-//     let fetched_driver_data = get_driver(&mut establish_connection(), *id);
-//     Json(fetched_driver_data)
-// }
+use actix_web::{
+    get,
+    web::{self, Json},
+};
+use backend::{
+    admin_data::get_admin,
+    driver_data::get_driver,
+    establish_connection,
+    ticket_data::{get_ticket, get_tickets},
+};
+use common::{CommonAdmin, CommonDriver, CommonTicket};
+
+// Json goodies? NAHH
+// Ticket Table Services
+#[get("api/json/ticket/{id}")]
+async fn api_json_ticket(id: web::Path<i32>) -> Json<CommonTicket> {
+    let fetched_ticket_data = get_ticket(&mut establish_connection(), *id);
+    Json(fetched_ticket_data)
+}
+
+// Getting admin data or smth idk
+#[get("api/json/admin/{id}")]
+async fn api_json_admin(id: web::Path<i32>) -> Json<CommonAdmin> {
+    let fetched_admin_data = get_admin(&mut establish_connection(), *id);
+    Json(fetched_admin_data)
+}
+
+#[get("api/json/driver/{id}")]
+async fn api_json_driver(id: web::Path<i32>) -> Json<CommonDriver> {
+    let fetched_driver_data = get_driver(&mut establish_connection(), *id);
+    Json(fetched_driver_data)
+}
+
+#[get("api/json/tickets/{driver}")]
+async fn api_json_driver_tickets(id: web::Path<i32>) -> Json<Vec<CommonTicket>> {
+    let fetched_tickets = get_tickets(&mut establish_connection(), *id);
+    Json(fetched_tickets)
+}