make value Optional

src/core/mod.rs

@@ -58,7 +58,7 @@ pub async fn webhook_core(data: Json<MsgFromFb>, state: &State<AppState>) -> &'s
                     .get(payload.get_action().as_str())
                 {
                     action_fn
-                        .execute(user_id, payload.get_value(), user_conn)
+                        .execute(user_id, &payload.get_value(), user_conn)
                         .await;
                 }
             }

src/response_models/payload.rs

@@ -1,38 +1,31 @@
 use url::form_urlencoded;
 
-#[derive(Debug, Clone, PartialEq)]
+#[derive(Debug, Default, Clone, PartialEq)]
 pub struct Payload {
     action: String,
-    key: String,
-    value: String,
+    value: Option<String>,
 }
 
 impl Payload {
-    pub fn new(action: &str, key: &str, value: &str) -> Self {
+    pub fn new(action: &str, value: Option<String>) -> Self {
         Self {
             action: action.into(),
-            key: key.into(),
-            value: value.into(),
+            value,
         }
     }
 
     pub fn get_action(&self) -> &String {
         &self.action
     }
 
-    pub fn get_key(&self) -> &String {
-        &self.key
-    }
-
-    pub fn get_value(&self) -> &String {
-        &self.value
+    pub fn get_value(&self) -> String {
+        self.value.clone().unwrap_or("none".to_string())
     }
 
     pub fn to_uri_string(&self) -> String {
         form_urlencoded::Serializer::new(String::new())
             .append_pair("action", self.get_action())
-            .append_pair("key", self.get_key())
-            .append_pair("value", self.get_value())
+            .append_pair("value", &self.get_value())
             .finish()
     }
 
@@ -42,20 +35,18 @@ impl Payload {
             .collect();
 
         let mut action = None;
-        let mut key = None;
         let mut value = None;
 
         for (name, val) in parsed {
             match &name[..] {
                 "action" => action = Some(val),
-                "key" => key = Some(val),
                 "value" => value = Some(val),
                 _ => return Err(format!("Unknown field in URI: {}", name)),
             }
         }
 
-        match (action, key, value) {
-            (Some(action), Some(key), Some(value)) => Ok(Self::new(&action, &key, &value)),
+        match (action, value) {
+            (Some(action), Some(value)) => Ok(Self::new(&action, Some(value))),
             _ => Err("Missing fields in URI".to_string()),
         }
     }