From 2322df21f7018113c7d1a2c3cc614665ee3293f6 Mon Sep 17 00:00:00 2001 From: phoenix Date: Mon, 13 Jul 2026 17:41:03 -0400 Subject: [PATCH] Updating name references for library --- Cargo.lock | 18 ++++++++++++++++- Cargo.toml | 2 +- src/auth/mod.rs | 4 ++-- src/caller/contact.rs | 14 ++------------ src/caller/instant.rs | 12 ++++++------ src/caller/message/event.rs | 4 ++-- src/caller/message/mod.rs | 4 ++-- src/caller/message/scheduling.rs | 20 +++++++++---------- src/config/mod.rs | 6 +++--- src/db/mod.rs | 2 +- src/repo/contact.rs | 16 ++++++++-------- src/repo/message/event.rs | 12 ++++++------ src/repo/message/mod.rs | 12 ++++++------ src/repo/message/scheduling.rs | 33 ++++++++++++++++---------------- tests/test.rs | 28 +++++++++++++-------------- 15 files changed, 96 insertions(+), 91 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 29c50c7..7b3d0a8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2230,6 +2230,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" @@ -2781,11 +2797,11 @@ dependencies = [ "axum-extra", "josekit", "jsonwebtoken", + "schedtxt_models", "serde", "serde_json", "sqlx", "swoosh", - "textsender_models", "time", "tokio", "tower", diff --git a/Cargo.toml b/Cargo.toml index af100d7..edbfeed 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -18,7 +18,7 @@ time = { version = "0.3.53", features = ["formatting", "macros", "parsing", "ser jsonwebtoken = { version = "10.4.0", features = ["rust_crypto"] } utoipa = { version = "5.5.0", features = ["axum_extras"] } utoipa-swagger-ui = { version = "9.0.2", features = ["axum"] } -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/auth/mod.rs b/src/auth/mod.rs index df20507..4b99034 100644 --- a/src/auth/mod.rs +++ b/src/auth/mod.rs @@ -36,11 +36,11 @@ pub async fn auth( (StatusCode::UNAUTHORIZED, Json(json_error)) })?; - let secret_key = textsender_models::envy::environment::get_secret_main_key().value; + let secret_key = schedtxt_models::envy::environment::get_secret_main_key().value; let mut validation = Validation::new(jsonwebtoken::Algorithm::HS256); validation.set_audience(&["textsender"]); // Must match exactly what's in the token - let _claims = decode::( + let _claims = decode::( &token, &DecodingKey::from_secret(secret_key.as_ref()), &validation, diff --git a/src/caller/contact.rs b/src/caller/contact.rs index 6093df5..eb2cd76 100644 --- a/src/caller/contact.rs +++ b/src/caller/contact.rs @@ -49,7 +49,7 @@ pub mod response { #[derive(Debug, Default, Deserialize, Serialize, ToSchema)] pub struct AddContactResponse { pub message: String, - pub data: Vec, + pub data: Vec, } pub use AddContactResponse as GetContactResponse; @@ -69,19 +69,9 @@ pub mod response { pub new_lastname: Option, pub new_nickname: Option, } - - /* - #[derive(Debug, Default, Deserialize, Serialize, ToSchema)] - pub struct GetContactResponse { - pub message: String, - pub data: Vec, - } - */ } pub mod endpoint { - // use axum::{Json, response::IntoResponse}; - use crate::repo::contact as contact_repo; /// Endpoint to create Contact @@ -126,7 +116,7 @@ pub mod endpoint { sqlx::Error::RowNotFound => { println!("Good to create"); // Put code here - let mut contact = textsender_models::contact::Contact { + let mut contact = schedtxt_models::contact::Contact { firstname: payload.firstname, lastname: payload.lastname, phone_number: payload.phone_number, diff --git a/src/caller/instant.rs b/src/caller/instant.rs index baef59d..f904dd4 100644 --- a/src/caller/instant.rs +++ b/src/caller/instant.rs @@ -23,7 +23,7 @@ pub mod response { #[derive(Debug, Default, Deserialize, Serialize, ToSchema)] pub struct InstantMessageResponse { pub message: String, - pub data: Vec, + pub data: Vec, } } @@ -57,7 +57,7 @@ pub mod endpoint { let mut response = super::response::InstantMessageResponse::default(); if payload.is_valid() { - let mut contacts: Vec = Vec::new(); + let mut contacts: Vec = Vec::new(); for contact_id in &payload.contact_ids { match contact_repo::get(&pool, contact_id).await { @@ -81,7 +81,7 @@ pub mod endpoint { match message_repo::get(&pool, &payload.message_id).await { Ok(message) => { println!("Valid message"); - let t_config = match textsender_models::config::auxiliary::load_config() { + let t_config = match schedtxt_models::config::auxiliary::load_config() { Ok(config) => config, Err(err) => { eprintln!("Error: {err:?}"); @@ -93,7 +93,7 @@ pub mod endpoint { } }; let mut results: Vec< - textsender_models::message::event::MessageEventResponse, + schedtxt_models::message::event::MessageEventResponse, > = Vec::new(); let pp = swoosh::twilio::types::Parameters { schedule: false, @@ -114,11 +114,11 @@ pub mod endpoint { match sendmsg.send_message(&pp).await { Ok(result) => { let val = swoosh::twilio::api::response_to_json(result).await; - let mer = textsender_models::message::event::MessageEventResponse { + let mer = schedtxt_models::message::event::MessageEventResponse { user_id: payload.user_id, // TODO: Make this more accurate sent: Some(time::OffsetDateTime::now_utc()), - status: String::from(textsender_models::message::event::MESSAGE_EVENT_RESPONSE_STATUS_INSTANT), + status: String::from(schedtxt_models::message::event::MESSAGE_EVENT_RESPONSE_STATUS_INSTANT), contact_id: contact.id.unwrap(), message_id: message.id.unwrap(), response: val, diff --git a/src/caller/message/event.rs b/src/caller/message/event.rs index a3b79c4..0e40bc2 100644 --- a/src/caller/message/event.rs +++ b/src/caller/message/event.rs @@ -40,7 +40,7 @@ pub mod response { #[derive(Debug, Default, Deserialize, Serialize, ToSchema)] pub struct RecordMessageEventResponse { pub message: String, - pub data: Vec, + pub data: Vec, } pub use RecordMessageEventResponse as GetMERResponse; @@ -74,7 +74,7 @@ pub mod endpoint { let mut response = super::response::RecordMessageEventResponse::default(); if payload.is_valid() { - let mut mer = textsender_models::message::event::MessageEventResponse { + let mut mer = schedtxt_models::message::event::MessageEventResponse { scheduled_message_event_id: Some(payload.scheduled_message_event_id), user_id: payload.user_id, sent: payload.sent, diff --git a/src/caller/message/mod.rs b/src/caller/message/mod.rs index 5f1ba57..ac7d434 100644 --- a/src/caller/message/mod.rs +++ b/src/caller/message/mod.rs @@ -31,7 +31,7 @@ pub mod response { #[derive(Debug, Default, Deserialize, Serialize, ToSchema)] pub struct AddMessageResponse { pub message: String, - pub data: Vec, + pub data: Vec, } pub use AddMessageResponse as GetMessageResponse; @@ -65,7 +65,7 @@ pub mod endpoint { let mut response = super::response::AddMessageResponse::default(); if payload.is_valid() { - let mut msg = textsender_models::message::Message { + let mut msg = schedtxt_models::message::Message { content: payload.content, user_id: Some(payload.user_id), ..Default::default() diff --git a/src/caller/message/scheduling.rs b/src/caller/message/scheduling.rs index d146889..7f8e827 100644 --- a/src/caller/message/scheduling.rs +++ b/src/caller/message/scheduling.rs @@ -52,10 +52,10 @@ pub mod request { impl UpdateScheduledMessageStatusRequest { pub fn is_valid(&self) -> bool { if !self.status.is_empty() || !self.scheduled_message_id.is_nil() { - self.status == textsender_models::message::scheduling::PENDING - || self.status == textsender_models::message::scheduling::READY - || self.status == textsender_models::message::scheduling::PROCESSING - || self.status == textsender_models::message::scheduling::DONE + self.status == schedtxt_models::message::scheduling::PENDING + || self.status == schedtxt_models::message::scheduling::READY + || self.status == schedtxt_models::message::scheduling::PROCESSING + || self.status == schedtxt_models::message::scheduling::DONE } else { false } @@ -70,19 +70,19 @@ pub mod response { #[derive(Debug, Default, Deserialize, Serialize, ToSchema)] pub struct ScheduleMessageResponse { pub message: String, - pub data: Vec, + pub data: Vec, } #[derive(Debug, Default, Deserialize, Serialize, ToSchema)] pub struct GetScheduledMessageResponse { pub message: String, - pub data: Vec, + pub data: Vec, } #[derive(Debug, Default, Deserialize, Serialize, ToSchema)] pub struct CreateScheduleMessageEventResponse { pub message: String, - pub data: Vec, + pub data: Vec, } pub use CreateScheduleMessageEventResponse as GetScheduledMessageEventResponse; @@ -133,13 +133,13 @@ pub mod endpoint { let mut response = super::response::ScheduleMessageResponse::default(); if payload.is_valid() { - if payload.status != textsender_models::message::scheduling::PENDING { + if payload.status != schedtxt_models::message::scheduling::PENDING { response.message = String::from("scheduled message must be pending"); (axum::http::StatusCode::BAD_REQUEST, axum::Json(response)) } else { if can_schedule(&payload.scheduled) { let mut scheduled_message = - textsender_models::message::scheduling::ScheduledMessage { + schedtxt_models::message::scheduling::ScheduledMessage { scheduled: payload.scheduled, status: payload.status, ..Default::default() @@ -402,7 +402,7 @@ pub mod endpoint { } } - let mut scme = textsender_models::message::scheduling::ScheduledMessageEvent { + let mut scme = schedtxt_models::message::scheduling::ScheduledMessageEvent { contact_id: payload.contact_id, message_id: payload.message_id, scheduled_message_id: payload.scheduled_message_id, diff --git a/src/config/mod.rs b/src/config/mod.rs index 3e01e57..a91952f 100644 --- a/src/config/mod.rs +++ b/src/config/mod.rs @@ -46,12 +46,12 @@ pub mod init { .max_age(std::time::Duration::from_secs(3600)); // Cache the preflight response for 1 hour:cite[2] // Dynamically set the allowed origin based on the environment - match std::env::var(textsender_models::envy::keys::APP_ENV).as_deref() { + match std::env::var(schedtxt_models::envy::keys::APP_ENV).as_deref() { Ok("production") => { // In production, allow only your specific, trusted origins let allowed_origins_env = - textsender_models::envy::environment::get_allowed_origins(); - match textsender_models::envy::utility::delimitize(&allowed_origins_env) { + schedtxt_models::envy::environment::get_allowed_origins(); + match schedtxt_models::envy::utility::delimitize(&allowed_origins_env) { Ok(alwd) => { let allowed_origins: Vec = alwd .into_iter() diff --git a/src/db/mod.rs b/src/db/mod.rs index a852536..9bd4a61 100644 --- a/src/db/mod.rs +++ b/src/db/mod.rs @@ -5,7 +5,7 @@ pub mod connection_settings { } pub async fn create_pool() -> Result { - let database_url = textsender_models::envy::environment::get_db_url().value; + let database_url = schedtxt_models::envy::environment::get_db_url().value; println!("Database url: {database_url}"); PgPoolOptions::new() diff --git a/src/repo/contact.rs b/src/repo/contact.rs index 5902aed..6dc6e17 100644 --- a/src/repo/contact.rs +++ b/src/repo/contact.rs @@ -2,7 +2,7 @@ use sqlx::Row; pub async fn insert( pool: &sqlx::PgPool, - contact: &textsender_models::contact::Contact, + contact: &schedtxt_models::contact::Contact, ) -> Result { match sqlx::query( r#" @@ -29,7 +29,7 @@ pub async fn insert( pub async fn get( pool: &sqlx::PgPool, id: &uuid::Uuid, -) -> Result { +) -> Result { match sqlx::query( r#" SELECT id, firstname, lastname, nickname, phone_number, user_id FROM "contacts" @@ -46,7 +46,7 @@ pub async fn get( let phone_number: String = row.try_get("phone_number")?; let user_id: uuid::Uuid = row.try_get("user_id")?; - Ok(textsender_models::contact::Contact { + Ok(schedtxt_models::contact::Contact { id: Some(id), firstname: match row.try_get("firstname") { Ok(val) => val, @@ -81,7 +81,7 @@ pub async fn get_with_user_id_and_phone( pool: &sqlx::PgPool, user_id: &uuid::Uuid, phone_number: &str, -) -> Result { +) -> Result { match sqlx::query( r#" SELECT id, firstname, lastname, nickname, phone_number, user_id FROM "contacts" @@ -103,7 +103,7 @@ pub async fn get_with_user_id_and_phone( let phone_number: String = row.try_get("phone_number")?; let user_id: uuid::Uuid = row.try_get("user_id")?; println!("Found"); - Ok(textsender_models::contact::Contact { + Ok(schedtxt_models::contact::Contact { id: Some(id), firstname: Some(firstname), lastname: Some(lastname), @@ -122,7 +122,7 @@ pub async fn get_with_user_id_and_phone( pub async fn get_with_user_id( pool: &sqlx::PgPool, user_id: &uuid::Uuid, -) -> Result, sqlx::Error> { +) -> Result, sqlx::Error> { match sqlx::query( r#" SELECT id, firstname, lastname, nickname, phone_number, user_id FROM "contacts" @@ -135,13 +135,13 @@ pub async fn get_with_user_id( .await { Ok(rows) => { - let mut contacts: Vec = Vec::new(); + let mut contacts: Vec = Vec::new(); for row in rows { let id: uuid::Uuid = row.try_get("id")?; let phone_number: String = row.try_get("phone_number")?; let user_id: uuid::Uuid = row.try_get("user_id")?; - let contact = textsender_models::contact::Contact { + let contact = schedtxt_models::contact::Contact { id: Some(id), firstname: match row.try_get("firstname") { Ok(val) => val, diff --git a/src/repo/message/event.rs b/src/repo/message/event.rs index a8bcfb6..7ba98fa 100644 --- a/src/repo/message/event.rs +++ b/src/repo/message/event.rs @@ -2,7 +2,7 @@ use sqlx::Row; pub async fn insert( pool: &sqlx::PgPool, - event: &textsender_models::message::event::MessageEventResponse, + event: &schedtxt_models::message::event::MessageEventResponse, ) -> Result { match sqlx::query( r#" @@ -31,7 +31,7 @@ pub async fn insert( pub async fn get( pool: &sqlx::PgPool, id: &uuid::Uuid, -) -> Result { +) -> Result { match sqlx::query( r#" SELECT id, scheduled_message_event_id, response, user_id, sent, contact_id, message_id, status FROM "message_event_responses" @@ -54,7 +54,7 @@ pub async fn get( pub async fn get_with_user_id( pool: &sqlx::PgPool, user_id: &uuid::Uuid, -) -> Result, sqlx::Error> { +) -> Result, sqlx::Error> { match sqlx::query( r#" SELECT id, scheduled_message_event_id, response, user_id, sent, contact_id, message_id, status FROM "message_event_responses" @@ -67,7 +67,7 @@ pub async fn get_with_user_id( .await { Ok(rows) => { - let mut events: Vec = + let mut events: Vec = Vec::new(); for row in rows { match parse_row(&row).await { @@ -88,7 +88,7 @@ pub async fn get_with_user_id( async fn parse_row( row: &sqlx::postgres::PgRow, -) -> Result { +) -> Result { println!("Parsing MER"); let id: uuid::Uuid = row.try_get("id")?; let response: serde_json::Value = row.try_get("response")?; @@ -101,7 +101,7 @@ async fn parse_row( .unwrap_or_default(); let user_id: uuid::Uuid = row.try_get("user_id")?; - Ok(textsender_models::message::event::MessageEventResponse { + Ok(schedtxt_models::message::event::MessageEventResponse { id, response, contact_id, diff --git a/src/repo/message/mod.rs b/src/repo/message/mod.rs index 09b0414..df459ad 100644 --- a/src/repo/message/mod.rs +++ b/src/repo/message/mod.rs @@ -5,7 +5,7 @@ use sqlx::Row; pub async fn insert( pool: &sqlx::PgPool, - message: &textsender_models::message::Message, + message: &schedtxt_models::message::Message, user_id: &uuid::Uuid, ) -> Result { match sqlx::query( @@ -30,7 +30,7 @@ pub async fn insert( pub async fn get( pool: &sqlx::PgPool, id: &uuid::Uuid, -) -> Result { +) -> Result { match sqlx::query( r#" SELECT id, content, user_id FROM "messages" @@ -47,7 +47,7 @@ pub async fn get( let content: String = row.try_get("content")?; let user_id: uuid::Uuid = row.try_get("user_id")?; - Ok(textsender_models::message::Message { + Ok(schedtxt_models::message::Message { id: Some(id), content, user_id: Some(user_id), @@ -60,7 +60,7 @@ pub async fn get( pub async fn get_with_user_id( pool: &sqlx::PgPool, user_id: &uuid::Uuid, -) -> Result, sqlx::Error> { +) -> Result, sqlx::Error> { match sqlx::query( r#" SELECT id, content, user_id FROM "messages" @@ -73,13 +73,13 @@ pub async fn get_with_user_id( .await { Ok(rows) => { - let mut messages: Vec = Vec::new(); + let mut messages: Vec = Vec::new(); for row in rows { let id: uuid::Uuid = row.try_get("id")?; let content: String = row.try_get("content")?; let user_id: uuid::Uuid = row.try_get("user_id")?; - let message = textsender_models::message::Message { + let message = schedtxt_models::message::Message { id: Some(id), content, user_id: Some(user_id), diff --git a/src/repo/message/scheduling.rs b/src/repo/message/scheduling.rs index 1604350..6e5490e 100644 --- a/src/repo/message/scheduling.rs +++ b/src/repo/message/scheduling.rs @@ -2,7 +2,7 @@ use sqlx::Row; pub async fn insert( pool: &sqlx::PgPool, - scheduled_message: &textsender_models::message::scheduling::ScheduledMessage, + scheduled_message: &schedtxt_models::message::scheduling::ScheduledMessage, user_id: &uuid::Uuid, ) -> Result<(uuid::Uuid, time::OffsetDateTime), sqlx::Error> { match sqlx::query( @@ -29,7 +29,7 @@ pub async fn insert( pub async fn get( pool: &sqlx::PgPool, id: &uuid::Uuid, -) -> Result { +) -> Result { match sqlx::query( r#" SELECT id, scheduled, created, status, user_id FROM "scheduled_messages" @@ -52,7 +52,7 @@ pub async fn get( pub async fn get_with_user_id( pool: &sqlx::PgPool, user_id: &uuid::Uuid, -) -> Result, sqlx::Error> { +) -> Result, sqlx::Error> { match sqlx::query( r#" SELECT id, scheduled, created, status, user_id FROM "scheduled_messages" @@ -65,7 +65,7 @@ pub async fn get_with_user_id( .await { Ok(rows) => { - let mut messages: Vec = + let mut messages: Vec = Vec::new(); for row in rows { match parse_row(&row).await { @@ -86,7 +86,7 @@ pub async fn get_with_user_id( pub async fn fetch( pool: &sqlx::PgPool, -) -> Result { +) -> Result { match sqlx::query( r#" UPDATE "scheduled_messages" @@ -101,8 +101,8 @@ pub async fn fetch( RETURNING id, scheduled, created, status, user_id "#, ) - .bind(textsender_models::message::scheduling::PROCESSING) - .bind(textsender_models::message::scheduling::READY) + .bind(schedtxt_models::message::scheduling::PROCESSING) + .bind(schedtxt_models::message::scheduling::READY) .fetch_one(pool) .await { @@ -136,14 +136,14 @@ pub async fn update_status( async fn parse_row( row: &sqlx::postgres::PgRow, -) -> Result { +) -> Result { let id: uuid::Uuid = row.try_get("id")?; let scheduled: time::OffsetDateTime = row.try_get("scheduled")?; let status: String = row.try_get("status")?; let created: time::OffsetDateTime = row.try_get("created")?; let user_id: uuid::Uuid = row.try_get("user_id")?; - Ok(textsender_models::message::scheduling::ScheduledMessage { + Ok(schedtxt_models::message::scheduling::ScheduledMessage { id, scheduled: Some(scheduled), created: Some(created), @@ -157,7 +157,7 @@ pub mod sched_msg_event { pub async fn insert( pool: &sqlx::PgPool, - scheduled_message_event: &textsender_models::message::scheduling::ScheduledMessageEvent, + scheduled_message_event: &schedtxt_models::message::scheduling::ScheduledMessageEvent, ) -> Result<(uuid::Uuid, time::OffsetDateTime), sqlx::Error> { match sqlx::query( r#" @@ -183,7 +183,7 @@ pub mod sched_msg_event { pub async fn get( pool: &sqlx::PgPool, id: &uuid::Uuid, - ) -> Result { + ) -> Result { match sqlx::query( r#" SELECT id, contact_id, message_id, scheduled_message_id, created FROM "scheduled_message_events" @@ -206,8 +206,7 @@ pub mod sched_msg_event { pub async fn get_with_scheduled_message_id( pool: &sqlx::PgPool, scheduled_message_id: &uuid::Uuid, - ) -> Result, sqlx::Error> - { + ) -> Result, sqlx::Error> { match sqlx::query( r#" SELECT id, contact_id, message_id, scheduled_message_id, created FROM "scheduled_message_events" @@ -220,7 +219,7 @@ pub mod sched_msg_event { .await { Ok(rows) => { - let mut scheduled_message_events: Vec = + let mut scheduled_message_events: Vec = Vec::new(); for row in rows { match parse_row(&row).await { @@ -241,7 +240,7 @@ pub mod sched_msg_event { pub async fn delete( pool: &sqlx::PgPool, - scheduled_message_event: &textsender_models::message::scheduling::ScheduledMessageEvent, + scheduled_message_event: &schedtxt_models::message::scheduling::ScheduledMessageEvent, ) -> Result<(), sqlx::Error> { match sqlx::query( r#" @@ -260,7 +259,7 @@ pub mod sched_msg_event { async fn parse_row( row: &sqlx::postgres::PgRow, - ) -> Result { + ) -> Result { let id: uuid::Uuid = row.try_get("id")?; let contact_id: uuid::Uuid = row.try_get("contact_id")?; let message_id: uuid::Uuid = row.try_get("message_id")?; @@ -268,7 +267,7 @@ pub mod sched_msg_event { let created: time::OffsetDateTime = row.try_get("created")?; Ok( - textsender_models::message::scheduling::ScheduledMessageEvent { + schedtxt_models::message::scheduling::ScheduledMessageEvent { id, contact_id, message_id, diff --git a/tests/test.rs b/tests/test.rs index 4a63a09..5bdc08c 100644 --- a/tests/test.rs +++ b/tests/test.rs @@ -6,7 +6,7 @@ mod db_mgr { pub const LIMIT: usize = 6; pub async fn get_pool() -> Result { - let tm_db_url = textsender_models::envy::environment::get_db_url().value; + let tm_db_url = schedtxt_models::envy::environment::get_db_url().value; let tm_options = sqlx::postgres::PgConnectOptions::from_str(&tm_db_url).unwrap(); sqlx::PgPool::connect_with(tm_options).await } @@ -18,7 +18,7 @@ mod db_mgr { } pub async fn connect_to_db(db_name: &str) -> Result { - let db_url = textsender_models::envy::environment::get_db_url().value; + let db_url = schedtxt_models::envy::environment::get_db_url().value; let options = sqlx::postgres::PgConnectOptions::from_str(&db_url)?.database(db_name); sqlx::PgPool::connect_with(options).await } @@ -77,7 +77,7 @@ mod db_mgr { } pub async fn get_database_name() -> Result> { - let database_url = textsender_models::envy::environment::get_db_url().value; + let database_url = schedtxt_models::envy::environment::get_db_url().value; let parsed_url = url::Url::parse(&database_url)?; if parsed_url.scheme() == "postgres" || parsed_url.scheme() == "postgresql" { @@ -185,17 +185,17 @@ pub fn test_mer_response() -> serde_json::Value { } pub async fn test_token() -> Result { - let key: String = textsender_models::envy::environment::get_secret_main_key().value; + let key: String = schedtxt_models::envy::environment::get_secret_main_key().value; let (message, issuer, audience) = token_fields(); - let token_resource = textsender_models::token::TokenResource { + let token_resource = schedtxt_models::token::TokenResource { message: message, issuer: issuer, audiences: vec![audience], user_id: TEST_USER_ID, }; - match textsender_models::token::create_token(&key, token_resource, time::Duration::hours(1)) { + match schedtxt_models::token::create_token(&key, token_resource, time::Duration::hours(1)) { Ok(access_token) => Ok(access_token.access_token), Err(err) => Err(err), } @@ -372,7 +372,7 @@ mod request { "response": super::super::super::test_mer_response(), "user_id": 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": contact_id, "message_id": message_id }); @@ -430,7 +430,7 @@ mod request { let payload = serde_json::json!({ "scheduled": scheduled, - "status": textsender_models::message::scheduling::PENDING, + "status": schedtxt_models::message::scheduling::PENDING, "user_id": super::super::super::TEST_USER_ID, }); @@ -683,7 +683,7 @@ async fn test_update_contact_names() { let (tm_pool, db_name, pool) = db_mgr::get_database_ready().await; let app = init::app(pool).await; - let mut opt_contact: Option = None; + let mut opt_contact: Option = None; // Send request match request::create_contact(&app).await { @@ -786,7 +786,7 @@ async fn test_create_message() { async fn test_get_message() { let (tm_pool, db_name, pool) = db_mgr::get_database_ready().await; let app = init::app(pool).await; - let mut message_result: Option = None; + let mut message_result: Option = None; // Send request match request::message::create_message(&app).await { @@ -1239,7 +1239,7 @@ async fn test_update_scheduled_message_status() { match request::message::scheduling::update_scheduled_message_status( &app, &scheduled_message_id, - textsender_models::message::scheduling::READY, + schedtxt_models::message::scheduling::READY, ) .await { @@ -1333,7 +1333,7 @@ async fn test_fetch_scheduled_message() { match request::message::scheduling::update_scheduled_message_status( &app, &scheduled_message_id, - textsender_models::message::scheduling::READY, + schedtxt_models::message::scheduling::READY, ) .await { @@ -1443,7 +1443,7 @@ async fn test_record_message_event_response() { match request::message::scheduling::update_scheduled_message_status( &app, &scheduled_message_id, - textsender_models::message::scheduling::READY, + schedtxt_models::message::scheduling::READY, ) .await { @@ -1580,7 +1580,7 @@ async fn test_get_message_event_response() { match request::message::scheduling::update_scheduled_message_status( &app, &scheduled_message_id, - textsender_models::message::scheduling::READY, + schedtxt_models::message::scheduling::READY, ) .await {