phoenix/catapult
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Dependency name change (#17)

Browse Source 
Reviewed-on: #17
This commit was merged in pull request #17.
This commit is contained in:
phoenix
2026-07-13 16:33:51 -04:00
parent 50aa9089f0
commit 6801b1e635
11 changed files with 85 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Cargo.lock
Generated
+39 -39
View File
@@ -132,12 +132,12 @@ checksum = "fc652a48c352aef3ea3aed32080501cf3ef6ed5da78602a020c991775b0aff04"
[[package]]
name = "catapult"
version = "0.3.4"
version = "0.3.5"
dependencies = [
"reqwest",
"schedtxt_models",
"serde_json",
"swoosh",
"textsender_models",
"time",
"tokio",
"uuid",
@@ -145,9 +145,9 @@ dependencies = [
[[package]]
name = "cc"
version = "1.2.66"
version = "1.2.67"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f5d6cac793997bd970000024b2934968efe83b382de4fdcf4fcb46b6ee4ad996"
checksum = "e17dd265a7d0f31ef544e1b20e03add05d3b45b491b633b10d67145d2acc1a38"
dependencies = [
"find-msvc-tools",
"jobserver",
@@ -734,9 +734,9 @@ dependencies = [
[[package]]
name = "http-body"
version = "1.0.1"
version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184"
checksum = "ca2a8f2913ee65f60facd6a5905613afaa448497a0230cc41ce022d93290bc2c"
dependencies = [
"bytes",
"http",
@@ -744,9 +744,9 @@ dependencies = [
[[package]]
name = "http-body-util"
version = "0.1.3"
version = "0.1.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b021d93e26becf5dc7e1b75b1bed1fd93124b374ceb73f43d4d4eafec896a64a"
checksum = "e9f41fd6a08e4d4ec69df65976da761afd5ad5e58a9d4acb46bd1c953a9e3ff2"
dependencies = [
"bytes",
"futures-core",
@@ -1153,9 +1153,9 @@ dependencies = [
[[package]]
name = "mio"
version = "1.2.1"
version = "1.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "02bd0af71c67b473010cbbc60715ee815645a4dc942899111f494b4b737d6fda"
checksum = "30d65c71f1ce40ab09135ce117d742b9f8a19ff91a41a8b57ed50bc2de59c427"
dependencies = [
"libc",
"wasi",
@@ -1540,9 +1540,9 @@ dependencies = [
[[package]]
name = "rustls"
version = "0.23.41"
version = "0.23.42"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6b92b125634d9b795e7beca796cc790df15a7fb38323bf3196fda83292d06b1f"
checksum = "3c54fcab019b409d04215d3a17cb438fd7fbf192ee61461f20f4fe18704bc138"
dependencies = [
"aws-lc-rs",
"once_cell",
@@ -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"
@@ -1822,9 +1838,9 @@ dependencies = [
[[package]]
name = "socket2"
version = "0.6.4"
version = "0.6.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "52d1cfed4120b4d927bf7c0f86d2087a4a7d6027c906d9f9d525a80573b9be51"
checksum = "c3d1e2c7f27f8d4cb10542a02c49005dbd6e93095799d6f3be745fae9f8fedd4"
dependencies = [
"libc",
"windows-sys 0.61.2",
@@ -1832,9 +1848,9 @@ dependencies = [
[[package]]
name = "spin"
version = "0.9.8"
version = "0.9.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67"
checksum = "3763264f6b73151db08c50ff20d7d8a0b8796e021cdea7ceedad07b80155fa0e"
dependencies = [
"lock_api",
]
@@ -2044,14 +2060,14 @@ checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
[[package]]
name = "swoosh"
version = "0.5.3"
source = "git+ssh://git@git.kundeng.us/phoenix/swoosh.git?tag=v0.5.3#1c49242bdfe8fe487ea751c89bcbf545c4b8ac3f"
version = "0.5.4"
source = "git+ssh://git@git.kundeng.us/phoenix/swoosh.git?tag=v0.5.4#84ba4c21ec721662d76bb21ef67062d51f31f719"
dependencies = [
"base64-ng",
"reqwest",
"schedtxt_models",
"serde",
"serde_json",
"textsender_models",
"time",
]
@@ -2120,22 +2136,6 @@ dependencies = [
"windows-sys 0.61.2",
]
[[package]]
name = "textsender_models"
version = "0.5.2"
source = "git+ssh://git@git.kundeng.us/phoenix/textsender_models.git?tag=v0.5.2#02061bf7a380657b7bc76d64d1824388bef8e55a"
dependencies = [
"const_format",
"dotenvy",
"josekit",
"serde",
"serde_json",
"sqlx",
"time",
"utoipa",
"uuid",
]
[[package]]
name = "thiserror"
version = "2.0.18"
@@ -2451,9 +2451,9 @@ dependencies = [
[[package]]
name = "uuid"
version = "1.23.4"
version = "1.23.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bf80a72845275afea99e7f2b434723d3bc7e38470fcd1c7ed39a599c73319a53"
checksum = "ea5fab0d6c3c01ae70085a09cb03d4c7a1d6314e2b3e075392783396d724ca0a"
dependencies = [
"getrandom 0.4.3",
"js-sys",
@@ -2818,6 +2818,6 @@ dependencies = [
[[package]]
name = "zmij"
version = "1.0.21"
version = "1.0.23"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b8848ee67ecc8aedbaf3e4122217aff892639231befc6a1b58d29fff4c2cabaa"
checksum = "29666d0abbfad1e3dc4dcf6144730dd3a3ab225bbbdac83319345b1b44ccfc1b"
Cargo.toml
+4 -4
View File
@@ -1,6 +1,6 @@
[package]
name = "catapult"
version = "0.3.4"
version = "0.3.5"
rust-version = "1.97"
edition = "2024"
@@ -9,8 +9,8 @@ tokio = { version = "1.52.3", features = ["full"] }
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.4", features = ["v4", "serde"] }
textsender_models = { git = "ssh://git@git.kundeng.us/phoenix/textsender_models.git", tag = "v0.5.2" }
swoosh = { git = "ssh://git@git.kundeng.us/phoenix/swoosh.git", tag = "v0.5.3" }
uuid = { version = "1.23.5", features = ["v4", "serde"] }
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.4" }
[dev-dependencies]
src/app.rs
+3 -3
View File
@@ -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<App, std::io::Error> {
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<App, std::io::Error> {
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,
src/service/auth.rs
+6 -6
View File
@@ -3,7 +3,7 @@ pub struct Auth {
}
impl Auth {
pub async fn get_token(&self) -> Result<textsender_models::token::Login, std::io::Error> {
pub async fn get_token(&self) -> Result<schedtxt_models::token::Login, std::io::Error> {
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<textsender_models::token::Login, std::io::Error> {
login_result: &schedtxt_models::token::Login,
) -> Result<schedtxt_models::token::Login, std::io::Error> {
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<textsender_models::token::LoginResult, std::io::Error> {
) -> Result<schedtxt_models::token::LoginResult, std::io::Error> {
match serde_json::from_str::<serde_json::Value>(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,
src/service/contact.rs
+5 -5
View File
@@ -1,13 +1,13 @@
pub struct Contact {
pub app: std::sync::Arc<crate::app::App>,
pub token: std::sync::Arc<textsender_models::token::LoginResult>,
pub token: std::sync::Arc<schedtxt_models::token::LoginResult>,
}
impl Contact {
pub async fn get(
&self,
contact_id: &uuid::Uuid,
) -> Result<Vec<textsender_models::contact::Contact>, std::io::Error> {
) -> Result<Vec<schedtxt_models::contact::Contact>, 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<Vec<textsender_models::contact::Contact>, std::io::Error> {
) -> Result<Vec<schedtxt_models::contact::Contact>, std::io::Error> {
match serde_json::from_str::<serde_json::Value>(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<textsender_models::contact::Contact> = Vec::new();
let mut events: Vec<schedtxt_models::contact::Contact> = 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) => {
src/service/core.rs
+4 -4
View File
@@ -1,13 +1,13 @@
pub struct Service {
pub app: std::sync::Arc<crate::app::App>,
pub token: std::sync::Arc<textsender_models::token::Login>,
pub token: std::sync::Arc<schedtxt_models::token::Login>,
}
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(),
src/service/event.rs
+5 -5
View File
@@ -1,13 +1,13 @@
pub struct Event {
pub app: std::sync::Arc<crate::app::App>,
pub token: std::sync::Arc<textsender_models::token::LoginResult>,
pub token: std::sync::Arc<schedtxt_models::token::LoginResult>,
}
impl Event {
pub async fn get(
&self,
scheduled_message_id: &uuid::Uuid,
) -> Result<Vec<textsender_models::message::scheduling::ScheduledMessageEvent>, std::io::Error>
) -> Result<Vec<schedtxt_models::message::scheduling::ScheduledMessageEvent>, std::io::Error>
{
let client = reqwest::Client::new();
let endpoint =
@@ -38,7 +38,7 @@ impl Event {
async fn parse_response(
response: &str,
) -> Result<Vec<textsender_models::message::scheduling::ScheduledMessageEvent>, std::io::Error> {
) -> Result<Vec<schedtxt_models::message::scheduling::ScheduledMessageEvent>, std::io::Error> {
match serde_json::from_str::<serde_json::Value>(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) => {
src/service/mer.rs
+6 -6
View File
@@ -1,13 +1,13 @@
pub struct MessageEventResponse {
pub app: std::sync::Arc<crate::app::App>,
pub token: std::sync::Arc<textsender_models::token::LoginResult>,
pub token: std::sync::Arc<schedtxt_models::token::LoginResult>,
}
impl MessageEventResponse {
pub async fn record_message_event_response(
&self,
mer: &textsender_models::message::event::MessageEventResponse,
) -> Result<textsender_models::message::event::MessageEventResponse, std::io::Error> {
mer: &schedtxt_models::message::event::MessageEventResponse,
) -> Result<schedtxt_models::message::event::MessageEventResponse, std::io::Error> {
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<textsender_models::message::event::MessageEventResponse, std::io::Error> {
) -> Result<schedtxt_models::message::event::MessageEventResponse, std::io::Error> {
match serde_json::from_str::<serde_json::Value>(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) => {
src/service/message.rs
+5 -5
View File
@@ -1,13 +1,13 @@
pub struct Message {
pub app: std::sync::Arc<crate::app::App>,
pub token: std::sync::Arc<textsender_models::token::LoginResult>,
pub token: std::sync::Arc<schedtxt_models::token::LoginResult>,
}
impl Message {
pub async fn get(
&self,
message_id: &uuid::Uuid,
) -> Result<Vec<textsender_models::message::Message>, std::io::Error> {
) -> Result<Vec<schedtxt_models::message::Message>, 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<Vec<textsender_models::message::Message>, std::io::Error> {
) -> Result<Vec<schedtxt_models::message::Message>, std::io::Error> {
match serde_json::from_str::<serde_json::Value>(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<textsender_models::message::Message> = Vec::new();
let mut events: Vec<schedtxt_models::message::Message> = 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) => {
src/service/queue.rs
+4 -4
View File
@@ -1,12 +1,12 @@
pub struct Queue {
pub app: std::sync::Arc<crate::app::App>,
pub token: std::sync::Arc<textsender_models::token::LoginResult>,
pub token: std::sync::Arc<schedtxt_models::token::LoginResult>,
}
impl Queue {
pub async fn get_queue(
&self,
) -> Result<textsender_models::message::scheduling::ScheduledMessage, std::io::Error> {
) -> Result<schedtxt_models::message::scheduling::ScheduledMessage, std::io::Error> {
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<textsender_models::message::scheduling::ScheduledMessage, std::io::Error> {
) -> Result<schedtxt_models::message::scheduling::ScheduledMessage, std::io::Error> {
match serde_json::from_str::<serde_json::Value>(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) => {
src/service/scheduler.rs
+4 -4
View File
@@ -1,13 +1,13 @@
pub struct ScheduledMessage {
pub app: std::sync::Arc<crate::app::App>,
pub token: std::sync::Arc<textsender_models::token::LoginResult>,
pub token: std::sync::Arc<schedtxt_models::token::LoginResult>,
}
impl ScheduledMessage {
pub async fn get(
&self,
scheduled_message_id: &uuid::Uuid,
) -> Result<textsender_models::message::scheduling::ScheduledMessage, std::io::Error> {
) -> Result<schedtxt_models::message::scheduling::ScheduledMessage, std::io::Error> {
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<textsender_models::message::scheduling::ScheduledMessage, std::io::Error> {
) -> Result<schedtxt_models::message::scheduling::ScheduledMessage, std::io::Error> {
match serde_json::from_str::<serde_json::Value>(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) => {