From ff8a443e424baed772854c6ff6a50b5e2d160994 Mon Sep 17 00:00:00 2001
From: dal <dallin@buster.so>
Date: Wed, 19 Mar 2025 14:03:59 -0600
Subject: [PATCH] fixed the created at and the ordering on the get

---
 api/libs/handlers/src/chats/get_chat_handler.rs  | 3 ++-
 api/libs/handlers/src/chats/post_chat_handler.rs | 3 +++
 api/libs/handlers/src/messages/types.rs          | 7 ++++---
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/api/libs/handlers/src/chats/get_chat_handler.rs b/api/libs/handlers/src/chats/get_chat_handler.rs
index 1e31a8c9f..39668cb18 100644
--- a/api/libs/handlers/src/chats/get_chat_handler.rs
+++ b/api/libs/handlers/src/chats/get_chat_handler.rs
@@ -82,7 +82,7 @@ pub async fn get_chat_handler(chat_id: &Uuid, user_id: &Uuid) -> Result<ChatWith
                 .inner_join(users::table.on(messages::created_by.eq(users::id)))
                 .filter(messages::chat_id.eq(chat_id))
                 .filter(messages::deleted_at.is_null())
-                .order_by(messages::created_at.desc())
+                .order_by(messages::created_at.asc())
                 .select((
                     messages::id,
                     messages::request_message,
@@ -154,6 +154,7 @@ pub async fn get_chat_handler(chat_id: &Uuid, user_id: &Uuid) -> Result<ChatWith
                 response_messages,
                 reasoning,
                 Some(msg.final_reasoning_message),
+                msg.created_at,
             )
         })
         .collect();
diff --git a/api/libs/handlers/src/chats/post_chat_handler.rs b/api/libs/handlers/src/chats/post_chat_handler.rs
index 1bb5d1c1f..c10bca2a1 100644
--- a/api/libs/handlers/src/chats/post_chat_handler.rs
+++ b/api/libs/handlers/src/chats/post_chat_handler.rs
@@ -350,6 +350,7 @@ pub async fn post_chat_handler(
         response_messages.clone(),
         reasoning_messages.clone(),
         Some(format!("Reasoned for {} seconds", reasoning_duration).to_string()),
+        Utc::now(),
     );
 
     chat_with_messages.update_message(message);
@@ -1854,6 +1855,7 @@ async fn initialize_chat(
             Vec::new(),
             Vec::new(),
             None,
+            Utc::now(),
         );
 
         // Add message to existing chat
@@ -1889,6 +1891,7 @@ async fn initialize_chat(
             Vec::new(),
             Vec::new(),
             None,
+            Utc::now(),
         );
 
         let mut chat_with_messages = ChatWithMessages::new(
diff --git a/api/libs/handlers/src/messages/types.rs b/api/libs/handlers/src/messages/types.rs
index 9777c556e..07f9ac092 100644
--- a/api/libs/handlers/src/messages/types.rs
+++ b/api/libs/handlers/src/messages/types.rs
@@ -15,7 +15,7 @@ pub struct ChatMessage {
     pub reasoning_message_ids: Vec<String>,
     #[serde(default)]
     pub reasoning_messages: HashMap<String, Value>,
-    pub created_at: String,
+    pub created_at: chrono::DateTime<chrono::Utc>,
     pub final_reasoning_message: Option<String>,
 }
 
@@ -46,7 +46,7 @@ impl ChatMessage {
             response_messages: HashMap::new(),
             reasoning_message_ids: Vec::new(),
             reasoning_messages: HashMap::new(),
-            created_at: Utc::now().to_rfc3339(),
+            created_at: Utc::now(),
             final_reasoning_message: None,
         }
     }
@@ -57,6 +57,7 @@ impl ChatMessage {
         response_messages: Vec<Value>,
         reasoning_messages: Vec<Value>,
         final_reasoning_message: Option<String>,
+        created_at: chrono::DateTime<chrono::Utc>,
     ) -> Self {
         let response_message_ids: Vec<String> = response_messages
             .iter()
@@ -91,7 +92,7 @@ impl ChatMessage {
             response_messages: response_messages_map,
             reasoning_message_ids,
             reasoning_messages: reasoning_messages_map,
-            created_at: Utc::now().to_rfc3339(),
+            created_at,
             final_reasoning_message,
         }
     }