Finished values and telemetry

src/main.rs

@@ -1,7 +1,7 @@
-use actix_web::{post, web, App, HttpServer, Responder, http::StatusCode, HttpResponse, get};
+use crate::schemas::{TelemetryMessageFromDevice, ValueMessageFromDevice};
+use actix_web::{get, http::StatusCode, post, web, App, HttpResponse, HttpServer, Responder};
 use database::Database;
-use log::{info, error, debug};
-use crate::schemas::TelemetryMessageFromDevice;
+use log::{debug, error, info};
 
 mod database;
 mod schemas;
@@ -14,18 +14,18 @@ struct AppState {
 async fn receive_telemetry(
     device_id: web::Path<String>,
     data: web::Data<AppState>,
-    telemetry_message: web::Json<TelemetryMessageFromDevice>
+    telemetry_message: web::Json<TelemetryMessageFromDevice>,
 ) -> impl Responder {
     info!("POST - telementry - Processing device id {}", device_id);
-    match data.db.create_device_if_not_exists(&device_id).await{
-        Ok(_) => {},
+    match data.db.create_device_if_not_exists(&device_id).await {
+        Ok(_) => {}
         Err(e) => {
             error!("Error creating new device: {}", e);
             return HttpResponse::InternalServerError();
         }
     };
 
-    match data.db.add_telemetry(&telemetry_message, &device_id).await{
+    match data.db.add_telemetry(&telemetry_message, &device_id).await {
         Ok(_) => HttpResponse::Created(),
         Err(e) => {
             error!("adding Telemetry message to DB failed \n{}", e);
@@ -35,22 +35,53 @@ async fn receive_telemetry(
 }
 
 #[get("/telemetry/{device_id}")]
-async fn get_telemetry(
-    device_id: web::Path<String>,
-    data: web::Data<AppState>
-) -> impl Responder {
+async fn get_telemetry(device_id: web::Path<String>, data: web::Data<AppState>) -> impl Responder {
     info!("GET - telementry - Processing device id {}", device_id);
-    let messages = match data.db.get_telemetry_for_id(&device_id).await{
+    let messages = match data.db.get_telemetry_for_id(&device_id).await {
         Ok(msgs) => msgs,
         Err(e) => {
             error!("Getting Telemetry Messages from DB failed \n{}", e);
-            return HttpResponse::InternalServerError().finish()
+            return HttpResponse::InternalServerError().finish();
+        }
+    };
+    HttpResponse::Ok().json(messages)
+}
+
+#[post("/value/{device_id}")]
+async fn receive_value(
+    device_id: web::Path<String>,
+    data: web::Data<AppState>,
+    value_message: web::Json<ValueMessageFromDevice>,
+) -> impl Responder {
+    info!("POST - value - Processing device id {}", device_id);
+    match data.db.create_device_if_not_exists(&device_id).await {
+        Ok(_) => {}
+        Err(e) => {
+            error!("Error creating new device: {}", e);
+            return HttpResponse::InternalServerError();
         }
     };
 
+    match data.db.add_value(&value_message, &device_id).await {
+        Ok(_) => HttpResponse::Created(),
+        Err(e) => {
+            error!("adding Telemetry message to DB failed \n{}", e);
+            HttpResponse::InternalServerError()
+        }
+    }
+}
 
+#[get("/value/{device_id}")]
+async fn get_value(device_id: web::Path<String>, data: web::Data<AppState>) -> impl Responder {
+    info!("GET - value - Processing device id {}", device_id);
+    let messages = match data.db.get_values_for_id(&device_id).await {
+        Ok(msgs) => msgs,
+        Err(e) => {
+            error!("Getting Values from DB failed \n{}", e);
+            return HttpResponse::InternalServerError().finish();
+        }
+    };
     HttpResponse::Ok().json(messages)
-    
 }
 
 #[actix_web::main]
@@ -67,6 +98,8 @@ async fn main() -> std::io::Result<()> {
             .app_data(web::Data::new(AppState { db: db.clone() }))
             .service(receive_telemetry)
             .service(get_telemetry)
+            .service(receive_value)
+            .service(get_value)
     })
     .bind(("127.0.0.1", 8080))?
     .run()