2 files changed, 19 insertions, 10 deletions

diff --git a/src/routes/start.rs b/src/routes/start.rs
index 401ae97..1555db3 100644
--- a/src/routes/start.rs
+++ b/src/routes/start.rs
@@ -42,9 +42,20 @@ pub async fn start(State(state): State<Arc<crate::AppState>>, headers: HeaderMap
         )?;
         let dev_id = device.id.clone();
         let uuid = if payload.ping.is_some_and(|ping| ping) {
-            let uuid_gen = Uuid::new_v4().to_string();
+            let mut uuid: Option<String> = None;
+            for (key, value) in state.ping_map.clone() {
+                if value.ip == device.ip {
+                    debug!("service already exists");
+                    uuid = Some(key);
+                    break;
+                }
+            };
+            let uuid_gen = match uuid {
+                Some(u) => u,
+                None => Uuid::new_v4().to_string(),
+            };
             let uuid_genc = uuid_gen.clone();
-            // TODO: Check if service already runs
+
             tokio::spawn(async move {
                 debug!("init ping service");
                 state.ping_map.insert(uuid_gen.clone(), PingValue { ip: device.ip.clone(), online: false });
diff --git a/src/services/ping.rs b/src/services/ping.rs
index 2bff61f..c3bdced 100644
--- a/src/services/ping.rs
+++ b/src/services/ping.rs
@@ -104,15 +104,13 @@ pub async fn status_websocket(mut socket: WebSocket, state: Arc<AppState>) {
 async fn get_eta(db: &PgPool) -> i64 {
     let query = sqlx::query!(
         r#"SELECT times FROM devices;"#
-    ).fetch_optional(db).await.unwrap();
+    ).fetch_one(db).await.unwrap();
 
-    match query {
-        None => { -1 },
-        Some(rec) => {
-            let times = rec.times.unwrap();
-            times.iter().sum::<i64>() / times.len() as i64
-        }
-    }
+    let times = match query.times {
+        None => { vec![0] },
+        Some(t) => t,
+    };
+    times.iter().sum::<i64>() / times.len() as i64
 
 }