From a78078bddd435bf07b98ed2908899d0dc83b3394 Mon Sep 17 00:00:00 2001 From: phoenix Date: Wed, 17 Jun 2026 17:08:21 -0400 Subject: [PATCH] Code cleanup --- src/caller/message/scheduling.rs | 24 +++++++++++++++--------- src/config/mod.rs | 8 ++++---- src/repo/scheduling.rs | 1 - 3 files changed, 19 insertions(+), 14 deletions(-) diff --git a/src/caller/message/scheduling.rs b/src/caller/message/scheduling.rs index 67c1b89..de9f85e 100644 --- a/src/caller/message/scheduling.rs +++ b/src/caller/message/scheduling.rs @@ -24,7 +24,7 @@ pub mod response { #[derive(Debug, Default, Deserialize, Serialize, ToSchema)] pub struct ScheduleMessageResponse { pub message: String, - pub data: Vec + pub data: Vec, } } @@ -61,12 +61,14 @@ pub mod endpoint { (axum::http::StatusCode::BAD_REQUEST, axum::Json(response)) } else { if can_schedule(&payload.scheduled) { - let mut scheduled_message = textsender_models::message::scheduling::ScheduledMessage { - scheduled: payload.scheduled, - status: payload.status, - ..Default::default() - }; - match scheduling_repo::insert(&pool, &scheduled_message, &payload.user_id).await { + let mut scheduled_message = + textsender_models::message::scheduling::ScheduledMessage { + scheduled: payload.scheduled, + status: payload.status, + ..Default::default() + }; + match scheduling_repo::insert(&pool, &scheduled_message, &payload.user_id).await + { Ok((id, created)) => { scheduled_message.id = id; scheduled_message.created = Some(created); @@ -78,7 +80,10 @@ pub mod endpoint { Err(err) => { eprintln!("Error: {err:?}"); response.message = String::from("Error inserting"); - (axum::http::StatusCode::INTERNAL_SERVER_ERROR, axum::Json(response)) + ( + axum::http::StatusCode::INTERNAL_SERVER_ERROR, + axum::Json(response), + ) } } } else { @@ -93,6 +98,7 @@ pub mod endpoint { } fn can_schedule(scheduled_time: &Option) -> bool { - scheduled_time.is_some_and(|t| t - time::OffsetDateTime::now_utc() >= time::Duration::minutes(10)) + scheduled_time + .is_some_and(|t| t - time::OffsetDateTime::now_utc() >= time::Duration::minutes(10)) } } diff --git a/src/config/mod.rs b/src/config/mod.rs index 08c7dd9..7199ff2 100644 --- a/src/config/mod.rs +++ b/src/config/mod.rs @@ -22,8 +22,8 @@ pub mod init { use contact_caller::response as contact_responses; use message_caller::endpoint as message_endpoints; use message_caller::response as message_responses; - use scheduling_caller::response as scheduling_responses; use scheduling_caller::endpoint as scheduling_endpoints; + use scheduling_caller::response as scheduling_responses; mod cors { pub async fn configure_cors() -> tower_http::cors::CorsLayer { @@ -126,9 +126,9 @@ pub mod init { ) .route( crate::caller::endpoints::SCHEDULE_MESSAGE, - post(scheduling_endpoints::schedule_message).route_layer(axum::middleware::from_fn( - crate::auth::auth::, - )), + post(scheduling_endpoints::schedule_message).route_layer( + axum::middleware::from_fn(crate::auth::auth::), + ), ) .layer(cors::configure_cors().await) } diff --git a/src/repo/scheduling.rs b/src/repo/scheduling.rs index 9f87472..b03e93c 100644 --- a/src/repo/scheduling.rs +++ b/src/repo/scheduling.rs @@ -25,4 +25,3 @@ pub async fn insert( Err(_) => Err(sqlx::Error::RowNotFound), } } -