Changed name of function

.gitea/workflows/workflow.yml

@@ -17,7 +17,6 @@ jobs:
       - uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
           toolchain: 1.95
-      - uses: Swatinem/rust-cache@v2
       - run: |
           mkdir -p ~/.ssh
           echo "${{ secrets.MYREPO_TOKEN }}" > ~/.ssh/textsender-models_deploy_key
@@ -37,7 +36,6 @@ jobs:
       - uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
           toolchain: 1.95
-      - uses: Swatinem/rust-cache@v2
       - run: |
           mkdir -p ~/.ssh
           echo "${{ secrets.MYREPO_TOKEN }}" > ~/.ssh/textsender-models_deploy_key
@@ -57,7 +55,6 @@ jobs:
       - uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
           toolchain: 1.95
-      - uses: Swatinem/rust-cache@v2
       - run: rustup component add rustfmt
       - run: |
           mkdir -p ~/.ssh
@@ -78,7 +75,6 @@ jobs:
       - uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
           toolchain: 1.95
-      - uses: Swatinem/rust-cache@v2
       - run: rustup component add clippy
       - run: |
           mkdir -p ~/.ssh
@@ -99,7 +95,6 @@ jobs:
       - uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
           toolchain: 1.95
-      - uses: Swatinem/rust-cache@v2
       - run: |
           mkdir -p ~/.ssh
           echo "${{ secrets.MYREPO_TOKEN }}" > ~/.ssh/textsender-models_deploy_key
@@ -110,3 +105,4 @@ jobs:
           ssh-add -v ~/.ssh/textsender-models_deploy_key
 
           cargo build
+

Cargo.lock

@@ -1573,7 +1573,7 @@ checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
 
 [[package]]
 name = "swoosh"
-version = "0.3.1"
+version = "0.3.0"
 dependencies = [
  "base64-ng",
  "const_format",
@@ -1658,12 +1658,13 @@ dependencies = [
 
 [[package]]
 name = "textsender_models"
-version = "0.3.0"
-source = "git+ssh://git@git.kundeng.us/phoenix/textsender-models.git?tag=v0.3.0#d504108745b7b97a02eac24e16763cdb5e731f2b"
+version = "0.2.5"
+source = "git+ssh://git@git.kundeng.us/phoenix/textsender-models.git?tag=v0.2.5-v0.3.0-migrate-38dbcb09f7-111#38dbcb09f7c2c572f429ec382c01e14b72b1d615"
 dependencies = [
  "const_format",
  "dotenvy",
  "josekit",
+ "rand 0.10.1",
  "serde",
  "serde_json",
  "time",

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "swoosh"
-version = "0.3.1"
+version = "0.3.0"
 edition = "2024"
 rust-version = "1.95"
 description = "Library to send text messages"
@@ -18,7 +18,7 @@ uuid = { version = "1.23.1", features = ["v4", "serde"] }
 base64-ng = { version = "1.0.6" }
 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.3.0" }
+textsender_models = { git = "ssh://git@git.kundeng.us/phoenix/textsender-models.git", tag = "v0.2.5-v0.3.0-migrate-38dbcb09f7-111" }
 
 [dev-dependencies]
 tempfile = { version = "3.27.0" }

src/twilio/api/mod.rs

@@ -2,8 +2,23 @@ pub mod types;
 
 pub async fn response_to_json(response: reqwest::Response) -> serde_json::Value {
     match response.json().await {
-        Ok(json_body) => json_body,
-        Err(_err) => serde_json::Value::Null,
+        Ok(json_body) => {
+            json_body
+            /*
+            let res = jsonBody.as_str();
+            match serde_json::from_str(res) {
+                Ok(converted) => {
+                    converted
+                }
+                Err(_err) => {
+                    serde_json::Value::Null
+                }
+            }
+            */
+        }
+        Err(_err) => {
+            serde_json::Value::Null
+        }
     }
 }
 
@@ -32,11 +47,17 @@ pub async fn send_mssage(
 
                 let mut params = std::collections::HashMap::new();
                 params.insert("To", contact.phone_number.as_str());
+                // 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");
                 let date = match param.schedule_at {
                     Some(date_value) => date_value.to_string(),
@@ -60,7 +81,7 @@ pub async fn send_mssage(
                 let request = client.post(url).headers(headers).form(&params);
                 match request.send().await {
                     Ok(response) => match response.status() {
-                        reqwest::StatusCode::CREATED => Ok(response),
+                        reqwest::StatusCode::OK => Ok(response),
                         status => Err(std::io::Error::other(format!(
                             "Unaccounted status: {status:?}"
                         ))),
@@ -98,9 +119,14 @@ fn generate_auth(
     params.insert("ShortenUrls", "true");
     params.insert("SendAsMms", "true");
     params.insert("RiskCheck", "enable");
-*/
 
-const DEFAULT_SCHEDULING_SECONDS: i64 = 300;
+    let response = request.send().await?;
+    let body = response.text().await?;
+    println!("{}", body);
+
+    Ok(())
+}
+*/
 
 fn is_scheduleable(
     now: &Option<time::OffsetDateTime>,
@@ -110,7 +136,7 @@ fn is_scheduleable(
         Some(schedule_at) => {
             let early = now
                 .unwrap()
-                .checked_add(time::Duration::seconds(DEFAULT_SCHEDULING_SECONDS))
+                .checked_add(time::Duration::seconds(300))
                 .unwrap();
             *schedule_at > early
         }