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

cargo fmt
Rust Build / Test Suite (pull_request) Successful in 41s
Details
Rust Build / Rustfmt (pull_request) Successful in 42s
Details

Browse Source
This commit is contained in:
phoenix
2026-06-18 17:11:05 -04:00
parent cb81d0479f
commit 06c1567384
2 changed files with 33 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/caller/message/scheduling.rs
+22 -30
View File
@@ -31,7 +31,9 @@ pub mod request {
impl CreateScheduleMessageEventRequest { impl CreateScheduleMessageEventRequest {
pub fn is_valid(&self) -> bool { pub fn is_valid(&self) -> bool {
!self.contact_id.is_nil() || !self.message_id.is_nil() || !self.scheduled_message_id.is_nil() !self.contact_id.is_nil()
|| !self.message_id.is_nil()
|| !self.scheduled_message_id.is_nil()
} }
} }
} }
@@ -60,9 +62,9 @@ pub mod response {
} }
pub mod endpoint { pub mod endpoint {
use crate::repo::contact as contact_repo;
use crate::repo::message as message_repo; use crate::repo::message as message_repo;
use message_repo::scheduling as scheduling_repo; use message_repo::scheduling as scheduling_repo;
use crate::repo::contact as contact_repo;
/// Endpoint to create a Scheudled Message /// Endpoint to create a Scheudled Message
#[utoipa::path( #[utoipa::path(
@@ -196,7 +198,6 @@ pub mod endpoint {
.is_some_and(|t| t - time::OffsetDateTime::now_utc() >= time::Duration::minutes(10)) .is_some_and(|t| t - time::OffsetDateTime::now_utc() >= time::Duration::minutes(10))
} }
/// Endpoint to create a Scheudled Message Event /// Endpoint to create a Scheudled Message Event
#[utoipa::path( #[utoipa::path(
post, post,
@@ -223,38 +224,29 @@ pub mod endpoint {
if payload.is_valid() { if payload.is_valid() {
match scheduling_repo::get(&pool, &payload.scheduled_message_id).await { match scheduling_repo::get(&pool, &payload.scheduled_message_id).await {
Ok(_) => { } Ok(_) => {}
Err(err) => { Err(err) => {
eprintln!("Error: {err:?}"); eprintln!("Error: {err:?}");
response.message = String::from("Scheduled Message does not exist"); response.message = String::from("Scheduled Message does not exist");
return ( return (axum::http::StatusCode::BAD_REQUEST, axum::Json(response));
axum::http::StatusCode::BAD_REQUEST,
axum::Json(response),
);
} }
} }
match contact_repo::get(&pool, &payload.contact_id).await { match contact_repo::get(&pool, &payload.contact_id).await {
Ok(_) => { } Ok(_) => {}
Err(err) => { Err(err) => {
eprintln!("Error: {err:?}"); eprintln!("Error: {err:?}");
response.message = String::from("Contact does not exist"); response.message = String::from("Contact does not exist");
return ( return (axum::http::StatusCode::BAD_REQUEST, axum::Json(response));
axum::http::StatusCode::BAD_REQUEST,
axum::Json(response),
);
} }
} }
match message_repo::get(&pool, &payload.message_id).await { match message_repo::get(&pool, &payload.message_id).await {
Ok(_) => { } Ok(_) => {}
Err(err) => { Err(err) => {
eprintln!("Error: {err:?}"); eprintln!("Error: {err:?}");
response.message = String::from("Contact does not exist"); response.message = String::from("Contact does not exist");
return ( return (axum::http::StatusCode::BAD_REQUEST, axum::Json(response));
axum::http::StatusCode::BAD_REQUEST,
axum::Json(response),
);
} }
} }
@@ -273,12 +265,12 @@ pub mod endpoint {
(axum::http::StatusCode::CREATED, axum::Json(response)) (axum::http::StatusCode::CREATED, axum::Json(response))
} }
Err(err) => { Err(err) => {
eprintln!("Error: {err:?}"); eprintln!("Error: {err:?}");
response.message = String::from("Error inserting"); response.message = String::from("Error inserting");
( (
axum::http::StatusCode::INTERNAL_SERVER_ERROR, axum::http::StatusCode::INTERNAL_SERVER_ERROR,
axum::Json(response), axum::Json(response),
) )
} }
} }
} else { } else {
src/repo/message/scheduling.rs
+11 -8
View File
@@ -156,7 +156,8 @@ pub mod sched_msg_event {
pub async fn get_with_scheduled_message_id( pub async fn get_with_scheduled_message_id(
pool: &sqlx::PgPool, pool: &sqlx::PgPool,
scheduled_message_id: &uuid::Uuid, scheduled_message_id: &uuid::Uuid,
) -> Result<Vec<textsender_models::message::scheduling::ScheduledMessageEvent>, sqlx::Error> { ) -> Result<Vec<textsender_models::message::scheduling::ScheduledMessageEvent>, sqlx::Error>
{
match sqlx::query( match sqlx::query(
r#" r#"
SELECT id, contact_id, message_id, scheduled_message_id, created FROM "scheduled_message_events" SELECT id, contact_id, message_id, scheduled_message_id, created FROM "scheduled_message_events"
@@ -197,12 +198,14 @@ pub mod sched_msg_event {
let scheduled_message_id: uuid::Uuid = row.try_get("scheduled_message_id")?; let scheduled_message_id: uuid::Uuid = row.try_get("scheduled_message_id")?;
let created: time::OffsetDateTime = row.try_get("created")?; let created: time::OffsetDateTime = row.try_get("created")?;
Ok(textsender_models::message::scheduling::ScheduledMessageEvent { Ok(
id, textsender_models::message::scheduling::ScheduledMessageEvent {
contact_id, id,
message_id, contact_id,
scheduled_message_id, message_id,
created: Some(created), scheduled_message_id,
}) created: Some(created),
},
)
} }
} }