diff --git a/src/caller/message/event.rs b/src/caller/message/event.rs index 5de8825..4341d07 100644 --- a/src/caller/message/event.rs +++ b/src/caller/message/event.rs @@ -16,7 +16,13 @@ pub mod request { impl RecordMessageEventRequest { pub fn is_valid(&self) -> bool { - !self.scheduled_message_event_id.is_nil() || !self.response.is_null() || !self.user_id.is_nil() || self.sent.is_some() || !self.status.is_empty() || !self.contact_id.is_nil() || !self.message_id.is_nil() + !self.scheduled_message_event_id.is_nil() + || !self.response.is_null() + || !self.user_id.is_nil() + || self.sent.is_some() + || !self.status.is_empty() + || !self.contact_id.is_nil() + || !self.message_id.is_nil() } } } @@ -71,8 +77,6 @@ pub mod endpoint { ..Default::default() }; - println!("MER: {mer:?}"); - match event_repo::insert(&pool, &mer).await { Ok(id) => { mer.id = id; diff --git a/tests/test.rs b/tests/test.rs index 53e2aa0..3ce1337 100644 --- a/tests/test.rs +++ b/tests/test.rs @@ -154,6 +154,33 @@ pub const TEST_CONTACT_UPDATED_NICKNAME: &str = "The Man in Black"; /// Test message content pub const TEST_MESSAGE_CONTENT: &str = "The wind cries mary"; +pub fn test_mer_response() -> serde_json::Value { + serde_json::json!({ + "account_sid": "34n97yf342y5fc349287yndx3987i4yf5c3w98dy398", + "api_version": "2010-04-01", + "body": "HEALINGHURTS.LETITIN.TONIGHT!GOATROPE.TRASHTHERENTAL.THEGHOSTYOUKNOW.SUMOFTHEBROTHERS.10PM.THESTAMP!VERO.LOVEYOURBLOOD.LOVE&LIGHT🙏🔥", + "date_created": "Sat, 20 Jun 2026 15:45:01 +0000", + "date_sent": null, + "date_updated": "Sat, 20 Jun 2026 15:45:01 +0000", + "direction": "outbound-api", + "error_code": null, + "error_message": null, + "from": "+10123456789", + "messaging_service_sid": "329nc29yrc394ytw37yc4t9w37ytnfdxcw39874ydx98347yr", + "num_media": "0", + "num_segments": "0", + "price": null, + "price_unit": null, + "sid": "34niyt3i47ytfdi37w4ydtrn837q4itfyb3qi4ftciq38w7t83qw49td38dtn", + "status": "accepted", + "subresource_uris": { + "media": "/2010-04-01/Accounts/34n97yf342y5fc349287yndx3987i4yf5c3w98dy398/Messages/329nc29yrc394ytw37yc4t9w37ytnfdxcw39874ydx98347yr/Media.json" + }, + "to": "+11234567890", + "uri": "/2010-04-01/Accounts/34n97yf342y5fc349287yndx3987i4yf5c3w98dy398/Messages/329nc29yrc394ytw37yc4t9w37ytnfdxcw39874ydx98347yr.json" + }) +} + pub async fn test_token() -> Result { let key: String = textsender_models::envy::environment::get_secret_main_key() .await @@ -321,6 +348,43 @@ mod request { } } + pub mod event { + use tower::ServiceExt; + + pub async fn record_message_event_response( + app: &axum::Router, + scheduled_message_event_id: &uuid::Uuid, + user_id: &uuid::Uuid, + contact_id: &uuid::Uuid, + message_id: &uuid::Uuid, + ) -> Result { + let payload = serde_json::json!({ + "scheduled_message_event_id": scheduled_message_event_id, + "response": super::super::super::test_mer_response(), + "user_id": user_id, + "sent": "2026-06-20T17:10:00Z", + "status": textsender_models::message::event::MESSAGE_EVENT_RESPONSE_STATUS_SCHEDULED, + "contact_id": contact_id, + "message_id": message_id + }); + + match super::super::run_post( + Some(&payload), + textsender_api::caller::endpoints::RECORD_MESSAGE_EVENT_RESPONSE, + axum::http::Method::POST, + 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 mod scheduling { use tower::ServiceExt; @@ -1269,3 +1333,140 @@ async fn test_fetch_scheduled_message() { let _ = db_mgr::drop_database(&tm_pool, &db_name).await; } + +#[tokio::test] +async fn test_record_message_event_response() { + 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(); + let mut scheduled_message_event_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"); + let scheduled_message_event = &resp.data[0]; + scheduled_message_event_id = scheduled_message_event.id; + } + 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:?}"); + } + } + + match request::message::scheduling::fetch_scheduled_message(&app).await { + Ok(response) => { + let resp = util::get_resp_data::< + textsender_api::caller::message::scheduling::response::FetchScheduledMessageResponse, + >(response) + .await; + assert_eq!(false, resp.data.is_empty(), "Should not be empty"); + } + Err(err) => { + assert!(false, "Error: {err:?}"); + } + } + + assert_eq!( + false, + scheduled_message_event_id.is_nil(), + "Scheduled Message Event Id should not be empty" + ); + + match request::message::event::record_message_event_response( + &app, + &scheduled_message_event_id, + &TEST_USER_ID, + &contact_id, + &message_id, + ) + .await + { + Ok(response) => { + let resp = util::get_resp_data::< + textsender_api::caller::message::event::response::RecordMessageEventResponse, + >(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; +}