X-Git-Url: http://these/git/?a=blobdiff_plain;f=crates%2Fdb_schema%2Fsrc%2Fimpls%2Fcomment.rs;h=5346343264036523d86359132183463de95a0b01;hb=92568956353f21649ed9aff68b42699c9d036f30;hp=bb6a928b7d74277636ae99e22cda01a18e23695a;hpb=870abf84424f05f1f733b30ec6d6c9031f96edba;p=lemmy.git diff --git a/crates/db_schema/src/impls/comment.rs b/crates/db_schema/src/impls/comment.rs index bb6a928b..53463432 100644 --- a/crates/db_schema/src/impls/comment.rs +++ b/crates/db_schema/src/impls/comment.rs @@ -1,108 +1,63 @@ use crate::{ newtypes::{CommentId, DbUrl, PersonId}, + schema::comment::dsl::{ap_id, comment, content, creator_id, deleted, path, removed, updated}, source::comment::{ Comment, - CommentForm, + CommentInsertForm, CommentLike, CommentLikeForm, CommentSaved, CommentSavedForm, + CommentUpdateForm, }, - traits::{Crud, DeleteableOrRemoveable, Likeable, Saveable}, - utils::naive_now, + traits::{Crud, Likeable, Saveable}, + utils::{get_conn, naive_now, DbPool, DELETED_REPLACEMENT_TEXT}, }; -use diesel::{dsl::*, result::Error, *}; +use diesel::{ + dsl::{insert_into, sql_query}, + result::Error, + ExpressionMethods, + QueryDsl, +}; +use diesel_async::RunQueryDsl; use diesel_ltree::Ltree; use url::Url; impl Comment { - pub fn update_ap_id( - conn: &PgConnection, - comment_id: CommentId, - apub_id: DbUrl, - ) -> Result { - use crate::schema::comment::dsl::*; - - diesel::update(comment.find(comment_id)) - .set(ap_id.eq(apub_id)) - .get_result::(conn) - } - - pub fn permadelete_for_creator( - conn: &PgConnection, + pub async fn permadelete_for_creator( + pool: &mut DbPool<'_>, for_creator_id: PersonId, ) -> Result, Error> { - use crate::schema::comment::dsl::*; + let conn = &mut get_conn(pool).await?; + diesel::update(comment.filter(creator_id.eq(for_creator_id))) .set(( - content.eq("*Permananently Deleted*"), + content.eq(DELETED_REPLACEMENT_TEXT), deleted.eq(true), updated.eq(naive_now()), )) .get_results::(conn) + .await } - pub fn update_deleted( - conn: &PgConnection, - comment_id: CommentId, - new_deleted: bool, - ) -> Result { - use crate::schema::comment::dsl::*; - diesel::update(comment.find(comment_id)) - .set((deleted.eq(new_deleted), updated.eq(naive_now()))) - .get_result::(conn) - } - - pub fn update_removed( - conn: &PgConnection, - comment_id: CommentId, - new_removed: bool, - ) -> Result { - use crate::schema::comment::dsl::*; - diesel::update(comment.find(comment_id)) - .set((removed.eq(new_removed), updated.eq(naive_now()))) - .get_result::(conn) - } - - pub fn update_removed_for_creator( - conn: &PgConnection, + pub async fn update_removed_for_creator( + pool: &mut DbPool<'_>, for_creator_id: PersonId, new_removed: bool, ) -> Result, Error> { - use crate::schema::comment::dsl::*; + let conn = &mut get_conn(pool).await?; diesel::update(comment.filter(creator_id.eq(for_creator_id))) .set((removed.eq(new_removed), updated.eq(naive_now()))) .get_results::(conn) + .await } - pub fn update_content( - conn: &PgConnection, - comment_id: CommentId, - new_content: &str, - ) -> Result { - use crate::schema::comment::dsl::*; - diesel::update(comment.find(comment_id)) - .set((content.eq(new_content), updated.eq(naive_now()))) - .get_result::(conn) - } - - pub fn update_distinguished( - conn: &PgConnection, - comment_id: CommentId, - new_distinguished: bool, - ) -> Result { - use crate::schema::comment::dsl::*; - diesel::update(comment.find(comment_id)) - .set((distinguished.eq(new_distinguished), updated.eq(naive_now()))) - .get_result::(conn) - } - - pub fn create( - conn: &PgConnection, - comment_form: &CommentForm, + pub async fn create( + pool: &mut DbPool<'_>, + comment_form: &CommentInsertForm, parent_path: Option<&Ltree>, ) -> Result { - use crate::schema::comment::dsl::*; + let conn = &mut get_conn(pool).await?; // Insert, to get the id let inserted_comment = insert_into(comment) @@ -110,7 +65,8 @@ impl Comment { .on_conflict(ap_id) .do_update() .set(comment_form) - .get_result::(conn); + .get_result::(conn) + .await; if let Ok(comment_insert) = inserted_comment { let comment_id = comment_insert.id; @@ -127,7 +83,8 @@ impl Comment { let updated_comment = diesel::update(comment.find(comment_id)) .set(path.eq(ltree)) - .get_result::(conn); + .get_result::(conn) + .await; // Update the child count for the parent comment_aggregates // You could do this with a trigger, but since you have to do this manually anyway, @@ -142,34 +99,41 @@ impl Comment { // left join comment c2 on c2.path <@ c.path and c2.path != c.path // group by c.id - let top_parent = format!("0.{}", parent_path.0.split('.').collect::>()[1]); - let update_child_count_stmt = format!( - " + let parent_id = parent_path.0.split('.').nth(1); + + if let Some(parent_id) = parent_id { + let top_parent = format!("0.{}", parent_id); + let update_child_count_stmt = format!( + " update comment_aggregates ca set child_count = c.child_count from ( select c.id, c.path, count(c2.id) as child_count from comment c join comment c2 on c2.path <@ c.path and c2.path != c.path - and c.path <@ '{}' + and c.path <@ '{top_parent}' group by c.id ) as c -where ca.comment_id = c.id", - top_parent - ); +where ca.comment_id = c.id" + ); - sql_query(update_child_count_stmt).execute(conn)?; + sql_query(update_child_count_stmt).execute(conn).await?; + } } updated_comment } else { inserted_comment } } - pub fn read_from_apub_id(conn: &PgConnection, object_id: Url) -> Result, Error> { - use crate::schema::comment::dsl::*; + pub async fn read_from_apub_id( + pool: &mut DbPool<'_>, + object_id: Url, + ) -> Result, Error> { + let conn = &mut get_conn(pool).await?; let object_id: DbUrl = object_id.into(); Ok( comment .filter(ap_id.eq(object_id)) .first::(conn) + .await .ok() .map(Into::into), ) @@ -179,156 +143,182 @@ where ca.comment_id = c.id", let mut ltree_split: Vec<&str> = self.path.0.split('.').collect(); ltree_split.remove(0); // The first is always 0 if ltree_split.len() > 1 { - ltree_split[ltree_split.len() - 2] - .parse::() - .map(CommentId) - .ok() + let parent_comment_id = ltree_split.get(ltree_split.len() - 2); + parent_comment_id.and_then(|p| p.parse::().map(CommentId).ok()) } else { None } } } +#[async_trait] impl Crud for Comment { - type Form = CommentForm; + type InsertForm = CommentInsertForm; + type UpdateForm = CommentUpdateForm; type IdType = CommentId; - fn read(conn: &PgConnection, comment_id: CommentId) -> Result { - use crate::schema::comment::dsl::*; - comment.find(comment_id).first::(conn) + async fn read(pool: &mut DbPool<'_>, comment_id: CommentId) -> Result { + let conn = &mut get_conn(pool).await?; + comment.find(comment_id).first::(conn).await } - fn delete(conn: &PgConnection, comment_id: CommentId) -> Result { - use crate::schema::comment::dsl::*; - diesel::delete(comment.find(comment_id)).execute(conn) + async fn delete(pool: &mut DbPool<'_>, comment_id: CommentId) -> Result { + let conn = &mut get_conn(pool).await?; + diesel::delete(comment.find(comment_id)).execute(conn).await } /// This is unimplemented, use [[Comment::create]] - fn create(_conn: &PgConnection, _comment_form: &CommentForm) -> Result { + async fn create(_pool: &mut DbPool<'_>, _comment_form: &Self::InsertForm) -> Result { unimplemented!(); } - fn update( - conn: &PgConnection, + async fn update( + pool: &mut DbPool<'_>, comment_id: CommentId, - comment_form: &CommentForm, + comment_form: &Self::UpdateForm, ) -> Result { - use crate::schema::comment::dsl::*; + let conn = &mut get_conn(pool).await?; diesel::update(comment.find(comment_id)) .set(comment_form) .get_result::(conn) + .await } } +#[async_trait] impl Likeable for CommentLike { type Form = CommentLikeForm; type IdType = CommentId; - fn like(conn: &PgConnection, comment_like_form: &CommentLikeForm) -> Result { - use crate::schema::comment_like::dsl::*; + async fn like(pool: &mut DbPool<'_>, comment_like_form: &CommentLikeForm) -> Result { + use crate::schema::comment_like::dsl::{comment_id, comment_like, person_id}; + let conn = &mut get_conn(pool).await?; insert_into(comment_like) .values(comment_like_form) .on_conflict((comment_id, person_id)) .do_update() .set(comment_like_form) .get_result::(conn) + .await } - fn remove( - conn: &PgConnection, - person_id: PersonId, - comment_id: CommentId, + async fn remove( + pool: &mut DbPool<'_>, + person_id_: PersonId, + comment_id_: CommentId, ) -> Result { - use crate::schema::comment_like::dsl; + use crate::schema::comment_like::dsl::{comment_id, comment_like, person_id}; + let conn = &mut get_conn(pool).await?; diesel::delete( - dsl::comment_like - .filter(dsl::comment_id.eq(comment_id)) - .filter(dsl::person_id.eq(person_id)), + comment_like + .filter(comment_id.eq(comment_id_)) + .filter(person_id.eq(person_id_)), ) .execute(conn) + .await } } +#[async_trait] impl Saveable for CommentSaved { type Form = CommentSavedForm; - fn save(conn: &PgConnection, comment_saved_form: &CommentSavedForm) -> Result { - use crate::schema::comment_saved::dsl::*; + async fn save( + pool: &mut DbPool<'_>, + comment_saved_form: &CommentSavedForm, + ) -> Result { + use crate::schema::comment_saved::dsl::{comment_id, comment_saved, person_id}; + let conn = &mut get_conn(pool).await?; insert_into(comment_saved) .values(comment_saved_form) .on_conflict((comment_id, person_id)) .do_update() .set(comment_saved_form) .get_result::(conn) + .await } - fn unsave(conn: &PgConnection, comment_saved_form: &CommentSavedForm) -> Result { - use crate::schema::comment_saved::dsl::*; + async fn unsave( + pool: &mut DbPool<'_>, + comment_saved_form: &CommentSavedForm, + ) -> Result { + use crate::schema::comment_saved::dsl::{comment_id, comment_saved, person_id}; + let conn = &mut get_conn(pool).await?; diesel::delete( comment_saved .filter(comment_id.eq(comment_saved_form.comment_id)) .filter(person_id.eq(comment_saved_form.person_id)), ) .execute(conn) - } -} - -impl DeleteableOrRemoveable for Comment { - fn blank_out_deleted_or_removed_info(mut self) -> Self { - self.content = "".into(); - self + .await } } #[cfg(test)] mod tests { + #![allow(clippy::unwrap_used)] + #![allow(clippy::indexing_slicing)] + use crate::{ + newtypes::LanguageId, source::{ - comment::*, - community::{Community, CommunityForm}, - person::{Person, PersonForm}, - post::*, + comment::{ + Comment, + CommentInsertForm, + CommentLike, + CommentLikeForm, + CommentSaved, + CommentSavedForm, + CommentUpdateForm, + }, + community::{Community, CommunityInsertForm}, + instance::Instance, + person::{Person, PersonInsertForm}, + post::{Post, PostInsertForm}, }, traits::{Crud, Likeable, Saveable}, - utils::establish_unpooled_connection, + utils::build_db_pool_for_tests, }; use diesel_ltree::Ltree; use serial_test::serial; - #[test] + #[tokio::test] #[serial] - fn test_crud() { - let conn = establish_unpooled_connection(); + async fn test_crud() { + let pool = &build_db_pool_for_tests().await; + let pool = &mut pool.into(); - let new_person = PersonForm { - name: "terry".into(), - public_key: Some("pubkey".to_string()), - ..PersonForm::default() - }; + let inserted_instance = Instance::read_or_create(pool, "my_domain.tld".to_string()) + .await + .unwrap(); - let inserted_person = Person::create(&conn, &new_person).unwrap(); + let new_person = PersonInsertForm::builder() + .name("terry".into()) + .public_key("pubkey".to_string()) + .instance_id(inserted_instance.id) + .build(); - let new_community = CommunityForm { - name: "test community".to_string(), - title: "nada".to_owned(), - public_key: Some("pubkey".to_string()), - ..CommunityForm::default() - }; + let inserted_person = Person::create(pool, &new_person).await.unwrap(); - let inserted_community = Community::create(&conn, &new_community).unwrap(); + let new_community = CommunityInsertForm::builder() + .name("test community".to_string()) + .title("nada".to_owned()) + .public_key("pubkey".to_string()) + .instance_id(inserted_instance.id) + .build(); - let new_post = PostForm { - name: "A test post".into(), - creator_id: inserted_person.id, - community_id: inserted_community.id, - ..PostForm::default() - }; + let inserted_community = Community::create(pool, &new_community).await.unwrap(); - let inserted_post = Post::create(&conn, &new_post).unwrap(); + let new_post = PostInsertForm::builder() + .name("A test post".into()) + .creator_id(inserted_person.id) + .community_id(inserted_community.id) + .build(); - let comment_form = CommentForm { - content: "A test comment".into(), - creator_id: inserted_person.id, - post_id: inserted_post.id, - ..CommentForm::default() - }; + let inserted_post = Post::create(pool, &new_post).await.unwrap(); + + let comment_form = CommentInsertForm::builder() + .content("A test comment".into()) + .creator_id(inserted_person.id) + .post_id(inserted_post.id) + .build(); - let inserted_comment = Comment::create(&conn, &comment_form, None).unwrap(); + let inserted_comment = Comment::create(pool, &comment_form, None).await.unwrap(); let expected_comment = Comment { id: inserted_comment.id, @@ -340,21 +330,22 @@ mod tests { path: Ltree(format!("0.{}", inserted_comment.id)), published: inserted_comment.published, updated: None, - ap_id: inserted_comment.ap_id.to_owned(), + ap_id: inserted_comment.ap_id.clone(), distinguished: false, local: true, + language_id: LanguageId::default(), }; - let child_comment_form = CommentForm { - content: "A child comment".into(), - creator_id: inserted_person.id, - post_id: inserted_post.id, - // path: Some(text2ltree(inserted_comment.id), - ..CommentForm::default() - }; + let child_comment_form = CommentInsertForm::builder() + .content("A child comment".into()) + .creator_id(inserted_person.id) + .post_id(inserted_post.id) + .build(); let inserted_child_comment = - Comment::create(&conn, &child_comment_form, Some(&inserted_comment.path)).unwrap(); + Comment::create(pool, &child_comment_form, Some(&inserted_comment.path)) + .await + .unwrap(); // Comment Like let comment_like_form = CommentLikeForm { @@ -364,7 +355,7 @@ mod tests { score: 1, }; - let inserted_comment_like = CommentLike::like(&conn, &comment_like_form).unwrap(); + let inserted_comment_like = CommentLike::like(pool, &comment_like_form).await.unwrap(); let expected_comment_like = CommentLike { id: inserted_comment_like.id, @@ -381,7 +372,7 @@ mod tests { person_id: inserted_person.id, }; - let inserted_comment_saved = CommentSaved::save(&conn, &comment_saved_form).unwrap(); + let inserted_comment_saved = CommentSaved::save(pool, &comment_saved_form).await.unwrap(); let expected_comment_saved = CommentSaved { id: inserted_comment_saved.id, @@ -390,15 +381,31 @@ mod tests { published: inserted_comment_saved.published, }; - let read_comment = Comment::read(&conn, inserted_comment.id).unwrap(); - let updated_comment = Comment::update(&conn, inserted_comment.id, &comment_form).unwrap(); - let like_removed = CommentLike::remove(&conn, inserted_person.id, inserted_comment.id).unwrap(); - let saved_removed = CommentSaved::unsave(&conn, &comment_saved_form).unwrap(); - let num_deleted = Comment::delete(&conn, inserted_comment.id).unwrap(); - Comment::delete(&conn, inserted_child_comment.id).unwrap(); - Post::delete(&conn, inserted_post.id).unwrap(); - Community::delete(&conn, inserted_community.id).unwrap(); - Person::delete(&conn, inserted_person.id).unwrap(); + let comment_update_form = CommentUpdateForm::builder() + .content(Some("A test comment".into())) + .build(); + + let updated_comment = Comment::update(pool, inserted_comment.id, &comment_update_form) + .await + .unwrap(); + + let read_comment = Comment::read(pool, inserted_comment.id).await.unwrap(); + let like_removed = CommentLike::remove(pool, inserted_person.id, inserted_comment.id) + .await + .unwrap(); + let saved_removed = CommentSaved::unsave(pool, &comment_saved_form) + .await + .unwrap(); + let num_deleted = Comment::delete(pool, inserted_comment.id).await.unwrap(); + Comment::delete(pool, inserted_child_comment.id) + .await + .unwrap(); + Post::delete(pool, inserted_post.id).await.unwrap(); + Community::delete(pool, inserted_community.id) + .await + .unwrap(); + Person::delete(pool, inserted_person.id).await.unwrap(); + Instance::delete(pool, inserted_instance.id).await.unwrap(); assert_eq!(expected_comment, read_comment); assert_eq!(expected_comment, inserted_comment);