Replaced attribues with json value.

dmackdev · Oct 14, 2023 · 4680d3a · 4680d3a
1 parent 8924755
commit 4680d3a
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 15 deletions.
diff --git a/pubsubman/src/app.rs b/pubsubman/src/app.rs
@@ -7,7 +7,6 @@ use pubsubman_backend::{
     model::{PubsubMessage, SubscriptionName, TopicName},
     Backend,
 };
-use serde_json::{Map, Value};
 use tokio::sync::mpsc::{Receiver, Sender};
 
 use crate::{
@@ -269,19 +268,11 @@ impl App {
                                                         "selected_message_attributes_json_{}",
                                                         &message.id
                                                     ),
-                                                    &Value::Object(Map::from_iter(
-                                                        message.attributes.iter().map(|(k, v)| {
-                                                            (k.to_owned(), Value::String(v.clone()))
-                                                        }),
-                                                    )),
+                                                    &message.attributes_json,
                                                 )
                                                 .default_expand(egui_json_tree::DefaultExpand::All)
                                                 .response_callback(show_json_context_menu(
-                                                    &Value::Object(Map::from_iter(
-                                                        message.attributes.iter().map(|(k, v)| {
-                                                            (k.to_owned(), Value::String(v.clone()))
-                                                        }),
-                                                    )),
+                                                    &message.attributes_json,
                                                 ))
                                                 .show(ui);
                                             }

diff --git a/pubsubman_backend/src/model/pubsub_message.rs b/pubsubman_backend/src/model/pubsub_message.rs
@@ -1,15 +1,15 @@
 use chrono::{DateTime, TimeZone, Utc};
 use google_cloud_pubsub::subscriber::ReceivedMessage;
-use serde_json::Value;
-use std::{collections::HashMap, str};
+use serde_json::{Map, Value};
+use std::str;
 
 #[derive(Debug, Clone, serde::Deserialize, serde::Serialize)]
 pub struct PubsubMessage {
     pub id: String,
     pub publish_time: Option<DateTime<Utc>>,
     pub data: String,
     pub data_json: Value,
-    pub attributes: HashMap<String, String>,
+    pub attributes_json: Value,
 }
 
 impl From<ReceivedMessage> for PubsubMessage {
@@ -30,12 +30,20 @@ impl From<ReceivedMessage> for PubsubMessage {
             Err(_) => Value::String(data.clone()),
         };
 
+        let attributes_json = Value::Object(Map::from_iter(
+            value
+                .message
+                .attributes
+                .into_iter()
+                .map(|(k, v)| (k, Value::String(v))),
+        ));
+
         Self {
             id: value.message.message_id,
             publish_time,
             data,
             data_json,
-            attributes: value.message.attributes,
+            attributes_json,
         }
     }
 }