From 511afcf3d5a92d4327ad3decf3ca1863931972f0 Mon Sep 17 00:00:00 2001 From: phoenix Date: Mon, 13 Jul 2026 16:26:26 -0400 Subject: [PATCH] Updating name references --- Cargo.lock | 18 +++++++++++++++++- Cargo.toml | 2 +- src/app.rs | 6 +++--- src/service/auth.rs | 12 ++++++------ src/service/contact.rs | 10 +++++----- src/service/core.rs | 8 ++++---- src/service/event.rs | 10 +++++----- src/service/mer.rs | 12 ++++++------ src/service/message.rs | 10 +++++----- src/service/queue.rs | 8 ++++---- src/service/scheduler.rs | 8 ++++---- 11 files changed, 60 insertions(+), 44 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 861b8ef..8891cc7 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -135,9 +135,9 @@ name = "catapult" version = "0.3.4" dependencies = [ "reqwest", + "schedtxt_models", "serde_json", "swoosh", - "textsender_models", "time", "tokio", "uuid", @@ -1643,6 +1643,22 @@ dependencies = [ "windows-sys 0.61.2", ] +[[package]] +name = "schedtxt_models" +version = "0.5.3" +source = "git+ssh://git@git.kundeng.us/phoenix/schedtxt_models.git?tag=v0.5.3#597af4e84c082bb437cc94817bb19592614681a5" +dependencies = [ + "const_format", + "dotenvy", + "josekit", + "serde", + "serde_json", + "sqlx", + "time", + "utoipa", + "uuid", +] + [[package]] name = "scopeguard" version = "1.2.0" diff --git a/Cargo.toml b/Cargo.toml index 905983a..85afd34 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -10,7 +10,7 @@ reqwest = { version = "0.13.4", features = ["json", "stream", "multipart"] } serde_json = { version = "1.0.150" } time = { version = "0.3.53", features = ["formatting", "macros", "parsing", "serde"] } uuid = { version = "1.23.5", features = ["v4", "serde"] } -textsender_models = { git = "ssh://git@git.kundeng.us/phoenix/textsender_models.git", tag = "v0.5.2" } +schedtxt_models = { git = "ssh://git@git.kundeng.us/phoenix/schedtxt_models.git", tag = "v0.5.3" } swoosh = { git = "ssh://git@git.kundeng.us/phoenix/swoosh.git", tag = "v0.5.3" } [dev-dependencies] diff --git a/src/app.rs b/src/app.rs index d0e29af..68f5ac1 100644 --- a/src/app.rs +++ b/src/app.rs @@ -9,11 +9,11 @@ pub struct App { pub auth_url: String, pub service_username: String, pub service_passphrase: String, - pub twilio_config: textsender_models::config::auxiliary::TwilioConfig, + pub twilio_config: schedtxt_models::config::auxiliary::TwilioConfig, } pub fn load_app() -> Result { - use textsender_models::envy; + use schedtxt_models::envy; let auth_url_env = envy::environment::get_env("AUTH_URL"); let api_url_env = envy::environment::get_env("API_URL"); let service_username_env = envy::environment::get_env("SERVICE_USERNAME"); @@ -41,7 +41,7 @@ pub fn load_app() -> Result { let api_url: String = api_url_env.value; let service_username: String = service_username_env.value; let service_passphrase: String = service_passphrase_env.value; - match textsender_models::config::auxiliary::load_config() { + match schedtxt_models::config::auxiliary::load_config() { Ok(twilio_config) => Ok(App { api_url, auth_url, diff --git a/src/service/auth.rs b/src/service/auth.rs index 510046e..58aac59 100644 --- a/src/service/auth.rs +++ b/src/service/auth.rs @@ -3,7 +3,7 @@ pub struct Auth { } impl Auth { - pub async fn get_token(&self) -> Result { + pub async fn get_token(&self) -> Result { let client = reqwest::Client::new(); let endpoint = String::from("api/v1/service/login"); let api_url = format!("{}/{endpoint}", self.app.auth_url); @@ -37,8 +37,8 @@ impl Auth { pub async fn get_refresh_token( &self, - login_result: &textsender_models::token::Login, - ) -> Result { + login_result: &schedtxt_models::token::Login, + ) -> Result { let client = reqwest::Client::new(); let endpoint = String::from("api/v1/token/refresh"); let api_url = format!("{}/{endpoint}", self.app.auth_url); @@ -70,7 +70,7 @@ impl Auth { async fn parse_token_response( response: &str, -) -> Result { +) -> Result { match serde_json::from_str::(response) { Ok(j) => { println!("Good"); @@ -85,7 +85,7 @@ async fn parse_token_response( Err(std::io::Error::other("Error response is empty")) } else { let lr = lrs[0].clone(); - let ll: textsender_models::token::LoginResult = + let ll: schedtxt_models::token::LoginResult = match serde_json::from_value(lr) { Ok(lr) => lr, Err(err) => { @@ -102,7 +102,7 @@ async fn parse_token_response( } } -pub async fn has_token_expired(token: &textsender_models::token::LoginResult) -> bool { +pub async fn has_token_expired(token: &schedtxt_models::token::LoginResult) -> bool { let now = time::OffsetDateTime::now_utc(); let expire = match time::OffsetDateTime::from_unix_timestamp(token.expires_in) { Ok(res) => res, diff --git a/src/service/contact.rs b/src/service/contact.rs index 9220615..a013cfb 100644 --- a/src/service/contact.rs +++ b/src/service/contact.rs @@ -1,13 +1,13 @@ pub struct Contact { pub app: std::sync::Arc, - pub token: std::sync::Arc, + pub token: std::sync::Arc, } impl Contact { pub async fn get( &self, contact_id: &uuid::Uuid, - ) -> Result, std::io::Error> { + ) -> Result, std::io::Error> { let client = reqwest::Client::new(); let endpoint = format!("api/v1/contact?id={contact_id}"); let api_url = format!("{}/{endpoint}", self.app.api_url); @@ -34,17 +34,17 @@ impl Contact { async fn parse_response( response: &str, -) -> Result, std::io::Error> { +) -> 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(); + let mut events: Vec = Vec::new(); for event in lrs.iter() { - let ll: textsender_models::contact::Contact = + let ll: schedtxt_models::contact::Contact = match serde_json::from_value(event.clone()) { Ok(lr) => lr, Err(err) => { diff --git a/src/service/core.rs b/src/service/core.rs index 659e4d4..9288df1 100644 --- a/src/service/core.rs +++ b/src/service/core.rs @@ -1,13 +1,13 @@ pub struct Service { pub app: std::sync::Arc, - pub token: std::sync::Arc, + pub token: std::sync::Arc, } impl Service { pub async fn do_the_work(&mut self) { println!("Checking queue"); - use textsender_models::message::scheduling::ScheduledMessage; + use schedtxt_models::message::scheduling::ScheduledMessage; let queue = super::queue::Queue { app: std::sync::Arc::clone(&self.app), @@ -120,7 +120,7 @@ impl Service { println!("Message scheduled"); // MER response let result = swoosh::twilio::api::response_to_json(resp).await; - let mer = textsender_models::message::event::MessageEventResponse { + let mer = schedtxt_models::message::event::MessageEventResponse { contact_id: contact.id.unwrap(), scheduled_message_event_id: Some(event.id), response: result, @@ -151,7 +151,7 @@ impl Service { fn is_schedulable( &self, - queue_item: &textsender_models::message::scheduling::ScheduledMessage, + queue_item: &schedtxt_models::message::scheduling::ScheduledMessage, ) -> bool { match queue_item.scheduled { Some(date) => date > time::OffsetDateTime::now_utc(), diff --git a/src/service/event.rs b/src/service/event.rs index 29fb7ab..dbdc9c9 100644 --- a/src/service/event.rs +++ b/src/service/event.rs @@ -1,13 +1,13 @@ pub struct Event { pub app: std::sync::Arc, - pub token: std::sync::Arc, + pub token: std::sync::Arc, } 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 = @@ -38,7 +38,7 @@ impl Event { async fn parse_response( response: &str, -) -> Result, std::io::Error> { +) -> Result, std::io::Error> { match serde_json::from_str::(response) { Ok(j) => match j.get("data") { Some(serde_json::Value::Array(lrs)) => { @@ -46,11 +46,11 @@ async fn parse_response( Err(std::io::Error::other("Error response is empty")) } else { let mut events: Vec< - textsender_models::message::scheduling::ScheduledMessageEvent, + schedtxt_models::message::scheduling::ScheduledMessageEvent, > = Vec::new(); for event in lrs.iter() { - let ll: textsender_models::message::scheduling::ScheduledMessageEvent = + let ll: schedtxt_models::message::scheduling::ScheduledMessageEvent = match serde_json::from_value(event.clone()) { Ok(lr) => lr, Err(err) => { diff --git a/src/service/mer.rs b/src/service/mer.rs index 8a6ae5a..8427932 100644 --- a/src/service/mer.rs +++ b/src/service/mer.rs @@ -1,13 +1,13 @@ pub struct MessageEventResponse { pub app: std::sync::Arc, - pub token: std::sync::Arc, + pub token: std::sync::Arc, } impl MessageEventResponse { pub async fn record_message_event_response( &self, - mer: &textsender_models::message::event::MessageEventResponse, - ) -> Result { + mer: &schedtxt_models::message::event::MessageEventResponse, + ) -> Result { let client = reqwest::Client::new(); let endpoint = String::from("api/v1/schedule/message/event/response/record"); let api_url = format!("{}/{endpoint}", self.app.api_url); @@ -27,7 +27,7 @@ impl MessageEventResponse { "response": mer.response, "user_id": mer.user_id, "sent": sent, - "status": textsender_models::message::event::MESSAGE_EVENT_RESPONSE_STATUS_SCHEDULED, + "status": schedtxt_models::message::event::MESSAGE_EVENT_RESPONSE_STATUS_SCHEDULED, "contact_id": mer.contact_id, "message_id": mer.message_id }); @@ -79,7 +79,7 @@ impl MessageEventResponse { async fn parse_response( response: &str, -) -> Result { +) -> Result { match serde_json::from_str::(response) { Ok(j) => { println!("Good"); @@ -94,7 +94,7 @@ async fn parse_response( Err(std::io::Error::other("Error response is empty")) } else { let lr = lrs[0].clone(); - let ll: textsender_models::message::event::MessageEventResponse = + let ll: schedtxt_models::message::event::MessageEventResponse = match serde_json::from_value(lr) { Ok(lr) => lr, Err(err) => { diff --git a/src/service/message.rs b/src/service/message.rs index 4374f10..4a5f5d4 100644 --- a/src/service/message.rs +++ b/src/service/message.rs @@ -1,13 +1,13 @@ pub struct Message { pub app: std::sync::Arc, - pub token: std::sync::Arc, + pub token: std::sync::Arc, } impl Message { pub async fn get( &self, message_id: &uuid::Uuid, - ) -> Result, std::io::Error> { + ) -> Result, std::io::Error> { let client = reqwest::Client::new(); let endpoint = format!("api/v1/message?id={message_id}"); let api_url = format!("{}/{endpoint}", self.app.api_url); @@ -34,17 +34,17 @@ impl Message { async fn parse_response( response: &str, -) -> Result, std::io::Error> { +) -> 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(); + let mut events: Vec = Vec::new(); for event in lrs.iter() { - let ll: textsender_models::message::Message = + let ll: schedtxt_models::message::Message = match serde_json::from_value(event.clone()) { Ok(lr) => lr, Err(err) => { diff --git a/src/service/queue.rs b/src/service/queue.rs index 3b4167d..1f4a652 100644 --- a/src/service/queue.rs +++ b/src/service/queue.rs @@ -1,12 +1,12 @@ pub struct Queue { pub app: std::sync::Arc, - pub token: std::sync::Arc, + pub token: std::sync::Arc, } impl Queue { pub async fn get_queue( &self, - ) -> Result { + ) -> Result { let client = reqwest::Client::new(); let endpoint = String::from("api/v1/schedule/message/fetch"); let api_url = format!("{}/{endpoint}", self.app.api_url); @@ -36,7 +36,7 @@ impl Queue { async fn parse_queue_response( response: &str, -) -> Result { +) -> Result { match serde_json::from_str::(response) { Ok(j) => { let message = &j["message"]; @@ -50,7 +50,7 @@ async fn parse_queue_response( Err(std::io::Error::other("Error response is empty")) } else { let lr = lrs[0].clone(); - let ll: textsender_models::message::scheduling::ScheduledMessage = + let ll: schedtxt_models::message::scheduling::ScheduledMessage = match serde_json::from_value(lr) { Ok(lr) => lr, Err(err) => { diff --git a/src/service/scheduler.rs b/src/service/scheduler.rs index 72532a1..f22d7e7 100644 --- a/src/service/scheduler.rs +++ b/src/service/scheduler.rs @@ -1,13 +1,13 @@ pub struct ScheduledMessage { pub app: std::sync::Arc, - pub token: std::sync::Arc, + pub token: std::sync::Arc, } impl ScheduledMessage { pub async fn get( &self, scheduled_message_id: &uuid::Uuid, - ) -> Result { + ) -> Result { let client = reqwest::Client::new(); let endpoint = format!("api/v1/schedule/message?id={scheduled_message_id}"); let api_url = format!("{}/{endpoint}", self.app.api_url); @@ -34,14 +34,14 @@ impl ScheduledMessage { async fn parse_response( response: &str, -) -> Result { +) -> Result { 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 ll: textsender_models::message::scheduling::ScheduledMessage = + let ll: schedtxt_models::message::scheduling::ScheduledMessage = match serde_json::from_value(lrs[0].clone()) { Ok(lr) => lr, Err(err) => {