added get telemetry

This commit is contained in:
2023-09-18 20:40:20 +00:00
parent fa029e838a
commit cd0581973d
6 changed files with 66 additions and 18 deletions

View File

@@ -1,10 +1,10 @@
use actix_web::{cookie::time::error, web};
use log::{error, info};
use sqlx::{pool, postgres::PgPoolOptions, query, PgPool, Pool, Postgres, migrate};
use sqlx::{pool, postgres::PgPoolOptions, query, PgPool, Pool, Postgres, migrate, query_as};
use thiserror::Error;
use chrono::Utc;
use crate::schemas::TelemetryMessage;
use crate::schemas::{TelemetryMessage, TelemetryMessageFromDevice};
#[derive(Clone)]
pub struct Database {
@@ -78,13 +78,25 @@ impl Database {
}
}
pub async fn add_telemetry(&self, msg: &web::Json<TelemetryMessage>, device_id: &str) -> Result<(), DatabaseError> {
pub async fn add_telemetry(&self, msg: &web::Json<TelemetryMessageFromDevice>, device_id: &str) -> Result<(), DatabaseError> {
info!("Adding telemetry message to DB");
let current_timestamp = Utc::now().naive_utc();
query!("INSERT INTO Telemetry (timestamp, software_version, voltage, temperature, uptime, device_id)
VALUES ($1, $2, $3, $4, $5, $6);",
current_timestamp, msg.version, msg.voltage, msg.temperature, msg.uptime, device_id
current_timestamp, msg.software_version, msg.voltage, msg.temperature, msg.uptime, device_id
).execute(&self.conn_pool).await?;
Ok(())
}
pub async fn get_telemetry_for_id(&self, device_id: &str) -> Result<Vec<TelemetryMessage>, DatabaseError> {
info!("Getting telemetry messages for {} from DB", &device_id);
let messages = query_as!(TelemetryMessage,
"SELECT timestamp, software_version, voltage, temperature, uptime
FROM Telemetry
WHERE device_id = $1 ORDER BY timestamp DESC;", &device_id)
.fetch_all(&self.conn_pool).await?;
Ok(messages)
}
}