Alingment

src/core/data.rs

@@ -1,11 +1,12 @@
-use crate::core::models::{UnifiedData, UnifiedMonitorData};
+use crate::core::models::{UnifiedData, UnifiedGroupData, UnifiedMonitorData};
 use crate::data::heartbeat::model::HeartbeatResponse;
 use crate::data::status_page::model::StatusPageResponse;
 
 pub fn unify_data(status_page: &StatusPageResponse, heartbeat: &HeartbeatResponse) -> UnifiedData {
-    let mut monitors = Vec::new();
+    let mut groups = Vec::new();
 
     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();
 
@@ -22,14 +23,21 @@ pub fn unify_data(status_page: &StatusPageResponse, heartbeat: &HeartbeatRespons
                 uptime_data,
             });
         }
+
+        monitors.sort_by_key(|m| m.monitor_info.name.clone());
+
+        groups.push(UnifiedGroupData {
+            group_info: group.clone(),
+            monitors,
+        });
     }
 
-    monitors.sort_by_key(|m| m.monitor_info.id);
+    groups.sort_by_key(|g| g.group_info.weight);
 
     UnifiedData {
         title: status_page.config.title.clone(),
         description: status_page.config.description.clone(),
-        monitors,
-        audo_refresh_interval: status_page.config.auto_refresh_interval,
+        groups,
+        auto_refresh_interval: status_page.config.auto_refresh_interval,
     }
 }

src/core/models.rs

@@ -1,5 +1,5 @@
 use crate::data::heartbeat::model::{HeartbeatEntry, UptimeData};
-use crate::data::status_page::model::MonitorInfo;
+use crate::data::status_page::model::{MonitorInfo, StatusPageGroup};
 
 #[derive(Debug, Clone)]
 pub struct UnifiedMonitorData {
@@ -12,6 +12,12 @@ pub struct UnifiedMonitorData {
 pub struct UnifiedData {
     pub title: String,
     pub description: Option<String>,
-    pub monitors: Vec<UnifiedMonitorData>,
-    pub audo_refresh_interval: u32,
+    pub auto_refresh_interval: u32,
+    pub groups: Vec<UnifiedGroupData>,
+}
+
+#[derive(Debug, Clone)]
+pub struct UnifiedGroupData {
+    pub group_info: StatusPageGroup,
+    pub monitors: Vec<UnifiedMonitorData>,
 }