Refactor antennas endpoints
This commit is contained in:
@@ -1,10 +1,32 @@
|
||||
use diesel::prelude::*;
|
||||
use rocket::{http::Status, serde::json::Json, State};
|
||||
use rocket::{http::Status, serde::json::Json, Route, State};
|
||||
|
||||
use kairo_common::{postgres, schema::antennas, Antenna};
|
||||
|
||||
|
||||
|
||||
#[cfg(debug_assertions)]
|
||||
pub fn routes() -> Vec<Route> {
|
||||
routes![get_by_id, get_list, new, update, delete, purge]
|
||||
}
|
||||
|
||||
#[cfg(not(debug_assertions))]
|
||||
pub fn routes() -> Vec<Route> {
|
||||
routes![get_by_id, get_list, new, update, delete]
|
||||
}
|
||||
|
||||
fn notify_changes() {
|
||||
use kairo_common::mqtt::for_sync::MqttClient;
|
||||
|
||||
MqttClient::new(Some("antennas_mqtt_client"))
|
||||
.publish("antennas/refresh", None)
|
||||
.unwrap_or_else(|e| {
|
||||
println!("Unable to publish antennas update: {}", e);
|
||||
});
|
||||
}
|
||||
|
||||
#[rocket::get("/id/<id>")]
|
||||
pub fn get_by_id(db_pool: &State<postgres::DbPool>, id: String) -> Option<Json<Antenna>> {
|
||||
fn get_by_id(db_pool: &State<postgres::DbPool>, id: String) -> Option<Json<Antenna>> {
|
||||
let mut db = db_pool.get().unwrap();
|
||||
|
||||
let res = antennas::table
|
||||
@@ -19,7 +41,7 @@ pub fn get_by_id(db_pool: &State<postgres::DbPool>, id: String) -> Option<Json<A
|
||||
}
|
||||
|
||||
#[rocket::get("/")]
|
||||
pub fn get_list(db_pool: &State<postgres::DbPool>) -> Json<Vec<Antenna>> {
|
||||
fn get_list(db_pool: &State<postgres::DbPool>) -> Json<Vec<Antenna>> {
|
||||
let mut db = db_pool.get().unwrap();
|
||||
|
||||
let res = antennas::table
|
||||
@@ -33,7 +55,7 @@ pub fn get_list(db_pool: &State<postgres::DbPool>) -> Json<Vec<Antenna>> {
|
||||
}
|
||||
|
||||
#[rocket::post("/new", format = "json", data = "<antenna>")]
|
||||
pub fn new(db_pool: &State<postgres::DbPool>, antenna: Json<Antenna>) -> Status {
|
||||
fn new(db_pool: &State<postgres::DbPool>, antenna: Json<Antenna>) -> Status {
|
||||
let mut db = db_pool.get().unwrap();
|
||||
|
||||
let res = diesel::insert_into(antennas::table)
|
||||
@@ -41,13 +63,16 @@ pub fn new(db_pool: &State<postgres::DbPool>, antenna: Json<Antenna>) -> Status
|
||||
.execute(&mut db);
|
||||
|
||||
match res {
|
||||
Ok(_) => Status::Ok,
|
||||
Ok(_) => {
|
||||
notify_changes();
|
||||
Status::Ok
|
||||
}
|
||||
_ => Status::NotAcceptable,
|
||||
}
|
||||
}
|
||||
|
||||
#[rocket::patch("/update", format = "json", data = "<antenna>")]
|
||||
pub fn update(db_pool: &State<postgres::DbPool>, antenna: Json<Antenna>) -> Status {
|
||||
fn update(db_pool: &State<postgres::DbPool>, antenna: Json<Antenna>) -> Status {
|
||||
let mut db = db_pool.get().unwrap();
|
||||
|
||||
let res = diesel::update(antennas::table)
|
||||
@@ -57,13 +82,16 @@ pub fn update(db_pool: &State<postgres::DbPool>, antenna: Json<Antenna>) -> Stat
|
||||
|
||||
match res {
|
||||
Ok(0) => Status::NotModified,
|
||||
Ok(1) => Status::Ok,
|
||||
Ok(1) => {
|
||||
notify_changes();
|
||||
Status::Ok
|
||||
}
|
||||
_ => Status::BadRequest,
|
||||
}
|
||||
}
|
||||
|
||||
#[rocket::delete("/delete/<id>")]
|
||||
pub fn delete(db_pool: &State<postgres::DbPool>, id: String) -> Status {
|
||||
fn delete(db_pool: &State<postgres::DbPool>, id: String) -> Status {
|
||||
let mut db = db_pool.get().unwrap();
|
||||
|
||||
let res = diesel::delete(antennas::table)
|
||||
@@ -71,7 +99,26 @@ pub fn delete(db_pool: &State<postgres::DbPool>, id: String) -> Status {
|
||||
.execute(&mut db);
|
||||
|
||||
match res {
|
||||
Ok(1) => Status::Ok,
|
||||
Ok(1) => {
|
||||
notify_changes();
|
||||
Status::Ok
|
||||
}
|
||||
_ => Status::BadRequest,
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(debug_assertions)]
|
||||
#[rocket::delete("/purge")]
|
||||
fn purge(db_pool: &State<postgres::DbPool>) -> Status {
|
||||
let mut db = db_pool.get().unwrap();
|
||||
|
||||
let res = diesel::delete(antennas::table).execute(&mut db);
|
||||
|
||||
match res {
|
||||
Ok(1) => {
|
||||
notify_changes();
|
||||
Status::Ok
|
||||
}
|
||||
_ => Status::BadRequest,
|
||||
}
|
||||
}
|
||||
|
||||
@@ -23,9 +23,5 @@ fn rocket() -> _ {
|
||||
rocket::build()
|
||||
.manage(postgres::init_pool())
|
||||
.mount("/static", routes![serve_file])
|
||||
.mount("/antennas/", routes![antennas::get_by_id])
|
||||
.mount("/antennas/", routes![antennas::get_list])
|
||||
.mount("/antennas/", routes![antennas::delete])
|
||||
.mount("/antennas/", routes![antennas::update])
|
||||
.mount("/antennas/", routes![antennas::new])
|
||||
.mount("/antennas", antennas::routes())
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user