Get queue item #9

Merged
phoenix merged 2 commits from get_queue_item into v0.3.0 2026-06-24 15:33:47 -04:00
5 changed files with 62 additions and 60 deletions
Showing only changes of commit c67ca1b2a1 - Show all commits
+1 -1
View File
@@ -46,7 +46,7 @@ pub async fn load_app() -> Result<App, std::io::Error> {
auth_url: envs[1].value.clone(), auth_url: envs[1].value.clone(),
service_username: envs[2].value.clone(), service_username: envs[2].value.clone(),
service_passphrase: envs[3].value.clone(), service_passphrase: envs[3].value.clone(),
twilio_config: twilio_config, twilio_config,
}), }),
Err(err) => Err(err), Err(err) => Err(err),
} }
+1 -1
View File
@@ -30,7 +30,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
let mut svc = catapult::service::core::Service { let mut svc = catapult::service::core::Service {
app: app.clone(), app: app.clone(),
token: token, token,
}; };
loop { loop {
+3 -3
View File
@@ -22,7 +22,7 @@ impl Service {
} }
}; };
if !queue_item.is_some() { if queue_item.is_none() {
println!("No queue item found"); println!("No queue item found");
return; return;
} }
@@ -39,8 +39,8 @@ impl Service {
Then do the real work. Then do the real work.
1. Check the queue 1. Check the queue - Done
2. If there is an item, get the data, 2. If there is an item, get the data - Done
3. Evaluate if it is schedulable 3. Evaluate if it is schedulable
4. Get the events and iterate each one 4. Get the events and iterate each one
5. starting with the message 5. starting with the message
+1 -1
View File
@@ -73,7 +73,7 @@ pub mod auth {
} }
async fn parse_token_response( async fn parse_token_response(
response: &String, response: &str,
) -> Result<textsender_models::token::LoginResult, std::io::Error> { ) -> Result<textsender_models::token::LoginResult, std::io::Error> {
match serde_json::from_str::<serde_json::Value>(response) { match serde_json::from_str::<serde_json::Value>(response) {
Ok(j) => { Ok(j) => {
+8 -6
View File
@@ -1,10 +1,12 @@
pub struct Queue { pub struct Queue {
pub app: crate::app::App, pub app: crate::app::App,
pub token: textsender_models::token::LoginResult pub token: textsender_models::token::LoginResult,
} }
impl Queue { impl Queue {
pub async fn get_queue(&self) -> Result<textsender_models::message::scheduling::ScheduledMessage, std::io::Error> { pub async fn get_queue(
&self,
) -> Result<textsender_models::message::scheduling::ScheduledMessage, std::io::Error> {
let client = reqwest::Client::new(); let client = reqwest::Client::new();
let endpoint = String::from("api/v1/schedule/message/fetch"); let endpoint = String::from("api/v1/schedule/message/fetch");
let api_url = format!("{}/{endpoint}", self.app.api_url); let api_url = format!("{}/{endpoint}", self.app.api_url);
@@ -32,9 +34,9 @@ impl Queue {
} }
} }
async fn parse_queue_response( async fn parse_queue_response(
response: &String, response: &str,
) -> Result<textsender_models::message::scheduling::ScheduledMessage, std::io::Error> { ) -> Result<textsender_models::message::scheduling::ScheduledMessage, std::io::Error> {
match serde_json::from_str::<serde_json::Value>(response) { match serde_json::from_str::<serde_json::Value>(response) {
Ok(j) => { Ok(j) => {
let message = &j["message"]; let message = &j["message"];
@@ -63,4 +65,4 @@ impl Queue {
} }
Err(err) => Err(std::io::Error::other(err.to_string())), Err(err) => Err(std::io::Error::other(err.to_string())),
} }
} }