HasMap optimizationa

src/core/data.rs

@@ -1,21 +1,33 @@
+use std::collections::HashMap;
+
 use crate::core::models::{UnifiedData, UnifiedGroupData, UnifiedMonitorData};
-use crate::data::heartbeat::model::HeartbeatResponse;
+use crate::data::{
-use crate::data::status_page::model::StatusPageResponse;
+    heartbeat::model::{HeartbeatEntry, HeartbeatResponse, UptimeData},
+    status_page::model::StatusPageResponse,
+};
 
 pub fn unify_data(status_page: &StatusPageResponse, heartbeat: &HeartbeatResponse) -> UnifiedData {
     let mut groups = Vec::new();
+    let heartbeat_map: HashMap<u64, Vec<HeartbeatEntry>> = heartbeat
+        .monitors
+        .iter()
+        .map(|m| (m.monitor_id, m.heartbeats.clone()))
+        .collect();
+
+    let uptime_map: HashMap<(u64, u32), UptimeData> = heartbeat
+        .uptime_data
+        .iter()
+        .map(|u| ((u.monitor_id, u.period_hours), u.clone()))
+        .collect();
 
     for group in &status_page.public_group_list {
         let mut monitors = Vec::new();
         for monitor_info in &group.monitor_list {
-            let uptime_data = heartbeat.get_uptime(monitor_info.id, 24).cloned();
+            let uptime_data = uptime_map.get(&(monitor_info.id, 24)).cloned();
-
+            let heartbeats = heartbeat_map
-            let heartbeats = heartbeat
+                .get(&monitor_info.id)
-                .monitors
+                .cloned()
-                .iter()
+                .unwrap_or_default();
-                .find(|m| m.monitor_id == monitor_info.id)
-                .map(|m| m.heartbeats.clone())
-                .unwrap_or_else(Vec::new);
 
             monitors.push(UnifiedMonitorData {
                 monitor_info: monitor_info.clone(),

src/data/heartbeat/model.rs

@@ -93,10 +93,4 @@ impl HeartbeatResponse {
             .sort_by_key(|u| (u.monitor_id, u.period_hours));
         Ok(())
     }
-
-    pub fn get_uptime(&self, monitor_id: u64, period_hours: u32) -> Option<&UptimeData> {
-        self.uptime_data
-            .iter()
-            .find(|u| u.monitor_id == monitor_id && u.period_hours == period_hours)
-    }
 }