buzzert/Kordophone
Private
Public Access
1
0
Fork 0
Code Packages Activity

reorg: split repo / database so settings can use db connection as well

Browse Source
This commit is contained in:
James Magahern
2025-04-25 15:42:46 -07:00
parent dd9025cc10
commit f7d094fcd6
12 changed files with 326 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

83
kordophone-db/src/tests/mod.rs
View File

@@ -1,10 +1,12 @@
use crate::{
chat_database::ChatDatabase,
database::Database,
repository::Repository,
models::{
conversation::{Conversation, ConversationBuilder},
participant::Participant,
message::Message,
}
},
settings::Settings,
};
// Helper function to compare participants ignoring database IDs
@@ -26,12 +28,14 @@ fn participants_vec_equal_ignoring_id(a: &[Participant], b: &[Participant]) -> b
#[test]
fn test_database_init() {
let _ = ChatDatabase::new_in_memory().unwrap();
let mut db = Database::new_in_memory().unwrap();
let _ = Repository::new(&mut db);
}
#[test]
fn test_add_conversation() {
let mut db = ChatDatabase::new_in_memory().unwrap();
let mut db = Database::new_in_memory().unwrap();
let mut repository = db.get_repository();
let guid = "test";
let test_conversation = Conversation::builder()
@@ -40,10 +44,10 @@ fn test_add_conversation() {
.display_name("Test Conversation")
.build();
db.insert_conversation(test_conversation.clone()).unwrap();
repository.insert_conversation(test_conversation.clone()).unwrap();
// Try to fetch with id now
let conversation = db.get_conversation_by_guid(guid).unwrap().unwrap();
let conversation = repository.get_conversation_by_guid(guid).unwrap().unwrap();
assert_eq!(conversation.guid, "test");
// Modify the conversation and update it
@@ -51,20 +55,21 @@ fn test_add_conversation() {
.display_name("Modified Conversation")
.build();
db.insert_conversation(modified_conversation.clone()).unwrap();
repository.insert_conversation(modified_conversation.clone()).unwrap();
// Make sure we still only have one conversation.
let all_conversations = db.all_conversations().unwrap();
let all_conversations = repository.all_conversations().unwrap();
assert_eq!(all_conversations.len(), 1);
// And make sure the display name was updated
let conversation = db.get_conversation_by_guid(guid).unwrap().unwrap();
let conversation = repository.get_conversation_by_guid(guid).unwrap().unwrap();
assert_eq!(conversation.display_name.unwrap(), "Modified Conversation");
}
#[test]
fn test_conversation_participants() {
let mut db = ChatDatabase::new_in_memory().unwrap();
let mut db = Database::new_in_memory().unwrap();
let mut repository = db.get_repository();
let participants: Vec<Participant> = vec!["one".into(), "two".into()];
@@ -75,9 +80,9 @@ fn test_conversation_participants() {
.participants(participants.clone())
.build();
db.insert_conversation(conversation).unwrap();
repository.insert_conversation(conversation).unwrap();
let read_conversation = db.get_conversation_by_guid(&guid).unwrap().unwrap();
let read_conversation = repository.get_conversation_by_guid(&guid).unwrap().unwrap();
let read_participants = read_conversation.participants;
assert!(participants_vec_equal_ignoring_id(&participants, &read_participants));
@@ -88,9 +93,9 @@ fn test_conversation_participants() {
.participants(participants.clone())
.build();
db.insert_conversation(conversation).unwrap();
repository.insert_conversation(conversation).unwrap();
let read_conversation = db.get_conversation_by_guid(&guid).unwrap().unwrap();
let read_conversation = repository.get_conversation_by_guid(&guid).unwrap().unwrap();
let read_participants: Vec<Participant> = read_conversation.participants;
assert!(participants_vec_equal_ignoring_id(&participants, &read_participants));
@@ -98,7 +103,8 @@ fn test_conversation_participants() {
#[test]
fn test_all_conversations_with_participants() {
let mut db = ChatDatabase::new_in_memory().unwrap();
let mut db = Database::new_in_memory().unwrap();
let mut repository = db.get_repository();
// Create two conversations with different participants
let participants1: Vec<Participant> = vec!["one".into(), "two".into()];
@@ -119,11 +125,11 @@ fn test_all_conversations_with_participants() {
.build();
// Insert both conversations
db.insert_conversation(conversation1).unwrap();
db.insert_conversation(conversation2).unwrap();
repository.insert_conversation(conversation1).unwrap();
repository.insert_conversation(conversation2).unwrap();
// Get all conversations and verify the results
let all_conversations = db.all_conversations().unwrap();
let all_conversations = repository.all_conversations().unwrap();
assert_eq!(all_conversations.len(), 2);
// Find and verify each conversation's participants
@@ -136,7 +142,8 @@ fn test_all_conversations_with_participants() {
#[test]
fn test_messages() {
let mut db = ChatDatabase::new_in_memory().unwrap();
let mut db = Database::new_in_memory().unwrap();
let mut repository = db.get_repository();
// First create a conversation with participants
let participants = vec!["Alice".into(), "Bob".into()];
@@ -146,7 +153,7 @@ fn test_messages() {
.build();
let conversation_id = conversation.guid.clone();
db.insert_conversation(conversation).unwrap();
repository.insert_conversation(conversation).unwrap();
// Create and insert a message from Me
let message1 = Message::builder()
@@ -160,11 +167,11 @@ fn test_messages() {
.build();
// Insert both messages
db.insert_message(&conversation_id, message1.clone()).unwrap();
db.insert_message(&conversation_id, message2.clone()).unwrap();
repository.insert_message(&conversation_id, message1.clone()).unwrap();
repository.insert_message(&conversation_id, message2.clone()).unwrap();
// Retrieve messages
let messages = db.get_messages_for_conversation(&conversation_id).unwrap();
let messages = repository.get_messages_for_conversation(&conversation_id).unwrap();
assert_eq!(messages.len(), 2);
// Verify first message (from Me)
@@ -184,14 +191,15 @@ fn test_messages() {
#[test]
fn test_message_ordering() {
let mut db = ChatDatabase::new_in_memory().unwrap();
let mut db = Database::new_in_memory().unwrap();
let mut repository = db.get_repository();
// Create a conversation
let conversation = ConversationBuilder::new()
.display_name("Test Chat")
.build();
let conversation_id = conversation.guid.clone();
db.insert_conversation(conversation).unwrap();
repository.insert_conversation(conversation).unwrap();
// Create messages with specific timestamps
let now = chrono::Utc::now().naive_utc();
@@ -211,16 +219,31 @@ fn test_message_ordering() {
.build();
// Insert messages
db.insert_message(&conversation_id, message1).unwrap();
db.insert_message(&conversation_id, message2).unwrap();
db.insert_message(&conversation_id, message3).unwrap();
repository.insert_message(&conversation_id, message1).unwrap();
repository.insert_message(&conversation_id, message2).unwrap();
repository.insert_message(&conversation_id, message3).unwrap();
// Retrieve messages and verify order
let messages = db.get_messages_for_conversation(&conversation_id).unwrap();
let messages = repository.get_messages_for_conversation(&conversation_id).unwrap();
assert_eq!(messages.len(), 3);
// Messages should be ordered by date
for i in 1..messages.len() {
assert!(messages[i].date > messages[i-1].date);
}
}
}
#[test]
fn test_settings() {
let mut db = Database::new_in_memory().unwrap();
let mut settings = db.get_settings();
settings.put("test", &"test".to_string()).unwrap();
assert_eq!(settings.get::<String>("test").unwrap().unwrap(), "test");
settings.del("test").unwrap();
assert!(settings.get::<String>("test").unwrap().is_none());
let keys = settings.list_keys().unwrap();
assert_eq!(keys.len(), 0);
}