Removing print statement

Cargo.lock

@@ -2283,7 +2283,7 @@ checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
 
 [[package]]
 name = "swoosh"
-version = "0.4.1"
+version = "0.4.2"
 dependencies = [
  "base64-ng",
  "const_format",
@@ -2368,8 +2368,8 @@ dependencies = [
 
 [[package]]
 name = "textsender_models"
-version = "0.4.3"
-source = "git+ssh://git@git.kundeng.us/phoenix/textsender_models.git?tag=v0.4.3-29-384dd41690-111#384dd416902c88aa6c9c58bb5a9dfa04567ae455"
+version = "0.4.10"
+source = "git+ssh://git@git.kundeng.us/phoenix/textsender_models.git?tag=v0.4.10-29-6e91320709-111#6e91320709a369b525e911c51682a0d959a746dc"
 dependencies = [
  "const_format",
  "dotenvy",

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "swoosh"
-version = "0.4.1"
+version = "0.4.2"
 edition = "2024"
 rust-version = "1.96"
 description = "Library to send text messages"
@@ -18,7 +18,7 @@ uuid = { version = "1.23.3", features = ["v4", "serde"] }
 base64-ng = { version = "1.0.8" }
 const_format = { version = "0.2.36" }
 josekit = { version = "0.10.3" }
-textsender_models = { git = "ssh://git@git.kundeng.us/phoenix/textsender_models.git", tag = "v0.4.3-29-384dd41690-111", features = ["config", "contact", "message"] }
+textsender_models = { git = "ssh://git@git.kundeng.us/phoenix/textsender_models.git", tag = "v0.4.10-29-6e91320709-111", features = ["config", "contact", "message"] }
 
 [dev-dependencies]
 tempfile = { version = "3.27.0" }

src/twilio/api/mod.rs

@@ -1,5 +1,7 @@
 pub mod types;
 
+/// Converts the response into a json value
+/// That way you do not need to share swoosh's dependency
 pub async fn response_to_json(response: reqwest::Response) -> serde_json::Value {
     match response.json().await {
         Ok(json_body) => json_body,
@@ -14,7 +16,7 @@ pub use send_message as send_mssage;
 pub async fn send_message(
     msg: &textsender_models::message::Message,
     contact: &textsender_models::contact::Contact,
-    param: crate::twilio::types::Parameters,
+    param: &crate::twilio::types::Parameters,
     config: &textsender_models::config::auxiliary::TwilioConfig,
 ) -> Result<reqwest::Response, std::io::Error> {
     if config.account_sid.is_empty() {
@@ -22,7 +24,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 +35,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();
-                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 params = init_params(contact, msg, config, param);
 
                 let url = format!(
                     "https://api.twilio.com/2010-04-01/Accounts/{}/Messages.json",
@@ -77,6 +58,77 @@ pub async fn send_message(
     }
 }
 
+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> {
+    let now = time::OffsetDateTime::now_utc();
+    let mut params = std::collections::HashMap::new();
+    params.insert(String::from("To"), contact.phone_number.clone());
+    params.insert(String::from("ProvideFeedback"), String::from("true"));
+    params.insert(String::from("ForceDelivery"), String::from("false"));
+    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) => match convert_time_to_iso(date_value) {
+            Ok(converted) => converted,
+            Err(err) => {
+                eprintln!("Error: {err:?}");
+                String::new()
+            }
+        },
+        None => String::new(),
+    };
+    let scheduled_at = match param.schedule_at {
+        Some(s) => s,
+        None => time::OffsetDateTime::now_utc(),
+    };
+    if param.schedule && is_scheduleable(Some(&now), Some(&scheduled_at)) {
+        params.insert(String::from("ScheduleType"), String::from("fixed"));
+        params.insert(String::from("SendAt"), date.clone());
+    }
+    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");
+        params.insert("MaxPrice", "1");
+        params.insert("ProvideFeedback", "true");
+        params.insert("Attempt", "5");
+        params.insert("ValidityPeriod", "1537");
+        params.insert("ForceDelivery", "false");
+        params.insert("ContentRetention", "retain");
+        params.insert("AddressRetention", "obfuscate");
+        params.insert("SmartEncoded", "true");
+        params.insert("PersistentAction", "string");
+        params.insert("PersistentAction", "string");
+        params.insert("ShortenUrls", "true");
+        params.insert("SendAsMms", "true");
+        params.insert("RiskCheck", "enable");
+    */
+
+    params
+}
+
+fn convert_time_to_iso(time: time::OffsetDateTime) -> Result<String, time::error::Format> {
+    use time::format_description::well_known::Iso8601;
+    match time.format(&Iso8601::DEFAULT) {
+        Ok(converted) => Ok(converted),
+        Err(err) => Err(err),
+    }
+}
+
 fn generate_auth(
     config: &textsender_models::config::auxiliary::TwilioConfig,
 ) -> Result<String, base64_ng::EncodeError> {
@@ -86,29 +138,12 @@ fn generate_auth(
         Err(err) => Err(err),
     }
 }
-/*
-    let mut params = std::collections::HashMap::new();
-    params.insert("StatusCallback", "http://OjQozHznkhNTTR.vpnrM1zdXFuiQ");
-    params.insert("MaxPrice", "1");
-    params.insert("ProvideFeedback", "true");
-    params.insert("Attempt", "5");
-    params.insert("ValidityPeriod", "1537");
-    params.insert("ForceDelivery", "false");
-    params.insert("ContentRetention", "retain");
-    params.insert("AddressRetention", "obfuscate");
-    params.insert("SmartEncoded", "true");
-    params.insert("PersistentAction", "string");
-    params.insert("PersistentAction", "string");
-    params.insert("ShortenUrls", "true");
-    params.insert("SendAsMms", "true");
-    params.insert("RiskCheck", "enable");
-*/
 
 const DEFAULT_SCHEDULING_SECONDS: i64 = 300;
 
 fn is_scheduleable(
-    now: &Option<time::OffsetDateTime>,
-    scheduled: &Option<time::OffsetDateTime>,
+    now: Option<&time::OffsetDateTime>,
+    scheduled: Option<&time::OffsetDateTime>,
 ) -> bool {
     match scheduled {
         Some(schedule_at) => {