Refactoring

src/twilio/api/mod.rs

@@ -22,7 +22,6 @@ pub async fn send_message(
     } else if config.auth_token.is_empty() {
         Err(std::io::Error::other(" Auth token is empty"))
     } else {
-        let now = time::OffsetDateTime::now_utc();
         match reqwest::Client::builder().build() {
             Ok(client) => {
                 let mut headers = reqwest::header::HeaderMap::new();
@@ -34,27 +33,7 @@ pub async fn send_message(
                 let auth = generate_auth(config).unwrap();
                 headers.insert("Authorization", auth.parse().unwrap());
 
-                let mut params = std::collections::HashMap::new();
+                let params = init_params(contact, msg, config, param);
-                params.insert("To", contact.phone_number.as_str());
-                params.insert("ProvideFeedback", "true");
-                params.insert("ForceDelivery", "false");
-                params.insert("ContentRetention", "retain");
-                params.insert("AddressRetention", "obfuscate");
-                params.insert("SmartEncoded", "true");
-                params.insert("ShortenUrls", "true");
-                let date = match param.schedule_at {
-                    Some(date_value) => date_value.to_string(),
-                    None => String::new(),
-                };
-                if param.schedule && is_scheduleable(&Some(now), &param.schedule_at) {
-                    params.insert("ScheduleType", "fixed");
-                    params.insert("SendAt", date.as_str());
-                }
-                params.insert("SendAsMms", "true");
-                params.insert("RiskCheck", "enable");
-                params.insert("From", config.phone_number.as_str());
-                params.insert("MessagingServiceSid", config.service_sid.as_str());
-                params.insert("Body", msg.content.as_str());
 
                 let url = format!(
                     "https://api.twilio.com/2010-04-01/Accounts/{}/Messages.json",
@@ -77,15 +56,30 @@ pub async fn send_message(
     }
 }
 
-fn generate_auth(
+fn init_params(contact: &textsender_models::contact::Contact, message: &textsender_models::message::Message, config: &textsender_models::config::auxiliary::TwilioConfig, param: &crate::twilio::types::Parameters) -> std::collections::HashMap<String, String> {
-    config: &textsender_models::config::auxiliary::TwilioConfig,
+        let now = time::OffsetDateTime::now_utc();
-) -> Result<String, base64_ng::EncodeError> {
+                let mut params = std::collections::HashMap::new();
-    let input = format!("{}:{}", config.account_sid, config.auth_token);
+                params.insert(String::from("To"), contact.phone_number.clone());
-    match base64_ng::encode(input.as_bytes()) {
+                params.insert(String::from("ProvideFeedback"), String::from("true"));
-        Ok(encoded) => Ok(format!("Basic {encoded}")),
+                params.insert(String::from("ForceDelivery"), String::from("false"));
-        Err(err) => Err(err),
+                params.insert(String::from("ContentRetention"), String::from("retain"));
-    }
+                params.insert(String::from("AddressRetention"), String::from("obfuscate"));
-}
+                params.insert(String::from("SmartEncoded"), String::from("true"));
+                params.insert(String::from("ShortenUrls"), String::from("true"));
+                let date = match param.schedule_at {
+                    Some(date_value) => date_value.to_string(),
+                    None => String::new(),
+                };
+                if param.schedule && is_scheduleable(&Some(now), &param.schedule_at) {
+                    params.insert(String::from("ScheduleType"), String::from("fixed"));
+                    params.insert(String::from("SendAt"), date);
+                }
+                params.insert(String::from("SendAsMms"), String::from("true"));
+                params.insert(String::from("RiskCheck"), String::from("enable"));
+                params.insert(String::from("From"), config.phone_number.clone());
+                params.insert(String::from("MessagingServiceSid"), config.service_sid.clone());
+                params.insert(String::from("Body"), message.content.clone());
+
 /*
     let mut params = std::collections::HashMap::new();
     params.insert("StatusCallback", "http://OjQozHznkhNTTR.vpnrM1zdXFuiQ");
@@ -104,6 +98,19 @@ fn generate_auth(
     params.insert("RiskCheck", "enable");
 */
 
+                params
+}
+
+fn generate_auth(
+    config: &textsender_models::config::auxiliary::TwilioConfig,
+) -> Result<String, base64_ng::EncodeError> {
+    let input = format!("{}:{}", config.account_sid, config.auth_token);
+    match base64_ng::encode(input.as_bytes()) {
+        Ok(encoded) => Ok(format!("Basic {encoded}")),
+        Err(err) => Err(err),
+    }
+}
+
 const DEFAULT_SCHEDULING_SECONDS: i64 = 300;
 
 fn is_scheduleable(