From 21e3bdcc8e61bc7b86ff63d81c6870dce77ceaf7 Mon Sep 17 00:00:00 2001
From: Romain Mallard <romaimallard@gmail.com>
Date: Wed, 7 Jan 2026 21:14:36 +0100
Subject: [PATCH] fix + refac send message WS payload

---
 db/1.sqlite-wal           | Bin 5092352 -> 5092352 bytes
 db/auth_copy_2.sqlite-shm | Bin 32768 -> 0 bytes
 db/auth_copy_2.sqlite-wal |   0
 src/chat/handlers.rs      |  66 +++++++++++++++++++++++---------------
 4 files changed, 40 insertions(+), 26 deletions(-)
 delete mode 100644 db/auth_copy_2.sqlite-shm
 delete mode 100644 db/auth_copy_2.sqlite-wal

diff --git a/db/1.sqlite-wal b/db/1.sqlite-wal
index 802d13b50ab787e61d7af0ad7b59f1795ca37870..c35f57ffe807b6d00ebff3c482b28cf6081841c1 100644
GIT binary patch
delta 580
zcmbWxKTi{J0EhAZw_dNb&=!FfIVl1bj`r^Qk5fdUBA`NGH61Rop~NPbz|yV5FL7c4
z5*Qd*SV<ZQ9T*smlS7SRBqSuh0A2u3)q#YK<olVQZ|%>Cqt+tq!Xcc(CEUUz9tf{^
zD5PWGsj~a=Lh^g9<i2s<^b9nD2hwH09^Q@ym6+RRbA9`z7t|lawd)=K&*taTqfLKc
z&(<Lqch7>pxI-@1mo!-&343gIZ_;p9OJ7Enjq>Wc!dBMSKIthvtEMzHl~Xj$OzUPk
z)0pb@Rh|E`mEZ2I*h2H_e>QSAdze{lD<sChx3VEQ|2ONBi*mlcB+1M1NGsfDILoC<
zMX8po^6g;OGz?QW?(yzx)bc@wA8iOAh<0=!gfJrL#3OW}8$F03hF&~I9~3-6KjIj`
zQw(AV!+3@SMlcE$V@M(e4LS^@kwF$Y<S`Bt&+!5ic!^28!fQ-n8U?(;4BlcEbC}0F
Lyl+IU4_C`Km(Zvg

delta 5406
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

diff --git a/db/auth_copy_2.sqlite-shm b/db/auth_copy_2.sqlite-shm
deleted file mode 100644
index fe9ac2845eca6fe6da8a63cd096d9cf9e24ece10..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 32768
zcmeIuAr62r3<XeTSayS60=Z=O-0|kP2&fu@!6Du^ziFC^7w55MN)9hQYV3Wk79a2P
z)%8g3H30$y2oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk
z1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs
w0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5cq?@4dk5`Qvd(}

diff --git a/db/auth_copy_2.sqlite-wal b/db/auth_copy_2.sqlite-wal
deleted file mode 100644
index e69de29..0000000
diff --git a/src/chat/handlers.rs b/src/chat/handlers.rs
index 27a0145..842f1c1 100644
--- a/src/chat/handlers.rs
+++ b/src/chat/handlers.rs
@@ -302,15 +302,28 @@ pub async fn send_message(
     }
 }
 
-    let result = conn.execute(
-    "INSERT INTO message (sender_id, content, conversation_id) VALUES (?1, ?2, ?3)",
-    params![&user_id, &payload.message, &payload.conv_id],
-    );
-
-    let message_id = conn.last_insert_rowid();
+let (message_id, sent_at): (i64, String) = match conn.query_row(
+    "INSERT INTO message (sender_id, content, conversation_id)
+     VALUES (?1, ?2, ?3)
+     RETURNING id, sent_at",
+    params![user_id, payload.message, payload.conv_id],
+    |row| Ok((
+        row.get::<_, i64>(0)?,
+        row.get::<_, String>(1)?,
+    )),
+) {
+    Ok(v) => v,
+    Err(err) => {
+        return (
+            StatusCode::INTERNAL_SERVER_ERROR,
+            format!("DB insert failed: {err}"),
+        );
+    }
+};
+    //let message_id = conn.last_insert_rowid();
 // FIXME: add sent_at and message id in the response.
-    match result {
-        Ok(rows) if rows > 0 => {
+
+    
             // --- send to conversation participants ---
             let mut stmt_participants = conn
                 .prepare("SELECT user_id FROM conversation_participants WHERE conversation_id = ?1")
@@ -322,29 +335,30 @@ pub async fn send_message(
                 .filter_map(Result::ok)
                 .collect();
 
-            if let Some(hotel_users) = state.ws_map.get(&hotel_id) {
-                let update_msg = serde_json::json!({
-                    "event_type": "chat_message",
-                    "conv_id": payload.conv_id,
-                    "sender": user_id,
-                    "content": payload.message,
-                })
-                .to_string();
+if let Some(hotel_users) = state.ws_map.get(&hotel_id) {
+    let update_msg = serde_json::json!({
+        "event_type": "chat_message",
+        "conv_id": payload.conv_id,
+        "sender_id": user_id,
+        "content": payload.message,
+        "id": message_id,
+        "sent_at": sent_at,
+    })
+    .to_string();
 
-                for uid in &participant_ids {
-                    if let Some(sender) = hotel_users.get(&uid) {
-                        let _ = sender.send(axum::extract::ws::Message::Text(update_msg.clone().into()));
-                    }
-                }
-            }
+    for uid in &participant_ids {
+        if let Some(sender) = hotel_users.get(uid) {
+            let _ = sender.send(
+                axum::extract::ws::Message::Text(update_msg.clone().into())
+            );
+        }
+    }
+}
 
             (StatusCode::OK, format!("sent message: {}, to users:{:?}", payload.message, participant_ids))
         }
-        Ok(_) => (StatusCode::NOT_FOUND, "Conversation not found".to_string()),
-        Err(err) => (StatusCode::INTERNAL_SERVER_ERROR, format!("Error from DB: {err}")),
-    }
+        //Ok(_) => (StatusCode::NOT_FOUND, "Conversation not found".to_string()),
 
-}
 
 
 #[derive(Debug, Serialize)]