From fd3da4eba07ad3686215446f46f6962153bb1904 Mon Sep 17 00:00:00 2001 From: phoenix Date: Wed, 24 Jun 2026 22:28:38 -0400 Subject: [PATCH 1/5] Fixed function issue --- src/service/core.rs | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/src/service/core.rs b/src/service/core.rs index 9059578..b10166c 100644 --- a/src/service/core.rs +++ b/src/service/core.rs @@ -37,6 +37,25 @@ impl Service { println!("Can schedule"); + let events_req = super::event::Event { + app: self.app.clone(), + token: self.token.clone() + }; + + let scheduled_message_id = queue_item.id; + let events = match events_req.get(&scheduled_message_id).await { + Ok(events) => Some(events), + Err(err) => { + eprintln!("Error: {err:?}"); + None + } + }; + + // for event in &events { + while let Some(event) = &events { + println!("Event: {event:?}"); + } + todo!( r#" Need to finish this @@ -65,7 +84,7 @@ impl Service { let now = time::OffsetDateTime::now_utc(); match queue_item.scheduled { - Some(date) => date <= now, + Some(date) => date > now, None => false, } } -- 2.47.3 From 2cd5ddfd1b66b07c6257d3dee06cd835c88c3775 Mon Sep 17 00:00:00 2001 From: phoenix Date: Wed, 24 Jun 2026 22:28:51 -0400 Subject: [PATCH 2/5] Added uuid crate --- Cargo.lock | 1 + Cargo.toml | 1 + 2 files changed, 2 insertions(+) diff --git a/Cargo.lock b/Cargo.lock index e1898ac..808982d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -138,6 +138,7 @@ dependencies = [ "textsender_models", "time", "tokio", + "uuid", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 75f702b..7f6f6f7 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -11,6 +11,7 @@ reqwest = { version = "0.13.4", features = ["json", "stream", "multipart"] } serde = { version = "1.0.228", features = ["derive"] } serde_json = { version = "1.0.150" } time = { version = "0.3.49", features = ["formatting", "macros", "parsing", "serde"] } +uuid = { version = "1.23.3", features = ["v4", "serde"] } textsender_models = { git = "ssh://git@git.kundeng.us/phoenix/textsender_models.git", tag = "v0.4.3-29-720f3d8f75-111" } swoosh = { git = "ssh://git@git.kundeng.us/phoenix/swoosh.git", tag = "v0.4.1-10-6bdec12084-871" } -- 2.47.3 From ecc1cdcf2816cd3b73ad5af3efcc49cd061fda46 Mon Sep 17 00:00:00 2001 From: phoenix Date: Wed, 24 Jun 2026 22:29:15 -0400 Subject: [PATCH 3/5] Adding event module --- src/service/event.rs | 68 ++++++++++++++++++++++++++++++++++++++++++++ src/service/mod.rs | 1 + 2 files changed, 69 insertions(+) create mode 100644 src/service/event.rs diff --git a/src/service/event.rs b/src/service/event.rs new file mode 100644 index 0000000..8c0f255 --- /dev/null +++ b/src/service/event.rs @@ -0,0 +1,68 @@ +pub struct Event { + pub app: crate::app::App, + pub token: textsender_models::token::LoginResult, +} + +impl Event { + pub async fn get( + &self, + scheduled_message_id: &uuid::Uuid, + ) -> Result, std::io::Error> { + let client = reqwest::Client::new(); + let endpoint = format!("api/v1/schedule/message/event?scheduled_message_id={scheduled_message_id}"); + let api_url = format!("{}/{endpoint}", self.app.api_url); + + println!("Url: {api_url:?}"); + + let (key, header) = super::auth_header(&self.token.access_token); + + match client.get(api_url).header(key, header).send().await { + Ok(response) => match response.status() { + reqwest::StatusCode::OK => { + match response.text().await { + Ok(val) => match parse_response(&val).await { + Ok(login_result) => Ok(login_result), + Err(err) => Err(err), + }, + Err(err) => Err(std::io::Error::other(err)), + } + } + _ => Err(std::io::Error::other("Error getting token")), + }, + Err(err) => Err(std::io::Error::other(err.to_string())), + } + } +} + +async fn parse_response( + response: &str, +) -> Result, std::io::Error> { + match serde_json::from_str::(response) { + Ok(j) => { + match j.get("data") { + Some(serde_json::Value::Array(lrs)) => { + if lrs.is_empty() { + Err(std::io::Error::other("Error response is empty")) + } else { + let mut events: Vec = Vec::new(); + + for event in lrs.iter() { + let ll: textsender_models::message::scheduling::ScheduledMessageEvent = + match serde_json::from_value(event.clone()) { + Ok(lr) => lr, + Err(err) => { + return Err(std::io::Error::other(err.to_string())); + } + }; + events.push(ll); + } + + Ok(events) + } + } + _ => Err(std::io::Error::other("Error parsing response")), + } + } + Err(err) => Err(std::io::Error::other(err.to_string())), + } +} diff --git a/src/service/mod.rs b/src/service/mod.rs index 788f4cc..0095e9d 100644 --- a/src/service/mod.rs +++ b/src/service/mod.rs @@ -1,4 +1,5 @@ pub mod core; +pub mod event; pub mod queue; pub mod auth { -- 2.47.3 From e00daf6a18d0ea458e9164d398ccc8a4ae3df49e Mon Sep 17 00:00:00 2001 From: phoenix Date: Wed, 24 Jun 2026 22:37:07 -0400 Subject: [PATCH 4/5] Able to get events --- src/service/core.rs | 16 +++++++---- src/service/event.rs | 64 ++++++++++++++++++++++---------------------- 2 files changed, 43 insertions(+), 37 deletions(-) diff --git a/src/service/core.rs b/src/service/core.rs index b10166c..4ecb832 100644 --- a/src/service/core.rs +++ b/src/service/core.rs @@ -39,7 +39,7 @@ impl Service { let events_req = super::event::Event { app: self.app.clone(), - token: self.token.clone() + token: self.token.clone(), }; let scheduled_message_id = queue_item.id; @@ -51,8 +51,13 @@ impl Service { } }; - // for event in &events { - while let Some(event) = &events { + let events = if events.is_some() { + events.unwrap() + } else { + Vec::new() + }; + + for event in events { println!("Event: {event:?}"); } @@ -67,12 +72,13 @@ impl Service { 1. Check the queue - Done 2. If there is an item, get the data - Done - 3. Evaluate if it is schedulable - 4. Get the events and iterate each one + 3. Evaluate if it is schedulable - Done + 4. Get the events and iterate each one - Done 5. starting with the message 6. Get the contact 7. Send the message 8. Record the message event response + 9. Add to scheduler "# ); } diff --git a/src/service/event.rs b/src/service/event.rs index 8c0f255..2c63a39 100644 --- a/src/service/event.rs +++ b/src/service/event.rs @@ -7,9 +7,11 @@ impl Event { pub async fn get( &self, scheduled_message_id: &uuid::Uuid, - ) -> Result, std::io::Error> { + ) -> Result, std::io::Error> + { let client = reqwest::Client::new(); - let endpoint = format!("api/v1/schedule/message/event?scheduled_message_id={scheduled_message_id}"); + let endpoint = + format!("api/v1/schedule/message/event?scheduled_message_id={scheduled_message_id}"); let api_url = format!("{}/{endpoint}", self.app.api_url); println!("Url: {api_url:?}"); @@ -18,15 +20,13 @@ impl Event { match client.get(api_url).header(key, header).send().await { Ok(response) => match response.status() { - reqwest::StatusCode::OK => { - match response.text().await { - Ok(val) => match parse_response(&val).await { - Ok(login_result) => Ok(login_result), - Err(err) => Err(err), - }, - Err(err) => Err(std::io::Error::other(err)), - } - } + reqwest::StatusCode::OK => match response.text().await { + Ok(val) => match parse_response(&val).await { + Ok(login_result) => Ok(login_result), + Err(err) => Err(err), + }, + Err(err) => Err(std::io::Error::other(err)), + }, _ => Err(std::io::Error::other("Error getting token")), }, Err(err) => Err(std::io::Error::other(err.to_string())), @@ -38,31 +38,31 @@ async fn parse_response( response: &str, ) -> Result, std::io::Error> { match serde_json::from_str::(response) { - Ok(j) => { - match j.get("data") { - Some(serde_json::Value::Array(lrs)) => { - if lrs.is_empty() { - Err(std::io::Error::other("Error response is empty")) - } else { - let mut events: Vec = Vec::new(); + Ok(j) => match j.get("data") { + Some(serde_json::Value::Array(lrs)) => { + if lrs.is_empty() { + Err(std::io::Error::other("Error response is empty")) + } else { + let mut events: Vec< + textsender_models::message::scheduling::ScheduledMessageEvent, + > = Vec::new(); - for event in lrs.iter() { - let ll: textsender_models::message::scheduling::ScheduledMessageEvent = - match serde_json::from_value(event.clone()) { - Ok(lr) => lr, - Err(err) => { - return Err(std::io::Error::other(err.to_string())); - } - }; - events.push(ll); - } - - Ok(events) + for event in lrs.iter() { + let ll: textsender_models::message::scheduling::ScheduledMessageEvent = + match serde_json::from_value(event.clone()) { + Ok(lr) => lr, + Err(err) => { + return Err(std::io::Error::other(err.to_string())); + } + }; + events.push(ll); } + + Ok(events) } - _ => Err(std::io::Error::other("Error parsing response")), } - } + _ => Err(std::io::Error::other("Error parsing response")), + }, Err(err) => Err(std::io::Error::other(err.to_string())), } } -- 2.47.3 From c66085837cad2ecc497f5749b4c9c928458d9cb2 Mon Sep 17 00:00:00 2001 From: phoenix Date: Wed, 24 Jun 2026 22:41:49 -0400 Subject: [PATCH 5/5] Warning fixes --- src/service/core.rs | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/service/core.rs b/src/service/core.rs index 4ecb832..6de4c83 100644 --- a/src/service/core.rs +++ b/src/service/core.rs @@ -51,12 +51,7 @@ impl Service { } }; - let events = if events.is_some() { - events.unwrap() - } else { - Vec::new() - }; - + let events = events.unwrap_or_default(); for event in events { println!("Event: {event:?}"); } -- 2.47.3