Refactor Mqtt Sync client (#5)

Co-authored-by: Felipe Diniello <felipediniello@pm.me>
Reviewed-on: #5

kairo-common/src/lib.rs

@@ -34,7 +34,6 @@ mod models {
 pub type DeviceReport = models::DeviceReport;
 
 pub type Antenna = models::antenna::Antenna;
-pub type NewAntenna<'a> = models::antenna::NewAntenna<'a>;
 
 pub type KnownPosition = models::known_position::KnownPosition;
 pub type DynamicDeviceStatus = models::dynamic_device_status::DynamicDeviceStatus;

kairo-common/src/models/antenna.rs

@@ -3,7 +3,16 @@ use std::f64::consts::PI;
 
 use crate::{unit_conversion::UnitsConversion, Point};
 
-#[derive(Debug, Clone, Default, Queryable, Selectable, serde::Serialize, serde::Deserialize)]
+#[derive(
+    Debug,
+    Clone,
+    Queryable,
+    Selectable,
+    Insertable,
+    AsChangeset,
+    serde::Serialize,
+    serde::Deserialize,
+)]
 #[diesel(check_for_backend(diesel::pg::Pg))]
 #[diesel(table_name = crate::schema::antennas)]
 pub struct Antenna {
@@ -15,17 +24,6 @@ pub struct Antenna {
     pub comment: Option<String>,
 }
 
-#[derive(Debug, Clone, Copy, Insertable, AsChangeset, serde::Deserialize)]
-#[diesel(table_name = crate::schema::antennas)]
-pub struct NewAntenna<'a> {
-    pub id: &'a str,
-    pub tssi: f64,
-    pub pos_x: f64,
-    pub pos_y: f64,
-    pub pos_z: f64,
-    pub comment: Option<&'a str>,
-}
-
 impl Antenna {
     const C: f64 = 2.99e8;
     const F: f64 = 2.4e9;

kairo-common/src/mqtt.rs

@@ -62,39 +62,51 @@ pub mod for_sync {
     use paho_mqtt as mqtt;
     use std::{process, time::Duration};
 
-    pub fn get_mqtt_cli() -> mqtt::Client {
-        let host = dotenv::var("MQTT_BROKER").unwrap_or_else(|_| {
+    pub struct MqttClient {
+        cli: mqtt::Client,
+    }
+
+    impl MqttClient {
+        pub fn new(client_id: Option<&str>) -> MqttClient {
+            let host = dotenv::var("MQTT_BROKER").unwrap_or_else(|_| {
             println! {"MQTT_BROKER not found in .evn file, using default: tcp://localhost:1883"};
             "tcp://localhost:1883".to_string()
         });
 
-        let mut cli = mqtt::Client::new(host).unwrap_or_else(|e| {
-            println!("Error creating the client: {:?}", e);
-            process::exit(1);
-        });
+            let mut cli = if let Some(client_id) = client_id {
+                mqtt::Client::new((host, String::from(client_id))).unwrap_or_else(|e| {
+                    println!("Error creating the client: {:?}", e);
+                    process::exit(1);
+                })
+            } else {
+                mqtt::Client::new(host).unwrap_or_else(|e| {
+                    println!("Error creating the client: {:?}", e);
+                    process::exit(1);
+                })
+            };
 
-        // Use 5sec timeouts for sync calls.
-        cli.set_timeout(Duration::from_secs(5));
+            // Use 5sec timeouts for sync calls.
+            cli.set_timeout(Duration::from_secs(5));
 
-        // Connect and wait for it to complete or fail
-        if let Err(e) = cli.connect(None) {
-            println!("Unable to connect: {:?}", e);
-            process::exit(1);
+            // Connect and wait for it to complete or fail
+            if let Err(e) = cli.connect(None) {
+                println!("Unable to connect: {:?}", e);
+                process::exit(1);
+            }
+
+            MqttClient { cli }
+        }
+        pub fn publish(&self, topic: &str, payload: Option<&str>) -> Result<(), paho_mqtt::Error> {
+            let msg = if let Some(payload) = payload {
+                mqtt::MessageBuilder::new()
+                    .topic(topic)
+                    .qos(0)
+                    .payload(payload)
+                    .finalize()
+            } else {
+                mqtt::MessageBuilder::new().topic(topic).qos(0).finalize()
+            };
+            self.cli.publish(msg)
         }
-        cli
-    }
-
-    pub fn mqtt_pub(
-        client: &mqtt::Client,
-        topic: &str,
-        payload: &str,
-    ) -> Result<(), paho_mqtt::Error> {
-        let msg = mqtt::MessageBuilder::new()
-            .topic(topic)
-            .payload(payload)
-            .qos(0)
-            .finalize();
-
-        client.publish(msg)
     }
 }

kairo-core/src/antennas.rs

@@ -1,7 +1,7 @@
 use diesel::prelude::*;
 use rocket::{http::Status, serde::json::Json, State};
 
-use kairo_common::{postgres, schema::antennas, Antenna, NewAntenna};
+use kairo_common::{postgres, schema::antennas, Antenna};
 
 #[rocket::get("/id/<id>")]
 pub fn get_by_id(db_pool: &State<postgres::DbPool>, id: String) -> Option<Json<Antenna>> {
@@ -33,11 +33,11 @@ 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<NewAntenna<'_>>) -> Status {
+pub 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)
-        .values(*antenna)
+        .values(antenna.0)
         .execute(&mut db);
 
     match res {
@@ -47,12 +47,12 @@ pub fn new(db_pool: &State<postgres::DbPool>, antenna: Json<NewAntenna<'_>>) ->
 }
 
 #[rocket::patch("/update", format = "json", data = "<antenna>")]
-pub fn update(db_pool: &State<postgres::DbPool>, antenna: Json<NewAntenna<'_>>) -> Status {
+pub fn update(db_pool: &State<postgres::DbPool>, antenna: Json<Antenna>) -> Status {
     let mut db = db_pool.get().unwrap();
 
     let res = diesel::update(antennas::table)
-        .filter(antennas::id.eq(antenna.id))
-        .set(*antenna)
+        .filter(antennas::id.eq(antenna.id.clone()))
+        .set(antenna.0)
         .execute(&mut db);
 
     match res {
@@ -61,3 +61,17 @@ pub fn update(db_pool: &State<postgres::DbPool>, antenna: Json<NewAntenna<'_>>)
         _ => Status::BadRequest,
     }
 }
+
+#[rocket::delete("/delete/<id>")]
+pub 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) )
+        .execute(&mut db);
+
+    match res {
+        Ok(1) => Status::Ok,
+        _ => Status::BadRequest,
+    }
+}

kairo-core/src/main.rs

@@ -25,6 +25,7 @@ fn rocket() -> _ {
         .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])
 }

simulation-tools/src/nav_dev/main.rs

@@ -3,7 +3,7 @@ use std::{thread, time};
 
 mod error_report;
 
-use kairo_common::mqtt::for_sync::{get_mqtt_cli, mqtt_pub};
+use kairo_common::mqtt::for_sync::MqttClient;
 use kairo_common::{Antenna, BeaconMeasure, DeviceReport, Point};
 
 #[derive(Clone)]
@@ -29,7 +29,7 @@ async fn main() {
     //     });
     // }
 
-    let client = get_mqtt_cli();
+    let client = MqttClient::new(None);
 
     let mut position = Point::new(config.radius, 0.0);
 
@@ -57,7 +57,9 @@ async fn main() {
                 .push(BeaconMeasure::new(&config.id, &ant.id, rssi + noise));
         }
         let payload = serde_json::to_string(&report).unwrap_or_else(|_| "".to_string());
-        mqtt_pub(&client, topic.as_str(), payload.as_str()).expect("Pub error");
+        client
+            .publish(topic.as_str(), Some(payload.as_str()))
+            .expect("Pub error");
 
         // if config.real {
         //     let _r = KnownPosition::new(position).write_for("real").await;