cargo fmt
Rust Build / Rustfmt (pull_request) Successful in 40s
Rust Build / Test Suite (pull_request) Successful in 46s

This commit is contained in:
2026-06-19 15:58:20 -04:00
parent bafb62d506
commit 7c6d82015c
3 changed files with 33 additions and 23 deletions
+7 -3
View File
@@ -358,7 +358,6 @@ pub mod endpoint {
(axum::http::StatusCode::OK, axum::Json(response)) (axum::http::StatusCode::OK, axum::Json(response))
} }
/// Endpoint to delete the Scheduled Message Event /// Endpoint to delete the Scheduled Message Event
#[utoipa::path( #[utoipa::path(
delete, delete,
@@ -380,7 +379,9 @@ pub mod endpoint {
let mut response = super::response::DeleteScheduledMessageEventResponse::default(); let mut response = super::response::DeleteScheduledMessageEventResponse::default();
match scheduling_repo::sched_msg_event::get(&pool, &id).await { match scheduling_repo::sched_msg_event::get(&pool, &id).await {
Ok(scheduled_message_event) => { Ok(scheduled_message_event) => {
match scheduling_repo::sched_msg_event::delete(&pool, &scheduled_message_event).await { match scheduling_repo::sched_msg_event::delete(&pool, &scheduled_message_event)
.await
{
Ok(_) => { Ok(_) => {
response.message = String::from(super::super::super::response::SUCCESSFUL); response.message = String::from(super::super::super::response::SUCCESSFUL);
response.data.push(scheduled_message_event); response.data.push(scheduled_message_event);
@@ -389,7 +390,10 @@ pub mod endpoint {
Err(err) => { Err(err) => {
eprintln!("Error: {err:?}"); eprintln!("Error: {err:?}");
response.message = String::from("Error deleting"); response.message = String::from("Error deleting");
(axum::http::StatusCode::INTERNAL_SERVER_ERROR, axum::Json(response)) (
axum::http::StatusCode::INTERNAL_SERVER_ERROR,
axum::Json(response),
)
} }
} }
} }
+13 -16
View File
@@ -189,27 +189,24 @@ pub mod sched_msg_event {
} }
} }
pub async fn delete( pub async fn delete(
pool: &sqlx::PgPool, pool: &sqlx::PgPool,
scheduled_message_event: &textsender_models::message::scheduling::ScheduledMessageEvent, scheduled_message_event: &textsender_models::message::scheduling::ScheduledMessageEvent,
) -> Result<(), sqlx::Error> { ) -> Result<(), sqlx::Error> {
match sqlx::query( match sqlx::query(
r#" r#"
DELETE FROM "scheduled_message_events" DELETE FROM "scheduled_message_events"
WHERE id = $1 WHERE id = $1
"#, "#,
) )
.bind(scheduled_message_event.id) .bind(scheduled_message_event.id)
.execute(pool) .execute(pool)
.await { .await
Ok(_) => { {
Ok(()) Ok(_) => Ok(()),
} Err(err) => Err(err),
Err(err) => {
Err(err)
} }
} }
}
async fn parse_row( async fn parse_row(
row: &sqlx::postgres::PgRow, row: &sqlx::postgres::PgRow,
+13 -4
View File
@@ -437,7 +437,11 @@ mod request {
scheduled_message_id scheduled_message_id
); );
*/ */
let uri = super::super::super::util::format_url_with_value(textsender_api::caller::endpoints::DELETE_SCHEDULED_MESSAGE_EVENT, scheduled_message_event_id).await; let uri = super::super::super::util::format_url_with_value(
textsender_api::caller::endpoints::DELETE_SCHEDULED_MESSAGE_EVENT,
scheduled_message_event_id,
)
.await;
println!("Link: {uri:?}"); println!("Link: {uri:?}");
match super::super::run_post(None, &uri, axum::http::Method::DELETE, false).await { match super::super::run_post(None, &uri, axum::http::Method::DELETE, false).await {
@@ -1006,13 +1010,18 @@ async fn test_delete_scheduled_message_event() {
.await; .await;
assert_eq!(false, resp.data.is_empty(), "Should not be empty"); assert_eq!(false, resp.data.is_empty(), "Should not be empty");
let scheduled_message_event = &resp.data[0]; let scheduled_message_event = &resp.data[0];
match request::message::scheduling::delete_scheduled_message_event(&app, &scheduled_message_event.id).await { match request::message::scheduling::delete_scheduled_message_event(
&app,
&scheduled_message_event.id,
)
.await
{
Ok(response) => { Ok(response) => {
let resp = util::get_resp_data::< let resp = util::get_resp_data::<
textsender_api::caller::message::scheduling::response::DeleteScheduledMessageEventResponse, textsender_api::caller::message::scheduling::response::DeleteScheduledMessageEventResponse,
>(response) >(response)
.await; .await;
assert_eq!(false, resp.data.is_empty(), "Should not be empty"); assert_eq!(false, resp.data.is_empty(), "Should not be empty");
} }
Err(err) => { Err(err) => {
assert!(false, "Error: {err:?}"); assert!(false, "Error: {err:?}");