suggestions by Clippy

kairo-common/src/unit_conversion.rs

@@ -10,15 +10,19 @@ pub trait UnitsConversion {
 }
 
 impl UnitsConversion for f64 {
+    #[allow(non_snake_case)]
     fn dBm_to_W(&self) -> f64 {
         10.0_f64.powf((self - 30.0) / 10.0)
     }
+    #[allow(non_snake_case)]
     fn W_to_dBm(&self) -> f64 {
         30.0 + 10.0 * f64::log10(*self)
     }
+    #[allow(non_snake_case)]
     fn from_dB(&self) -> f64 {
         10.0_f64.powf((*self) / 10.0)
     }
+    #[allow(non_snake_case)]
     fn to_dB(&self) -> f64 {
         10.0 * f64::log10(*self)
     }

kairo-core/src/antennas.rs

@@ -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,21 +82,43 @@ 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)
-        .filter( antennas::id.eq(id) )
+        .filter(antennas::id.eq(id))
         .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,
     }
 }

kairo-core/src/main.rs

@@ -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())
 }

xyz-engine/src/position_solver.rs

@@ -95,7 +95,7 @@ pub async fn solve_for(device_id: MAC) -> Result<Point, ()> {
 fn trilat(a: &KnownDistance, b: &KnownDistance, c: &KnownDistance) -> Option<KnownDistance> {
     #![allow(non_snake_case)]
 
-    let points = vec![a.point, b.point, c.point];
+    let points = [a.point, b.point, c.point];
     for &p in points.iter() {
         if !p.is_valid() {
             return None;