From 061ff570a68045ca74bb3a2106429a48c0173cdc Mon Sep 17 00:00:00 2001 From: linlyboi Date: Tue, 19 Dec 2023 13:22:14 +0200 Subject: [PATCH] Post added, new service, commented out id --- src/arrivals.rs | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/src/arrivals.rs b/src/arrivals.rs index f5cd926..1dc10ea 100644 --- a/src/arrivals.rs +++ b/src/arrivals.rs @@ -1,30 +1,34 @@ -use actix_web::{get, web, HttpResponse, Responder}; +use actix_web::{get, web, HttpResponse, Responder, post}; pub fn init_arrivals_scope() -> actix_web::Scope { let scope = web::scope("/arrivals") .service(show_arrivals) - .service(show_specific); + .service(show_specific) + .service(insert_arrival); scope } use chrono::NaiveTime; use serde::{Deserialize, Serialize}; #[derive(Serialize, Deserialize, Debug)] pub struct Arrival { - a_id: i32, + // a_id: i32, time_of_day: NaiveTime, week_day: i32, tram_line: i32, direction: bool, } -use sqlx::{PgPool, query_as}; +use sqlx::{query, query_as, PgPool}; use web::Data; #[get("all")] async fn show_arrivals(db_pool: Data) -> impl Responder { - let arrivals = query_as!(Arrival, r#"SELECT * FROM arrivals"#) - .fetch_all(db_pool.get_ref()) - .await - .expect("Could not fetch arrivals"); + let arrivals = query_as!( + Arrival, + r#"SELECT time_of_day,week_day,tram_line,direction FROM arrivals"# + ) + .fetch_all(db_pool.get_ref()) + .await + .expect("Could not fetch arrivals"); dbg!(&arrivals); HttpResponse::Ok() .content_type("application/json") @@ -41,7 +45,7 @@ async fn show_specific(db_pool: Data, filter: web::Query) //Le query let arrivals = query_as!( Arrival, - "SELECT * FROM arrivals WHERE tram_line = $1 AND week_day = $2", + "SELECT time_of_day,week_day,tram_line,direction FROM arrivals WHERE tram_line = $1 AND week_day = $2", filter.tram_line, filter.week_day )