diff --git a/db/1.sqlite-shm b/db/1.sqlite-shm new file mode 100644 index 0000000..fe9ac28 Binary files /dev/null and b/db/1.sqlite-shm differ diff --git a/db/1.sqlite-wal b/db/1.sqlite-wal new file mode 100644 index 0000000..e69de29 diff --git a/db/auth.sqlite-shm b/db/auth.sqlite-shm new file mode 100644 index 0000000..fe9ac28 Binary files /dev/null and b/db/auth.sqlite-shm differ diff --git a/db/auth.sqlite-wal b/db/auth.sqlite-wal new file mode 100644 index 0000000..e69de29 diff --git a/db/auth_copy_2.sqlite-shm b/db/auth_copy_2.sqlite-shm new file mode 100644 index 0000000..fe9ac28 Binary files /dev/null and b/db/auth_copy_2.sqlite-shm differ diff --git a/db/auth_copy_2.sqlite-wal b/db/auth_copy_2.sqlite-wal new file mode 100644 index 0000000..e69de29 diff --git a/src/chat/handlers.rs b/src/chat/handlers.rs index cd9327d..4f05227 100644 --- a/src/chat/handlers.rs +++ b/src/chat/handlers.rs @@ -241,7 +241,7 @@ pub async fn get_message( struct User { id: i32, username: String, - display_name: String, + //display_name: String, } @@ -255,7 +255,7 @@ pub async fn get_hotel_users( }; let mut stmt = match conn.prepare( - "SELECT id, username, displayname FROM users WHERE hotel_id = ?1", + "SELECT user_id, username FROM hotel_user_link WHERE hotel_id = ?1", ) { Ok(s) => s, Err(e) => return (StatusCode::INTERNAL_SERVER_ERROR, format!("Prepare failed: {}", e)), @@ -265,7 +265,7 @@ pub async fn get_hotel_users( Ok(User { id: row.get(0)?, username: row.get(1)?, - display_name: row.get(2)?, + //display_name: row.get(2)?, }) }) { Ok(iter) => iter, diff --git a/src/chat/routes.rs b/src/chat/routes.rs index 696d15e..586ba7e 100644 --- a/src/chat/routes.rs +++ b/src/chat/routes.rs @@ -20,6 +20,6 @@ pub fn chat_routes() -> Router { .route("/send_message", post(send_message)) .route("/get_conv", post(get_convs)) .route("/get_message", get(get_message)) - .route("/hotel_users", get(get_hotel_users)) + .route("/hotel_users", post(get_hotel_users)) } \ No newline at end of file