From 1ec248633fa3c1c05b4c915c2373f38ebb1e5e3d Mon Sep 17 00:00:00 2001
From: phoenix <mail@kundeng.us>
Date: Thu, 18 Jun 2026 18:02:02 -0400
Subject: [PATCH] Test changes

---
 tests/test.rs | 70 +++++++++++++++++++++------------------------------
 1 file changed, 28 insertions(+), 42 deletions(-)

diff --git a/tests/test.rs b/tests/test.rs
index 8723bb7..4bbeeae 100644
--- a/tests/test.rs
+++ b/tests/test.rs
@@ -661,8 +661,6 @@ async fn test_schedule_message() {
 
     match request::message::scheduling::create_scheduled_message(&app).await {
         Ok(response) => {
-            eprintln!("Response: {response:?}");
-            println!("Response: {response:?}");
             let resp = util::get_resp_data::<
                 textsender_api::caller::message::scheduling::response::ScheduleMessageResponse,
             >(response)
@@ -686,8 +684,6 @@ async fn test_get_scheduled_message() {
 
     match request::message::scheduling::create_scheduled_message(&app).await {
         Ok(response) => {
-            eprintln!("Response: {response:?}");
-            println!("Response: {response:?}");
             let resp = util::get_resp_data::<
                 textsender_api::caller::message::scheduling::response::ScheduleMessageResponse,
             >(response)
@@ -730,53 +726,43 @@ async fn test_create_scheduled_message() {
     let mut message_id: uuid::Uuid = uuid::Uuid::nil();
     let mut scheduled_message_id: uuid::Uuid = uuid::Uuid::nil();
 
-    use textsender_api::repo;
-
-    let mut contact = textsender_models::contact::Contact {
-        phone_number: String::from(TEST_CONTACT_PHONE_NUMBER),
-        firstname: Some(String::from("Billy")),
-        lastname: Some(String::from("TheKid")),
-        nickname: Some(String::from("billbill9")),
-        user_id: Some(TEST_USER_ID),
-        ..Default::default()
-    };
-    match repo::contact::insert(&tm_pool, &contact).await {
-        Ok(id) => {
-            contact.id = Some(id);
-            contact_id = id;
+    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:?}");
+            assert!(false, "Error: {:?}", err);
         }
-    }
-
-    let mut message = textsender_models::message::Message {
-        content: String::from(TEST_MESSAGE_CONTENT),
-        ..Default::default()
     };
-    match repo::message::insert(&tm_pool, &message, &TEST_USER_ID).await {
-        Ok(id) => {
-            message.id = Some(id);
-            message_id = id;
+
+    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:?}");
+            assert!(false, "Error: {:?}", err);
         }
-    }
-
-    let scheduled_time = test_valid_schedulable_time();
-    let mut scheduled_message = textsender_models::message::scheduling::ScheduledMessage {
-        scheduled: Some(scheduled_time),
-        status: String::from(textsender_models::message::scheduling::PENDING),
-        user_id: TEST_USER_ID,
-        ..Default::default()
     };
 
-    match repo::message::scheduling::insert(&tm_pool, &scheduled_message, &TEST_USER_ID).await {
-        Ok((id, created)) => {
-            scheduled_message.id = id;
-            scheduled_message_id = id;
-            scheduled_message.created = Some(created);
+    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:?}");