GKaszewski/k-notes
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

feat: Enhance note search to include tag name matching and sort results by updated date.

Browse Source
This commit is contained in:
Gabriel Kaszewski
2025-12-23 02:18:55 +01:00
parent 39b28c7f3b
commit 2ee9de866a
1 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
notes-infra/src/note_repository.rs
View File

@@ -196,18 +196,29 @@ impl NoteRepository for SqliteNoteRepository {
async fn search(&self, user_id: Uuid, query: &str) -> DomainResult<Vec<Note>> { async fn search(&self, user_id: Uuid, query: &str) -> DomainResult<Vec<Note>> {
let user_id_str = user_id.to_string(); let user_id_str = user_id.to_string();
// Use FTS5 for full-text search let like_query = format!("%{}%", query);
// Use FTS5 for full-text search OR tag name match
let rows: Vec<NoteRow> = sqlx::query_as( let rows: Vec<NoteRow> = sqlx::query_as(
r#" r#"
SELECT n.id, n.user_id, n.title, n.content, n.color, n.is_pinned, n.is_archived, n.created_at, n.updated_at SELECT DISTINCT n.id, n.user_id, n.title, n.content, n.color, n.is_pinned, n.is_archived, n.created_at, n.updated_at
FROM notes n FROM notes n
INNER JOIN notes_fts fts ON n.rowid = fts.rowid WHERE n.user_id = ?
WHERE n.user_id = ? AND notes_fts MATCH ? AND (
ORDER BY rank n.rowid IN (SELECT rowid FROM notes_fts WHERE notes_fts MATCH ?)
OR
EXISTS (
SELECT 1 FROM note_tags nt
JOIN tags t ON nt.tag_id = t.id
WHERE nt.note_id = n.id AND t.name LIKE ?
)
)
ORDER BY n.updated_at DESC
"# "#
) )
.bind(&user_id_str) .bind(&user_id_str)
.bind(query) .bind(query)
.bind(like_query)
.fetch_all(&self.pool) .fetch_all(&self.pool)
.await .await
.map_err(|e| DomainError::RepositoryError(e.to_string()))?; .map_err(|e| DomainError::RepositoryError(e.to_string()))?;