It compiles. Whether it works is still ¯\_(ツ)_/¯

This commit is contained in:
Elf M. Sternberg 2020-10-09 09:57:43 -07:00
parent 1b8e1c067d
commit fd4f39b5b8
2 changed files with 64 additions and 34 deletions

View File

@ -8,8 +8,8 @@ pub use crate::store::NoteStore;
#[cfg(test)] #[cfg(test)]
mod tests { mod tests {
use chrono;
use super::*; use super::*;
use chrono;
use tokio; use tokio;
async fn fresh_inmemory_database() -> NoteStore { async fn fresh_inmemory_database() -> NoteStore {

View File

@ -1,5 +1,6 @@
use crate::errors::NoteStoreError; use crate::errors::NoteStoreError;
use crate::row_structs::{JustSlugs, NewNote, NewPage, RawNote, RawPage}; use crate::row_structs::{JustSlugs, NewNote, NewNoteBuilder, NewPage, NewPageBuilder, RawNote, RawPage};
use friendly_id;
use lazy_static::lazy_static; use lazy_static::lazy_static;
use regex::Regex; use regex::Regex;
use slug::slugify; use slug::slugify;
@ -49,17 +50,34 @@ impl NoteStore {
Ok((page, vec![])) Ok((page, vec![]))
} }
/// 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<RawNote>)> { pub async fn get_page_by_title(&self, title: &str) -> NoteResult<(RawPage, Vec<RawNote>)> {
let mut tx = self.0.begin().await?; let mut tx = self.0.begin().await?;
let page = match select_page_by_title(&mut tx, title).await { let page = match select_page_by_title(&mut tx, title).await {
Ok(page) => page, Ok(page) => page,
Err(sqlx::Error::RowNotFound) => match create_page_for_title(&mut tx, title).await { Err(sqlx::Error::RowNotFound) => {
let new_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 new_page_id = insert_one_new_page(&mut tx, &new_page).await?;
select_page_by_title(&mut tx, title).await
};
match new_page {
Ok(page) => page, Ok(page) => page,
Err(e) => return Err(NoteStoreError::DBError(e)) Err(e) => return Err(NoteStoreError::DBError(e)),
}
}, },
Err(e) => return Err(NoteStoreError::DBError(e)), Err(e) => return Err(NoteStoreError::DBError(e)),
}; };
// Todo: Replace vec with the results of the CTE // Todo: Replace vec with the results of the CTE
tx.commit().await?;
return Ok((page, vec![])); return Ok((page, vec![]));
} }
} }
@ -75,9 +93,17 @@ impl NoteStore {
// coherent and easily readable, and hides away the gnarliness of some // coherent and easily readable, and hides away the gnarliness of some
// of the SQL queries. // of the SQL queries.
async fn select_page_by_slug<'e, E>(executor: E, slug: &str) -> SqlResult<RawPage> async fn reset_database<'a, E>(executor: E) -> SqlResult<()>
where where
E: 'e + Executor<'e, Database = Sqlite>, E: Executor<'a, Database = Sqlite>
{
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<RawPage>
where
E: Executor<'a, Database = Sqlite>
{ {
let select_one_page_by_slug_sql = concat!( let select_one_page_by_slug_sql = concat!(
"SELECT id, title, slug, note_id, creation_date, updated_date, ", "SELECT id, title, slug, note_id, creation_date, updated_date, ",
@ -89,9 +115,9 @@ where
.await?) .await?)
} }
async fn select_page_by_title<'e, E>(executor: E, title: &str) -> SqlResult<RawPage> async fn select_page_by_title<'a, E>(executor: E, title: &str) -> SqlResult<RawPage>
where where
E: 'e + Executor<'e, Database = Sqlite>, E: Executor<'a, Database = Sqlite>,
{ {
let select_one_page_by_title_sql = concat!( let select_one_page_by_title_sql = concat!(
"SELECT id, title, slug, note_id, creation_date, updated_date, ", "SELECT id, title, slug, note_id, creation_date, updated_date, ",
@ -103,17 +129,9 @@ where
.await?) .await?)
} }
async fn reset_database<'e, E>(executor: E) -> SqlResult<()> async fn get_note_collection_for_root<'a, E>(executor: E, root: i64) -> SqlResult<Vec<RawNote>>
where where
E: 'e + Executor<'e, Database = Sqlite>, E: Executor<'a, Database = Sqlite>,
{
let initialize_sql = include_str!("sql/initialize_database.sql");
sqlx::query(initialize_sql).execute(executor).await.map(|_| ())
}
async fn get_note_collection_for_root<'e, E>(executor: E, root: i64) -> SqlResult<Vec<RawNote>>
where
E: 'e + Executor<'e, Database = Sqlite>,
{ {
let select_note_collection_for_root = include_str!("sql/select_note_collection_from_root.sql"); let select_note_collection_for_root = include_str!("sql/select_note_collection_from_root.sql");
Ok(sqlx::query_as(&select_note_collection_for_root) Ok(sqlx::query_as(&select_note_collection_for_root)
@ -122,9 +140,9 @@ where
.await?) .await?)
} }
async fn insert_one_new_note<'e, E>(executor: E, note: &NewNote) -> SqlResult<i64> async fn insert_one_new_note<'a, E>(executor: E, note: &NewNote) -> SqlResult<i64>
where where
E: 'e + Executor<'e, Database = Sqlite>, E: Executor<'a, Database = Sqlite>,
{ {
let insert_one_note_sql = concat!( let insert_one_note_sql = concat!(
"INSERT INTO notes ( ", "INSERT INTO notes ( ",
@ -170,9 +188,9 @@ fn find_maximal_slug(slugs: &Vec<JustSlugs>) -> Option<u32> {
// Given an initial string and an existing collection of slugs, // Given an initial string and an existing collection of slugs,
// generate a new slug that does not conflict with the current // generate a new slug that does not conflict with the current
// collection. // collection.
async fn generate_slug<'e, E>(executor: E, title: &str) -> SqlResult<String> async fn generate_slug<'a, E>(executor: E, title: &str) -> SqlResult<String>
where where
E: 'e + Executor<'e, Database = Sqlite>, E: Executor<'a, Database = Sqlite>
{ {
lazy_static! { lazy_static! {
static ref RE_STRIP_NUM: Regex = Regex::new(r"-\d+$").unwrap(); static ref RE_STRIP_NUM: Regex = Regex::new(r"-\d+$").unwrap();
@ -192,9 +210,9 @@ where
} }
} }
async fn insert_one_new_page<'e, E>(executor: E, page: &NewPage) -> SqlResult<i64> async fn insert_one_new_page<'a, E>(executor: E, page: &NewPage) -> SqlResult<i64>
where where
E: 'e + Executor<'e, Database = Sqlite>, E: Executor<'a, Database = Sqlite>,
{ {
let insert_one_page_sql = concat!( let insert_one_page_sql = concat!(
"INSERT INTO pages ( ", "INSERT INTO pages ( ",
@ -219,9 +237,21 @@ where
.last_insert_rowid()) .last_insert_rowid())
} }
async fn create_page_for_title<'e, E>(_executor: E, _title: &str) -> SqlResult<RawPage> fn create_unique_root_note() -> NewNote {
where NewNoteBuilder::default()
E: 'e + Executor<'e, Database = Sqlite>, .uuid(friendly_id::create())
{ .content("".to_string())
todo!() .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()
}