From cfc8897ca5c5f4a7601c02ab9dc7c3109c8bf57e Mon Sep 17 00:00:00 2001 From: phoenix Date: Fri, 19 Jun 2026 16:15:05 -0400 Subject: [PATCH 1/9] Adding constant for endpoint --- src/caller/mod.rs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/caller/mod.rs b/src/caller/mod.rs index 6821497..b8ef7dd 100644 --- a/src/caller/mod.rs +++ b/src/caller/mod.rs @@ -18,6 +18,8 @@ pub mod endpoints { pub const SCHEDULE_MESSAGE: &str = "/api/v1/schedule/message"; /// Constant for getting scheduled message endpoint pub const GET_SCHEDULE_MESSAGE: &str = "/api/v1/schedule/message"; + /// Constant for updating scheduled message status endpoint + pub const UPDATE_SCHEDULED_MESSAGE_STATUS: &str = "/api/v1/schedule/message/status/update"; /// Constant for creating Scheduled Message Event endpoint pub const CREATE_SCHEDULED_MESSAGE_EVENT: &str = "/api/v1/schedule/message/event"; /// Constant for getting Scheduled Message Event endpoint -- 2.47.3 From c9e66e228d9c7442290e4ad507a73dfebcc1bc43 Mon Sep 17 00:00:00 2001 From: phoenix Date: Fri, 19 Jun 2026 16:21:58 -0400 Subject: [PATCH 2/9] Adding query to update status of scheduled message --- src/repo/message/scheduling.rs | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/src/repo/message/scheduling.rs b/src/repo/message/scheduling.rs index 5e3fe71..8e7a7dc 100644 --- a/src/repo/message/scheduling.rs +++ b/src/repo/message/scheduling.rs @@ -84,6 +84,27 @@ pub async fn get_with_user_id( } } +pub async fn update_status( + pool: &sqlx::PgPool, + id: &uuid::Uuid, + status: &str, + ) -> Result<(), sqlx::Error> { + match sqlx::query( + r#" + UPDATE "scheduled_message" SET status = $1 WHERE id = $2; + "#, + ) + .bind(status) + .bind(id) + .execute(pool) + .await { + Ok(_row) => { + Ok(()) + } + Err(err) => Err(err) + } +} + async fn parse_row( row: &sqlx::postgres::PgRow, ) -> Result { -- 2.47.3 From 8b9acd3491acdb4663e7724175f3f66e08c88d4b Mon Sep 17 00:00:00 2001 From: phoenix Date: Fri, 19 Jun 2026 16:40:10 -0400 Subject: [PATCH 3/9] Making endpoint available --- src/caller/message/scheduling.rs | 78 ++++++++++++++++++++++++++++++++ src/config/mod.rs | 6 +++ 2 files changed, 84 insertions(+) diff --git a/src/caller/message/scheduling.rs b/src/caller/message/scheduling.rs index 161673d..66664ed 100644 --- a/src/caller/message/scheduling.rs +++ b/src/caller/message/scheduling.rs @@ -42,6 +42,18 @@ pub mod request { pub id: Option, pub scheduled_message_id: Option, } + + #[derive(Debug, Default, Deserialize, Serialize, ToSchema)] + pub struct UpdateScheduledMessageStatusRequest { + pub status: String, + pub scheduled_message_id: uuid::Uuid + } + + impl UpdateScheduledMessageStatusRequest { + pub fn is_valid(&self) -> bool { + !self.status.is_empty() || !self.scheduled_message_id.is_nil() + } + } } pub mod response { @@ -69,6 +81,17 @@ pub mod response { pub use CreateScheduleMessageEventResponse as GetScheduledMessageEventResponse; pub use CreateScheduleMessageEventResponse as DeleteScheduledMessageEventResponse; + + #[derive(Debug, Default, Deserialize, Serialize, ToSchema)] + pub struct UpdateScheduledMessageStatusResponse { + pub message: String, + pub data: Vec, + } + + #[derive(Debug, Default, Deserialize, Serialize, ToSchema)] + pub struct ChangedStatus { + pub old_status: String, + } } pub mod endpoint { @@ -208,6 +231,61 @@ pub mod endpoint { .is_some_and(|t| t - time::OffsetDateTime::now_utc() >= time::Duration::minutes(10)) } + /// Endpoint to update status of Scheduled Message + #[utoipa::path( + patch, + path = crate::caller::endpoints::UPDATE_SCHEDULED_MESSAGE_STATUS, + request_body( + content = super::request::UpdateScheduledMessageStatusRequest, + description = "Data needed to update status of Scheduled Message", + content_type = "application/json" + ), + responses( + (status = 200, description = "Status updated", body = super::response::UpdateScheduledMessageStatusResponse), + (status = 400, description = "Error", body = super::response::UpdateScheduledMessageStatusResponse), + (status = 500, description = "Error updating", body = super::response::UpdateScheduledMessageStatusResponse) + ) +)] + pub async fn update_scheduled_message_status( + axum::Extension(pool): axum::Extension, + axum::Json(payload): axum::Json, + ) -> ( + axum::http::StatusCode, + axum::Json, + ) { + let mut response = super::response::UpdateScheduledMessageStatusResponse::default(); + + if payload.is_valid() { + match scheduling_repo::get(&pool, &payload.scheduled_message_id).await { + Ok(scheduled_message) => { + let old_status = scheduled_message.status; + match scheduling_repo::update_status(&pool, &scheduled_message.id, &payload.status).await { + Ok(_) => { + response.message = String::from(super::super::super::response::SUCCESSFUL); + response.data = vec![super::response::ChangedStatus { + old_status, + }]; + (axum::http::StatusCode::OK, axum::Json(response)) + } + Err(err) => { + eprintln!("Error: {err:?}"); + response.message = String::from("Invalid"); + (axum::http::StatusCode::INTERNAL_SERVER_ERROR, axum::Json(response)) + } + } + } + Err(err) => { + eprintln!("Error: {err:?}"); + response.message = String::from("Invalid"); + (axum::http::StatusCode::BAD_REQUEST, axum::Json(response)) + } + } + } else { + response.message = String::from("Request body is not valid"); + (axum::http::StatusCode::BAD_REQUEST, axum::Json(response)) + } + } + /// Endpoint to create a Scheudled Message Event #[utoipa::path( post, diff --git a/src/config/mod.rs b/src/config/mod.rs index 6eea69c..d09b4e0 100644 --- a/src/config/mod.rs +++ b/src/config/mod.rs @@ -154,6 +154,12 @@ pub mod init { axum::middleware::from_fn(crate::auth::auth::), ), ) + .route( + crate::caller::endpoints::UPDATE_SCHEDULED_MESSAGE_STATUS, + patch(scheduling_endpoints::update_scheduled_message_status).route_layer( + axum::middleware::from_fn(crate::auth::auth::), + ), + ) .layer(cors::configure_cors().await) } -- 2.47.3 From 983528ba62b06fee45eca0cd0470c048aa1ddd15 Mon Sep 17 00:00:00 2001 From: phoenix Date: Fri, 19 Jun 2026 16:40:24 -0400 Subject: [PATCH 4/9] cargo fmt --- src/caller/message/scheduling.rs | 22 +++++++++++++++------- src/repo/message/scheduling.rs | 21 ++++++++++----------- 2 files changed, 25 insertions(+), 18 deletions(-) diff --git a/src/caller/message/scheduling.rs b/src/caller/message/scheduling.rs index 66664ed..b1b8ae6 100644 --- a/src/caller/message/scheduling.rs +++ b/src/caller/message/scheduling.rs @@ -46,7 +46,7 @@ pub mod request { #[derive(Debug, Default, Deserialize, Serialize, ToSchema)] pub struct UpdateScheduledMessageStatusRequest { pub status: String, - pub scheduled_message_id: uuid::Uuid + pub scheduled_message_id: uuid::Uuid, } impl UpdateScheduledMessageStatusRequest { @@ -259,18 +259,26 @@ pub mod endpoint { match scheduling_repo::get(&pool, &payload.scheduled_message_id).await { Ok(scheduled_message) => { let old_status = scheduled_message.status; - match scheduling_repo::update_status(&pool, &scheduled_message.id, &payload.status).await { + match scheduling_repo::update_status( + &pool, + &scheduled_message.id, + &payload.status, + ) + .await + { Ok(_) => { - response.message = String::from(super::super::super::response::SUCCESSFUL); - response.data = vec![super::response::ChangedStatus { - old_status, - }]; + response.message = + String::from(super::super::super::response::SUCCESSFUL); + response.data = vec![super::response::ChangedStatus { old_status }]; (axum::http::StatusCode::OK, axum::Json(response)) } Err(err) => { eprintln!("Error: {err:?}"); response.message = String::from("Invalid"); - (axum::http::StatusCode::INTERNAL_SERVER_ERROR, axum::Json(response)) + ( + axum::http::StatusCode::INTERNAL_SERVER_ERROR, + axum::Json(response), + ) } } } diff --git a/src/repo/message/scheduling.rs b/src/repo/message/scheduling.rs index 8e7a7dc..e4553fb 100644 --- a/src/repo/message/scheduling.rs +++ b/src/repo/message/scheduling.rs @@ -88,21 +88,20 @@ pub async fn update_status( pool: &sqlx::PgPool, id: &uuid::Uuid, status: &str, - ) -> Result<(), sqlx::Error> { +) -> Result<(), sqlx::Error> { match sqlx::query( r#" UPDATE "scheduled_message" SET status = $1 WHERE id = $2; "#, - ) - .bind(status) - .bind(id) - .execute(pool) - .await { - Ok(_row) => { - Ok(()) - } - Err(err) => Err(err) - } + ) + .bind(status) + .bind(id) + .execute(pool) + .await + { + Ok(_row) => Ok(()), + Err(err) => Err(err), + } } async fn parse_row( -- 2.47.3 From 3c1d06d7c8ca8c8679775421dc11a6c96413aa25 Mon Sep 17 00:00:00 2001 From: phoenix Date: Fri, 19 Jun 2026 16:44:17 -0400 Subject: [PATCH 5/9] Fixing query issue --- src/repo/message/scheduling.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/repo/message/scheduling.rs b/src/repo/message/scheduling.rs index e4553fb..36141a8 100644 --- a/src/repo/message/scheduling.rs +++ b/src/repo/message/scheduling.rs @@ -91,7 +91,7 @@ pub async fn update_status( ) -> Result<(), sqlx::Error> { match sqlx::query( r#" - UPDATE "scheduled_message" SET status = $1 WHERE id = $2; + UPDATE "scheduled_messages" SET status = $1 WHERE id = $2; "#, ) .bind(status) -- 2.47.3 From 34d5da025fc1302cae532412a81c825ad0208028 Mon Sep 17 00:00:00 2001 From: phoenix Date: Fri, 19 Jun 2026 16:51:52 -0400 Subject: [PATCH 6/9] Added test --- tests/test.rs | 108 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 108 insertions(+) diff --git a/tests/test.rs b/tests/test.rs index 2293c90..94990b2 100644 --- a/tests/test.rs +++ b/tests/test.rs @@ -377,6 +377,26 @@ mod request { } } + pub async fn update_scheduled_message_status( + app: &axum::Router, + id: &uuid::Uuid, + updated_status: &str, + ) -> Result { + let uri = textsender_api::caller::endpoints::UPDATE_SCHEDULED_MESSAGE_STATUS; + let payload = serde_json::json!({ + "scheduled_message_id": id, + "status": updated_status + }); + + match super::super::run_post(Some(&payload), &uri, axum::http::Method::PATCH, true).await { + Ok(req) => match app.clone().oneshot(req).await { + Ok(response) => Ok(response), + Err(err) => Err(axum::http::Error::from(err)), + }, + Err(err) => Err(err), + } + } + pub async fn create_scheduled_message_event( app: &axum::Router, contact_id: &uuid::Uuid, @@ -1027,3 +1047,91 @@ async fn test_delete_scheduled_message_event() { let _ = db_mgr::drop_database(&tm_pool, &db_name).await; } + +#[tokio::test] +async fn test_update_scheduled_message_status() { + let (tm_pool, db_name, pool) = db_mgr::get_database_ready().await; + let app = init::app(pool).await; + + let mut contact_id: uuid::Uuid = uuid::Uuid::nil(); + let mut message_id: uuid::Uuid = uuid::Uuid::nil(); + let mut scheduled_message_id: uuid::Uuid = uuid::Uuid::nil(); + + match request::create_contact(&app).await { + Ok(response) => { + let resp = util::get_resp_data::< + textsender_api::caller::contact::response::AddContactResponse, + >(response) + .await; + assert_eq!(false, resp.data.is_empty(), "Should not be empty"); + contact_id = resp.data[0].id.unwrap(); + } + Err(err) => { + assert!(false, "Error: {:?}", err); + } + }; + + match request::message::create_message(&app).await { + Ok(response) => { + let resp = util::get_resp_data::< + textsender_api::caller::message::response::AddMessageResponse, + >(response) + .await; + assert_eq!(false, resp.data.is_empty(), "Should not be empty"); + let message = &resp.data[0]; + message_id = message.id.unwrap(); + } + Err(err) => { + assert!(false, "Error: {:?}", err); + } + }; + + match request::message::scheduling::create_scheduled_message(&app).await { + Ok(response) => { + let resp = util::get_resp_data::< + textsender_api::caller::message::scheduling::response::ScheduleMessageResponse, + >(response) + .await; + assert_eq!(false, resp.data.is_empty(), "Should not be empty"); + scheduled_message_id = resp.data[0].id; + } + Err(err) => { + assert!(false, "Error: {err:?}"); + } + } + + match request::message::scheduling::create_scheduled_message_event( + &app, + &contact_id, + &message_id, + &scheduled_message_id, + ) + .await + { + Ok(response) => { + let resp = util::get_resp_data::< + textsender_api::caller::message::scheduling::response::CreateScheduleMessageEventResponse, + >(response) + .await; + assert_eq!(false, resp.data.is_empty(), "Should not be empty"); + } + Err(err) => { + assert!(false, "Error: {err:?}"); + } + } + + match request::message::scheduling::update_scheduled_message_status(&app, &scheduled_message_id, textsender_models::message::scheduling::READY).await { + Ok(response) => { + let resp = util::get_resp_data::< + textsender_api::caller::message::scheduling::response::UpdateScheduledMessageStatusResponse, + >(response) + .await; + assert_eq!(false, resp.data.is_empty(), "Should not be empty"); + } + Err(err) => { + assert!(false, "Error: {err:?}"); + } + } + + let _ = db_mgr::drop_database(&tm_pool, &db_name).await; +} -- 2.47.3 From 5721990f5f230474272dd44b86926615ed11b030 Mon Sep 17 00:00:00 2001 From: phoenix Date: Fri, 19 Jun 2026 16:56:51 -0400 Subject: [PATCH 7/9] Adding check --- src/caller/message/scheduling.rs | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/caller/message/scheduling.rs b/src/caller/message/scheduling.rs index b1b8ae6..870499a 100644 --- a/src/caller/message/scheduling.rs +++ b/src/caller/message/scheduling.rs @@ -51,7 +51,18 @@ pub mod request { impl UpdateScheduledMessageStatusRequest { pub fn is_valid(&self) -> bool { - !self.status.is_empty() || !self.scheduled_message_id.is_nil() + if !self.status.is_empty() || !self.scheduled_message_id.is_nil() { + if 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 { + true + } else { + false + } + } else { + false + } } } } -- 2.47.3 From 700bc61d92463aa9a3c25c335c5c3b7a7e31bf56 Mon Sep 17 00:00:00 2001 From: phoenix Date: Fri, 19 Jun 2026 17:06:30 -0400 Subject: [PATCH 8/9] There it goes --- src/caller/message/scheduling.rs | 58 ++++++++++++++++++-------------- tests/test.rs | 12 +++++-- 2 files changed, 42 insertions(+), 28 deletions(-) diff --git a/src/caller/message/scheduling.rs b/src/caller/message/scheduling.rs index 870499a..af1eef7 100644 --- a/src/caller/message/scheduling.rs +++ b/src/caller/message/scheduling.rs @@ -51,12 +51,13 @@ pub mod request { impl UpdateScheduledMessageStatusRequest { pub fn is_valid(&self) -> bool { - if !self.status.is_empty() || !self.scheduled_message_id.is_nil() { - if 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 { - true + if !self.status.is_empty() || !self.scheduled_message_id.is_nil() { + if 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 + { + true } else { false } @@ -270,26 +271,31 @@ pub mod endpoint { match scheduling_repo::get(&pool, &payload.scheduled_message_id).await { Ok(scheduled_message) => { let old_status = scheduled_message.status; - match scheduling_repo::update_status( - &pool, - &scheduled_message.id, - &payload.status, - ) - .await - { - Ok(_) => { - response.message = - String::from(super::super::super::response::SUCCESSFUL); - response.data = vec![super::response::ChangedStatus { old_status }]; - (axum::http::StatusCode::OK, axum::Json(response)) - } - Err(err) => { - eprintln!("Error: {err:?}"); - response.message = String::from("Invalid"); - ( - axum::http::StatusCode::INTERNAL_SERVER_ERROR, - axum::Json(response), - ) + if old_status == payload.status { + response.message = String::from("No change"); + (axum::http::StatusCode::NOT_MODIFIED, axum::Json(response)) + } else { + match scheduling_repo::update_status( + &pool, + &scheduled_message.id, + &payload.status, + ) + .await + { + Ok(_) => { + response.message = + String::from(super::super::super::response::SUCCESSFUL); + response.data = vec![super::response::ChangedStatus { old_status }]; + (axum::http::StatusCode::OK, axum::Json(response)) + } + Err(err) => { + eprintln!("Error: {err:?}"); + response.message = String::from("Invalid"); + ( + axum::http::StatusCode::INTERNAL_SERVER_ERROR, + axum::Json(response), + ) + } } } } diff --git a/tests/test.rs b/tests/test.rs index 94990b2..1519c09 100644 --- a/tests/test.rs +++ b/tests/test.rs @@ -388,7 +388,9 @@ mod request { "status": updated_status }); - match super::super::run_post(Some(&payload), &uri, axum::http::Method::PATCH, true).await { + match super::super::run_post(Some(&payload), &uri, axum::http::Method::PATCH, true) + .await + { Ok(req) => match app.clone().oneshot(req).await { Ok(response) => Ok(response), Err(err) => Err(axum::http::Error::from(err)), @@ -1120,7 +1122,13 @@ async fn test_update_scheduled_message_status() { } } - match request::message::scheduling::update_scheduled_message_status(&app, &scheduled_message_id, textsender_models::message::scheduling::READY).await { + match request::message::scheduling::update_scheduled_message_status( + &app, + &scheduled_message_id, + textsender_models::message::scheduling::READY, + ) + .await + { Ok(response) => { let resp = util::get_resp_data::< textsender_api::caller::message::scheduling::response::UpdateScheduledMessageStatusResponse, -- 2.47.3 From caf1a96bff2132b5b4cfa45a394f5acb1a7927ba Mon Sep 17 00:00:00 2001 From: phoenix Date: Fri, 19 Jun 2026 17:06:55 -0400 Subject: [PATCH 9/9] bump: textsender_api --- Cargo.lock | 2 +- Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index baf05a9..eae15e8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2277,7 +2277,7 @@ dependencies = [ [[package]] name = "textsender_api" -version = "0.1.13" +version = "0.1.14" dependencies = [ "axum", "axum-extra", diff --git a/Cargo.toml b/Cargo.toml index 4cc484c..80587bf 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "textsender_api" -version = "0.1.13" +version = "0.1.14" edition = "2024" rust-version = "1.96" -- 2.47.3