diff --git a/server/nm-store/Cargo.toml b/server/nm-store/Cargo.toml index 795fa77..c80ed31 100644 --- a/server/nm-store/Cargo.toml +++ b/server/nm-store/Cargo.toml @@ -16,6 +16,7 @@ thiserror = "1.0.20" derive_builder = "0.9.0" lazy_static = "1.4.0" comrak = "0.8.2" +shrinkwraprs = "0.3.0" regex = "1.3.9" slug = "0.1.4" tokio = { version = "0.2.22", features = ["rt-threaded", "blocking"] } diff --git a/server/nm-store/src/store.rs b/server/nm-store/src/store.rs index 7696ae7..09da501 100644 --- a/server/nm-store/src/store.rs +++ b/server/nm-store/src/store.rs @@ -1,20 +1,27 @@ use crate::errors::NoteStoreError; use crate::row_structs::{ - JustId, JustSlugs, NewNote, NewNoteBuilder, NewPage, - NewPageBuilder, NoteRelationship, RawNote, RawPage, + JustId, JustSlugs, NewNote, NewNoteBuilder, NewPage, NewPageBuilder, NoteRelationship, RawNote, + RawPage, }; use friendly_id; use lazy_static::lazy_static; -use std::collections::HashMap; use regex::Regex; +use shrinkwraprs::Shrinkwrap; use slug::slugify; use sqlx; use sqlx::{ - sqlite::{Sqlite, SqlitePool, SqliteRow}, - Done, Executor, Row + sqlite::{Sqlite, SqlitePool, SqliteRow}, + Done, Executor, Row, }; +use std::collections::HashMap; use std::sync::Arc; +#[derive(Shrinkwrap, Copy, Clone)] +struct ParentId(i64); + +#[derive(Shrinkwrap, Copy, Clone)] +struct NoteId(i64); + /// A handle to our Sqlite database. #[derive(Clone, Debug)] pub struct NoteStore(Arc); @@ -23,146 +30,150 @@ type NoteResult = core::result::Result; type SqlResult = sqlx::Result; impl NoteStore { - pub async fn new(url: &str) -> NoteResult { - let pool = SqlitePool::connect(url).await?; - Ok(NoteStore(Arc::new(pool))) - } + pub async fn new(url: &str) -> NoteResult { + let pool = SqlitePool::connect(url).await?; + Ok(NoteStore(Arc::new(pool))) + } - // Erase all the data in the database and restore it - // to its original empty form. Do not use unless you - // really, really want that to happen. - pub async fn reset_database(&self) -> NoteResult<()> { - reset_database(&*self.0).await.map_err(NoteStoreError::DBError) - } + // Erase all the data in the database and restore it + // to its original empty form. Do not use unless you + // really, really want that to happen. + pub async fn reset_database(&self) -> NoteResult<()> { + reset_database(&*self.0) + .await + .map_err(NoteStoreError::DBError) + } - /// Fetch page by slug - /// - /// Supports the use case of the user navigating to a known place - /// via a bookmark or other URL. Since the title isn't clear from - /// the slug, the slug is insufficient to generate a new page, so - /// this use case says that in the event of a failure to find the - /// requested page, return a basic NotFound. - pub async fn get_page_by_slug(&self, slug: &str) -> NoteResult<(RawPage, Vec)> { - // let select_note_collection_for_root = include_str!("sql/select_note_collection_for_root.sql"); - let mut tx = self.0.begin().await?; - let page = select_page_by_slug(&mut tx, slug).await?; + /// Fetch page by slug + /// + /// Supports the use case of the user navigating to a known place + /// via a bookmark or other URL. Since the title isn't clear from + /// the slug, the slug is insufficient to generate a new page, so + /// this use case says that in the event of a failure to find the + /// requested page, return a basic NotFound. + pub async fn get_page_by_slug(&self, slug: &str) -> NoteResult<(RawPage, Vec)> { + // let select_note_collection_for_root = include_str!("sql/select_note_collection_for_root.sql"); + let mut tx = self.0.begin().await?; + let page = select_page_by_slug(&mut tx, slug).await?; let note_id = page.note_id; let notes = select_note_collection_from_root(&mut tx, note_id).await?; - tx.commit().await?; - Ok((page, notes)) - } + tx.commit().await?; + Ok((page, notes)) + } - /// Fetch page by title - /// - /// Supports the use case of the user navigating to a page via - /// the page's formal title. Since the title is the key reference - /// of the system, if no page with that title is found, a page with - /// that title is generated automatically. - pub async fn get_page_by_title(&self, title: &str) -> NoteResult<(RawPage, Vec)> { - let mut tx = self.0.begin().await?; - let (page, notes) = match select_page_by_title(&mut tx, title).await { - Ok(page) => { - let note_id = page.note_id; - (page, select_note_collection_from_root(&mut tx, note_id).await?) - } - Err(sqlx::Error::RowNotFound) => { - let page = { - let new_root_note = create_unique_root_note(); - let new_root_note_id = insert_one_new_note(&mut tx, &new_root_note).await?; - let new_page_slug = generate_slug(&mut tx, title).await?; - let new_page = create_new_page_for(&title, &new_page_slug, new_root_note_id); - let _ = insert_one_new_page(&mut tx, &new_page).await?; - select_page_by_title(&mut tx, &title).await? - }; - let note_id = page.note_id; - (page, select_note_collection_from_root(&mut tx, note_id).await?) - } - Err(e) => return Err(NoteStoreError::DBError(e)), - }; - tx.commit().await?; - Ok((page, notes)) - } + /// Fetch page by title + /// + /// Supports the use case of the user navigating to a page via + /// the page's formal title. Since the title is the key reference + /// of the system, if no page with that title is found, a page with + /// that title is generated automatically. + pub async fn get_page_by_title(&self, title: &str) -> NoteResult<(RawPage, Vec)> { + let mut tx = self.0.begin().await?; + let (page, notes) = match select_page_by_title(&mut tx, title).await { + Ok(page) => { + let note_id = page.note_id; + ( + page, + select_note_collection_from_root(&mut tx, note_id).await?, + ) + } + Err(sqlx::Error::RowNotFound) => { + let page = { + let new_root_note = create_unique_root_note(); + let new_root_note_id = insert_one_new_note(&mut tx, &new_root_note).await?; + let new_page_slug = generate_slug(&mut tx, title).await?; + let new_page = create_new_page_for(&title, &new_page_slug, new_root_note_id); + let _ = insert_one_new_page(&mut tx, &new_page).await?; + select_page_by_title(&mut tx, &title).await? + }; + let note_id = page.note_id; + ( + page, + select_note_collection_from_root(&mut tx, note_id).await?, + ) + } + Err(e) => return Err(NoteStoreError::DBError(e)), + }; + tx.commit().await?; + Ok((page, notes)) + } // TODO: Make sure the position is sane. /// Insert a note as the child of an existing note, at a set position. - pub async fn insert_nested_note( - &self, - note: &NewNote, - parent_note_uuid: &str, - position: i64, - ) -> NoteResult { - let mut new_note = note.clone(); - new_note.uuid = friendly_id::create(); - let mut tx = self.0.begin().await?; - let parent_id = select_note_id_for_uuid(&mut tx, parent_note_uuid).await?; - let new_note_id = insert_one_new_note(&mut tx, &new_note).await?; - let _ = make_room_for_new_note(&mut tx, parent_id, position).await?; - let _ = insert_note_note_relationship(&mut tx, parent_id, new_note_id, position).await?; - tx.commit().await?; - Ok(new_note.uuid) - } + pub async fn insert_nested_note( + &self, + note: &NewNote, + parent_note_uuid: &str, + position: i64, + ) -> NoteResult { + let mut new_note = note.clone(); + new_note.uuid = friendly_id::create(); + let mut tx = self.0.begin().await?; + let parent_id = select_note_id_for_uuid(&mut tx, parent_note_uuid).await?; + let new_note_id = insert_one_new_note(&mut tx, &new_note).await?; + let _ = make_room_for_new_note(&mut tx, parent_id, position).await?; + let _ = insert_note_note_relationship(&mut tx, parent_id, new_note_id, position).await?; + tx.commit().await?; + Ok(new_note.uuid) + } // TODO: Make sure the new position is sane. /// Move a note from one location to another. - pub async fn move_note( - &self, - note_uuid: &str, - old_parent_uuid: &str, - new_parent_uuid: &str, - new_position: i64, - ) -> NoteResult<()> { - let sample = vec![note_uuid, old_parent_uuid, new_parent_uuid]; - let mut tx = self.0.begin().await?; - let found_id_vec = bulk_select_ids_for_note_uuids(&mut tx, &sample) - .await?; + pub async fn move_note( + &self, + note_uuid: &str, + old_parent_uuid: &str, + new_parent_uuid: &str, + new_position: i64, + ) -> NoteResult<()> { + let sample = vec![note_uuid, old_parent_uuid, new_parent_uuid]; + let mut tx = self.0.begin().await?; - let found_ids: HashMap = found_id_vec - .into_iter() - .collect(); + // This is one of the few cases where we we're getting IDs for + // notes, but the nature of the ID isn't known at this time. + // This has to be handled manually, in the next paragraph + // below. + let found_id_vec = bulk_select_ids_for_note_uuids(&mut tx, &sample).await?; + let found_ids: HashMap = found_id_vec.into_iter().collect(); + if found_ids.len() != 3 { + return Err(NoteStoreError::NotFound); + } - if found_ids.len() != 3 { - return Err(NoteStoreError::NotFound); - } + let old_parent_id = ParentId(*found_ids.get(old_parent_uuid).unwrap()); + let new_parent_id = ParentId(*found_ids.get(new_parent_uuid).unwrap()); + let note_id = NoteId(*found_ids.get(note_uuid).unwrap()); - let old_parent_id = *found_ids.get(old_parent_uuid).unwrap(); - let new_parent_id = *found_ids.get(new_parent_uuid).unwrap(); - let note_id = *found_ids.get(note_uuid).unwrap(); + let old_note_position = get_note_note_relationship(&mut tx, old_parent_id, note_id) + .await? + .position; - let old_note_position = get_note_note_relationship(&mut tx, old_parent_id, note_id) - .await? - .position; - - let _ = delete_note_note_relationship(&mut tx, old_parent_id, note_id).await?; - let _ = close_hole_for_deleted_note(&mut tx, old_parent_id, old_note_position).await?; - let _ = make_room_for_new_note(&mut tx, new_parent_id, new_position).await?; - let _ = insert_note_note_relationship(&mut tx, new_parent_id, note_id, new_position).await?; + let _ = delete_note_note_relationship(&mut tx, old_parent_id, note_id).await?; + let _ = close_hole_for_deleted_note(&mut tx, old_parent_id, old_note_position).await?; + let _ = make_room_for_new_note(&mut tx, new_parent_id, new_position).await?; + let _ = + insert_note_note_relationship(&mut tx, new_parent_id, note_id, new_position).await?; tx.commit().await?; Ok(()) - } + } /// Embed or reference a note from a different location. pub async fn reference_or_embed_note( &self, - note_uuid: &str, - new_parent_uuid: &str, - new_position: i64, - new_nature: &str) -> NoteResult<()> { + note_uuid: &str, + new_parent_uuid: &str, + new_position: i64, + new_nature: &str, + ) -> NoteResult<()> { todo!() } /// Delete a note - pub async fn delete_note( - &self, - note_uuid: &str, - note_parent_uuid: &str) -> NoteResult<()> { + pub async fn delete_note(&self, note_uuid: &str, note_parent_uuid: &str) -> NoteResult<()> { todo!() } /// Update a note's content - pub async fn update_note_content( - &self, - note_uuid: &str, - content: &str) -> NoteResult<()> { + pub async fn update_note_content(&self, note_uuid: &str, content: &str) -> NoteResult<()> { todo!() } } @@ -179,143 +190,158 @@ impl NoteStore { async fn reset_database<'a, E>(executor: E) -> SqlResult<()> where - E: Executor<'a, Database = Sqlite>, + E: Executor<'a, Database = Sqlite>, { - let initialize_sql = include_str!("sql/initialize_database.sql"); - sqlx::query(initialize_sql).execute(executor).await.map(|_| ()) + let initialize_sql = include_str!("sql/initialize_database.sql"); + sqlx::query(initialize_sql) + .execute(executor) + .await + .map(|_| ()) } async fn select_page_by_slug<'a, E>(executor: E, slug: &str) -> SqlResult where - E: Executor<'a, Database = Sqlite>, + E: Executor<'a, Database = Sqlite>, { - let select_one_page_by_slug_sql = concat!( - "SELECT id, title, slug, note_id, creation_date, updated_date, ", - "lastview_date, deleted_date FROM pages WHERE slug=?;" - ); - Ok(sqlx::query_as(&select_one_page_by_slug_sql) - .bind(&slug) - .fetch_one(executor) - .await?) + let select_one_page_by_slug_sql = concat!( + "SELECT id, title, slug, note_id, creation_date, updated_date, ", + "lastview_date, deleted_date FROM pages WHERE slug=?;" + ); + Ok(sqlx::query_as(&select_one_page_by_slug_sql) + .bind(&slug) + .fetch_one(executor) + .await?) } async fn select_page_by_title<'a, E>(executor: E, title: &str) -> SqlResult where - E: Executor<'a, Database = Sqlite>, + E: Executor<'a, Database = Sqlite>, { - let select_one_page_by_title_sql = concat!( - "SELECT id, title, slug, note_id, creation_date, updated_date, ", - "lastview_date, deleted_date FROM pages WHERE title=?;" - ); - Ok(sqlx::query_as(&select_one_page_by_title_sql) - .bind(&title) - .fetch_one(executor) - .await?) + let select_one_page_by_title_sql = concat!( + "SELECT id, title, slug, note_id, creation_date, updated_date, ", + "lastview_date, deleted_date FROM pages WHERE title=?;" + ); + Ok(sqlx::query_as(&select_one_page_by_title_sql) + .bind(&title) + .fetch_one(executor) + .await?) } -async fn select_note_id_for_uuid<'a, E>(executor: E, uuid: &str) -> SqlResult +async fn select_note_id_for_uuid<'a, E>(executor: E, uuid: &str) -> SqlResult where - E: Executor<'a, Database = Sqlite>, + E: Executor<'a, Database = Sqlite>, { - let select_note_id_for_uuid_sql = "SELECT id FROM notes WHERE uuid = ?"; - let id: JustId = sqlx::query_as(&select_note_id_for_uuid_sql) - .bind(&uuid) - .fetch_one(executor) - .await?; - Ok(id.id) + let select_note_id_for_uuid_sql = "SELECT id FROM notes WHERE uuid = ?"; + let id: JustId = sqlx::query_as(&select_note_id_for_uuid_sql) + .bind(&uuid) + .fetch_one(executor) + .await?; + Ok(ParentId(id.id)) } -async fn make_room_for_new_note<'a, E>(executor: E, parent_id: i64, position: i64) -> SqlResult<()> +async fn make_room_for_new_note<'a, E>( + executor: E, + parent_id: ParentId, + position: i64, +) -> SqlResult<()> where - E: Executor<'a, Database = Sqlite>, + E: Executor<'a, Database = Sqlite>, { - let make_room_for_new_note_sql = concat!( - "UPDATE note_relationships ", - "SET position = position + 1 ", - "WHERE position >= ? and parent_id = ?;" - ); + let make_room_for_new_note_sql = concat!( + "UPDATE note_relationships ", + "SET position = position + 1 ", + "WHERE position >= ? and parent_id = ?;" + ); - sqlx::query(make_room_for_new_note_sql) - .bind(&position) - .bind(&parent_id) - .execute(executor) - .await - .map(|_| ()) + sqlx::query(make_room_for_new_note_sql) + .bind(&position) + .bind(&*parent_id) + .execute(executor) + .await + .map(|_| ()) } -async fn insert_note_note_relationship<'a, E>(executor: E, parent_id: i64, note_id: i64, position: i64) -> SqlResult<()> +async fn insert_note_note_relationship<'a, E>( + executor: E, + parent_id: ParentId, + note_id: NoteId, + position: i64, +) -> SqlResult<()> where - E: Executor<'a, Database = Sqlite>, + E: Executor<'a, Database = Sqlite>, { - let insert_note_note_relationship_sql = concat!( - "INSERT INTO note_relationships (parent_id, note_id, position, nature) ", - "values (?, ?, ?, ?)" - ); + let insert_note_note_relationship_sql = concat!( + "INSERT INTO note_relationships (parent_id, note_id, position, nature) ", + "values (?, ?, ?, ?)" + ); - sqlx::query(insert_note_note_relationship_sql) - .bind(&parent_id) - .bind(¬e_id) - .bind(&position) - .bind("note") - .execute(executor) - .await - .map(|_| ()) + sqlx::query(insert_note_note_relationship_sql) + .bind(&*parent_id) + .bind(&*note_id) + .bind(&position) + .bind("note") + .execute(executor) + .await + .map(|_| ()) } async fn select_note_collection_from_root<'a, E>(executor: E, root: i64) -> SqlResult> where - E: Executor<'a, Database = Sqlite>, + E: Executor<'a, Database = Sqlite>, { - let select_note_collection_from_root_sql = include_str!("sql/select_note_collection_from_root.sql"); - Ok(sqlx::query_as(&select_note_collection_from_root_sql) - .bind(&root) - .fetch_all(executor) - .await?) + let select_note_collection_from_root_sql = + include_str!("sql/select_note_collection_from_root.sql"); + Ok(sqlx::query_as(&select_note_collection_from_root_sql) + .bind(&root) + .fetch_all(executor) + .await?) } -async fn insert_one_new_note<'a, E>(executor: E, note: &NewNote) -> SqlResult +async fn insert_one_new_note<'a, E>(executor: E, note: &NewNote) -> SqlResult where - E: Executor<'a, Database = Sqlite>, + E: Executor<'a, Database = Sqlite>, { - let insert_one_note_sql = concat!( - "INSERT INTO notes ( ", - " uuid, ", - " content, ", - " notetype, ", - " creation_date, ", - " updated_date, ", - " lastview_date) ", - "VALUES (?, ?, ?, ?, ?, ?);" - ); + let insert_one_note_sql = concat!( + "INSERT INTO notes ( ", + " uuid, ", + " content, ", + " notetype, ", + " creation_date, ", + " updated_date, ", + " lastview_date) ", + "VALUES (?, ?, ?, ?, ?, ?);" + ); - Ok(sqlx::query(insert_one_note_sql) - .bind(¬e.uuid) - .bind(¬e.content) - .bind(¬e.notetype) - .bind(¬e.creation_date) - .bind(¬e.updated_date) - .bind(¬e.lastview_date) - .execute(executor) - .await? - .last_insert_rowid()) + Ok(NoteId( + sqlx::query(insert_one_note_sql) + .bind(¬e.uuid) + .bind(¬e.content) + .bind(¬e.notetype) + .bind(¬e.creation_date) + .bind(¬e.updated_date) + .bind(¬e.lastview_date) + .execute(executor) + .await? + .last_insert_rowid(), + )) } fn find_maximal_slug(slugs: &Vec) -> Option { - lazy_static! { - static ref RE_CAP_NUM: Regex = Regex::new(r"-(\d+)$").unwrap(); - } + lazy_static! { + static ref RE_CAP_NUM: Regex = Regex::new(r"-(\d+)$").unwrap(); + } - if slugs.len() == 0 { - return None; - } + if slugs.len() == 0 { + return None; + } - let mut slug_counters: Vec = slugs - .iter() - .filter_map(|slug| RE_CAP_NUM.captures(&slug.slug)) - .map(|cap| cap.get(1).unwrap().as_str().parse::().unwrap()) - .collect(); - slug_counters.sort_unstable(); - slug_counters.pop() + let mut slug_counters: Vec = slugs + .iter() + .filter_map(|slug| RE_CAP_NUM.captures(&slug.slug)) + .map(|cap| cap.get(1).unwrap().as_str().parse::().unwrap()) + .collect(); + slug_counters.sort_unstable(); + slug_counters.pop() } // Given an initial string and an existing collection of slugs, @@ -323,148 +349,166 @@ fn find_maximal_slug(slugs: &Vec) -> Option { // collection. async fn generate_slug<'a, E>(executor: E, title: &str) -> SqlResult where - E: Executor<'a, Database = Sqlite>, + E: Executor<'a, Database = Sqlite>, { - lazy_static! { - static ref RE_STRIP_NUM: Regex = Regex::new(r"-\d+$").unwrap(); - } + lazy_static! { + static ref RE_STRIP_NUM: Regex = Regex::new(r"-\d+$").unwrap(); + } - let initial_slug = slugify(title); - let sample_slug = RE_STRIP_NUM.replace_all(&initial_slug, ""); - let slug_finder_sql = "SELECT slug FROM pages WHERE slug LIKE '?%';"; - let similar_slugs: Vec = sqlx::query_as(&slug_finder_sql) - .bind(&*sample_slug) - .fetch_all(executor) - .await?; - let maximal_slug = find_maximal_slug(&similar_slugs); - match maximal_slug { - None => Ok(initial_slug), - Some(max_slug) => Ok(format!("{}-{}", initial_slug, max_slug + 1)), - } + let initial_slug = slugify(title); + let sample_slug = RE_STRIP_NUM.replace_all(&initial_slug, ""); + let slug_finder_sql = "SELECT slug FROM pages WHERE slug LIKE '?%';"; + let similar_slugs: Vec = sqlx::query_as(&slug_finder_sql) + .bind(&*sample_slug) + .fetch_all(executor) + .await?; + let maximal_slug = find_maximal_slug(&similar_slugs); + match maximal_slug { + None => Ok(initial_slug), + Some(max_slug) => Ok(format!("{}-{}", initial_slug, max_slug + 1)), + } } -async fn insert_one_new_page<'a, E>(executor: E, page: &NewPage) -> SqlResult +async fn insert_one_new_page<'a, E>(executor: E, page: &NewPage) -> SqlResult where - E: Executor<'a, Database = Sqlite>, + E: Executor<'a, Database = Sqlite>, { - let insert_one_page_sql = concat!( - "INSERT INTO pages ( ", - " slug, ", - " title, ", - " note_id, ", - " creation_date, ", - " updated_date, ", - " lastview_date) ", - "VALUES (?, ?, ?, ?, ?, ?);" - ); + let insert_one_page_sql = concat!( + "INSERT INTO pages ( ", + " slug, ", + " title, ", + " note_id, ", + " creation_date, ", + " updated_date, ", + " lastview_date) ", + "VALUES (?, ?, ?, ?, ?, ?);" + ); - Ok(sqlx::query(insert_one_page_sql) - .bind(&page.slug) - .bind(&page.title) - .bind(&page.note_id) - .bind(&page.creation_date) - .bind(&page.updated_date) - .bind(&page.lastview_date) - .execute(executor) - .await? - .last_insert_rowid()) + Ok(NoteId( + sqlx::query(insert_one_page_sql) + .bind(&page.slug) + .bind(&page.title) + .bind(&page.note_id) + .bind(&page.creation_date) + .bind(&page.updated_date) + .bind(&page.lastview_date) + .execute(executor) + .await? + .last_insert_rowid(), + )) } -async fn bulk_select_ids_for_note_uuids<'a, E>(executor: E, ids: &Vec<&str>) -> SqlResult> +async fn bulk_select_ids_for_note_uuids<'a, E>( + executor: E, + ids: &Vec<&str>, +) -> SqlResult> where - E: Executor<'a, Database = Sqlite>, + E: Executor<'a, Database = Sqlite>, { - let bulk_select_ids_for_note_uuids_sql = - "SELECT uuid, id FROM notes WHERE uuid IN (".to_string() + - &["?",].repeat(ids.len()).join(",") + - &");".to_string(); + let bulk_select_ids_for_note_uuids_sql = "SELECT uuid, id FROM notes WHERE uuid IN (" + .to_string() + + &["?"].repeat(ids.len()).join(",") + + &");".to_string(); - let mut request = sqlx::query(&bulk_select_ids_for_note_uuids_sql); - for id in ids.iter() { - request = request.bind(id); - } - Ok(request - .try_map(|row: SqliteRow| { - let l = row.try_get::(0)?; - let r = row.try_get::(1)?; - Ok((l, r)) }) - .fetch_all(executor) - .await? - .into_iter() - .collect()) + let mut request = sqlx::query(&bulk_select_ids_for_note_uuids_sql); + for id in ids.iter() { + request = request.bind(id); + } + Ok(request + .try_map(|row: SqliteRow| { + let l = row.try_get::(0)?; + let r = row.try_get::(1)?; + Ok((l, r)) + }) + .fetch_all(executor) + .await? + .into_iter() + .collect()) } -async fn get_note_note_relationship<'a, E>(executor: E, parent_id: i64, note_id: i64) -> SqlResult +async fn get_note_note_relationship<'a, E>( + executor: E, + parent_id: ParentId, + note_id: NoteId, +) -> SqlResult where - E: Executor<'a, Database = Sqlite>, + E: Executor<'a, Database = Sqlite>, { - let get_note_note_relationship_sql = concat!( - "SELECT parent_id, note_id, position, nature ", - "FROM note_relationships ", - "WHERE parent_id = ? and note_id = ? ", - "LIMIT 1" - ); - sqlx::query_as(get_note_note_relationship_sql) - .bind(&parent_id) - .bind(¬e_id) - .fetch_one(executor) - .await + let get_note_note_relationship_sql = concat!( + "SELECT parent_id, note_id, position, nature ", + "FROM note_relationships ", + "WHERE parent_id = ? and note_id = ? ", + "LIMIT 1" + ); + sqlx::query_as(get_note_note_relationship_sql) + .bind(&*parent_id) + .bind(&*note_id) + .fetch_one(executor) + .await } -async fn delete_note_note_relationship<'a, E>(executor: E, parent_id: i64, note_id: i64) -> SqlResult<()> +async fn delete_note_note_relationship<'a, E>( + executor: E, + parent_id: ParentId, + note_id: NoteId, +) -> SqlResult<()> where - E: Executor<'a, Database = Sqlite>, + E: Executor<'a, Database = Sqlite>, { - let delete_note_note_relationship_sql = concat!( - "DELETE FROM note_relationships ", - "WHERE parent_id = ? and note_id = ? " - ); + let delete_note_note_relationship_sql = concat!( + "DELETE FROM note_relationships ", + "WHERE parent_id = ? and note_id = ? " + ); - let count = sqlx::query(delete_note_note_relationship_sql) - .bind(&parent_id) - .bind(¬e_id) - .execute(executor) - .await? - .rows_affected(); + let count = sqlx::query(delete_note_note_relationship_sql) + .bind(&*parent_id) + .bind(&*note_id) + .execute(executor) + .await? + .rows_affected(); - match count { - 1 => Ok(()), - _ => Err(sqlx::Error::RowNotFound), - } + match count { + 1 => Ok(()), + _ => Err(sqlx::Error::RowNotFound), + } } -async fn close_hole_for_deleted_note<'a, E>(executor: E, parent_id: i64, position: i64) -> SqlResult<()> +async fn close_hole_for_deleted_note<'a, E>( + executor: E, + parent_id: ParentId, + position: i64, +) -> SqlResult<()> where - E: Executor<'a, Database = Sqlite>, + E: Executor<'a, Database = Sqlite>, { - let close_hole_for_deleted_note_sql = concat!( - "UPDATE note_relationships ", - "SET position = position - 1 ", - "WHERE position > ? and parent_id = ?;" - ); + let close_hole_for_deleted_note_sql = concat!( + "UPDATE note_relationships ", + "SET position = position - 1 ", + "WHERE position > ? and parent_id = ?;" + ); - sqlx::query(close_hole_for_deleted_note_sql) - .bind(&position) - .bind(&parent_id) - .execute(executor) - .await - .map(|_| ()) + sqlx::query(close_hole_for_deleted_note_sql) + .bind(&position) + .bind(&*parent_id) + .execute(executor) + .await + .map(|_| ()) } fn create_unique_root_note() -> NewNote { - NewNoteBuilder::default() - .uuid(friendly_id::create()) - .content("".to_string()) - .notetype("root".to_string()) - .build() - .unwrap() + NewNoteBuilder::default() + .uuid(friendly_id::create()) + .content("".to_string()) + .notetype("root".to_string()) + .build() + .unwrap() } -fn create_new_page_for(title: &str, slug: &str, note_id: i64) -> NewPage { - NewPageBuilder::default() - .slug(slug.to_string()) - .title(title.to_string()) - .note_id(note_id) - .build() - .unwrap() +fn create_new_page_for(title: &str, slug: &str, note_id: NoteId) -> NewPage { + NewPageBuilder::default() + .slug(slug.to_string()) + .title(title.to_string()) + .note_id(*note_id) + .build() + .unwrap() }