X-Git-Url: http://these/git/?a=blobdiff_plain;f=crates%2Fdb_schema%2Fsrc%2Faggregates%2Fperson_aggregates.rs;h=43feadd456524ce8e904290de0e4c4d754f2b915;hb=92568956353f21649ed9aff68b42699c9d036f30;hp=e9417efb23e04721ada781f5188fb883bb4377ef;hpb=235cc8b22897bfb3e71ba3dbd725d36863fea8ba;p=lemmy.git diff --git a/crates/db_schema/src/aggregates/person_aggregates.rs b/crates/db_schema/src/aggregates/person_aggregates.rs index e9417efb..43feadd4 100644 --- a/crates/db_schema/src/aggregates/person_aggregates.rs +++ b/crates/db_schema/src/aggregates/person_aggregates.rs @@ -1,36 +1,50 @@ -use crate::{aggregates::structs::PersonAggregates, newtypes::PersonId, schema::person_aggregates}; -use diesel::{result::Error, *}; +use crate::{ + aggregates::structs::PersonAggregates, + newtypes::PersonId, + schema::person_aggregates, + utils::{get_conn, DbPool}, +}; +use diesel::{result::Error, ExpressionMethods, QueryDsl}; +use diesel_async::RunQueryDsl; impl PersonAggregates { - pub fn read(conn: &mut PgConnection, person_id: PersonId) -> Result { + pub async fn read(pool: &mut DbPool<'_>, person_id: PersonId) -> Result { + let conn = &mut get_conn(pool).await?; person_aggregates::table .filter(person_aggregates::person_id.eq(person_id)) .first::(conn) + .await } } #[cfg(test)] mod tests { + #![allow(clippy::unwrap_used)] + #![allow(clippy::indexing_slicing)] + use crate::{ aggregates::person_aggregates::PersonAggregates, source::{ - comment::{Comment, CommentInsertForm, CommentLike, CommentLikeForm}, + comment::{Comment, CommentInsertForm, CommentLike, CommentLikeForm, CommentUpdateForm}, community::{Community, CommunityInsertForm}, instance::Instance, person::{Person, PersonInsertForm}, post::{Post, PostInsertForm, PostLike, PostLikeForm}, }, traits::{Crud, Likeable}, - utils::establish_unpooled_connection, + utils::build_db_pool_for_tests, }; use serial_test::serial; - #[test] + #[tokio::test] #[serial] - fn test_crud() { - let conn = &mut establish_unpooled_connection(); + async fn test_crud() { + let pool = &build_db_pool_for_tests().await; + let pool = &mut pool.into(); - let inserted_instance = Instance::create(conn, "my_domain.tld").unwrap(); + let inserted_instance = Instance::read_or_create(pool, "my_domain.tld".to_string()) + .await + .unwrap(); let new_person = PersonInsertForm::builder() .name("thommy_user_agg".into()) @@ -38,7 +52,7 @@ mod tests { .instance_id(inserted_instance.id) .build(); - let inserted_person = Person::create(conn, &new_person).unwrap(); + let inserted_person = Person::create(pool, &new_person).await.unwrap(); let another_person = PersonInsertForm::builder() .name("jerry_user_agg".into()) @@ -46,7 +60,7 @@ mod tests { .instance_id(inserted_instance.id) .build(); - let another_inserted_person = Person::create(conn, &another_person).unwrap(); + let another_inserted_person = Person::create(pool, &another_person).await.unwrap(); let new_community = CommunityInsertForm::builder() .name("TIL_site_agg".into()) @@ -55,7 +69,7 @@ mod tests { .instance_id(inserted_instance.id) .build(); - let inserted_community = Community::create(conn, &new_community).unwrap(); + let inserted_community = Community::create(pool, &new_community).await.unwrap(); let new_post = PostInsertForm::builder() .name("A test post".into()) @@ -63,7 +77,7 @@ mod tests { .community_id(inserted_community.id) .build(); - let inserted_post = Post::create(conn, &new_post).unwrap(); + let inserted_post = Post::create(pool, &new_post).await.unwrap(); let post_like = PostLikeForm { post_id: inserted_post.id, @@ -71,7 +85,7 @@ mod tests { score: 1, }; - let _inserted_post_like = PostLike::like(conn, &post_like).unwrap(); + let _inserted_post_like = PostLike::like(pool, &post_like).await.unwrap(); let comment_form = CommentInsertForm::builder() .content("A test comment".into()) @@ -79,7 +93,7 @@ mod tests { .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 mut comment_like = CommentLikeForm { comment_id: inserted_comment.id, @@ -88,7 +102,7 @@ mod tests { score: 1, }; - let _inserted_comment_like = CommentLike::like(conn, &comment_like).unwrap(); + let _inserted_comment_like = CommentLike::like(pool, &comment_like).await.unwrap(); let child_comment_form = CommentInsertForm::builder() .content("A test comment".into()) @@ -97,7 +111,9 @@ mod tests { .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(); let child_comment_like = CommentLikeForm { comment_id: inserted_child_comment.id, @@ -106,9 +122,11 @@ mod tests { score: 1, }; - let _inserted_child_comment_like = CommentLike::like(conn, &child_comment_like).unwrap(); + let _inserted_child_comment_like = CommentLike::like(pool, &child_comment_like).await.unwrap(); - let person_aggregates_before_delete = PersonAggregates::read(conn, inserted_person.id).unwrap(); + let person_aggregates_before_delete = PersonAggregates::read(pool, inserted_person.id) + .await + .unwrap(); assert_eq!(1, person_aggregates_before_delete.post_count); assert_eq!(1, person_aggregates_before_delete.post_score); @@ -116,47 +134,86 @@ mod tests { assert_eq!(2, person_aggregates_before_delete.comment_score); // Remove a post like - PostLike::remove(conn, inserted_person.id, inserted_post.id).unwrap(); - let after_post_like_remove = PersonAggregates::read(conn, inserted_person.id).unwrap(); + PostLike::remove(pool, inserted_person.id, inserted_post.id) + .await + .unwrap(); + let after_post_like_remove = PersonAggregates::read(pool, inserted_person.id) + .await + .unwrap(); assert_eq!(0, after_post_like_remove.post_score); + Comment::update( + pool, + inserted_comment.id, + &CommentUpdateForm::builder().removed(Some(true)).build(), + ) + .await + .unwrap(); + Comment::update( + pool, + inserted_child_comment.id, + &CommentUpdateForm::builder().removed(Some(true)).build(), + ) + .await + .unwrap(); + + let after_parent_comment_removed = PersonAggregates::read(pool, inserted_person.id) + .await + .unwrap(); + assert_eq!(0, after_parent_comment_removed.comment_count); + assert_eq!(0, after_parent_comment_removed.comment_score); + // Remove a parent comment (the scores should also be removed) - Comment::delete(conn, inserted_comment.id).unwrap(); - Comment::delete(conn, inserted_child_comment.id).unwrap(); - let after_parent_comment_delete = PersonAggregates::read(conn, inserted_person.id).unwrap(); + Comment::delete(pool, inserted_comment.id).await.unwrap(); + Comment::delete(pool, inserted_child_comment.id) + .await + .unwrap(); + let after_parent_comment_delete = PersonAggregates::read(pool, inserted_person.id) + .await + .unwrap(); assert_eq!(0, after_parent_comment_delete.comment_count); assert_eq!(0, after_parent_comment_delete.comment_score); // Add in the two comments again, then delete the post. - let new_parent_comment = Comment::create(conn, &comment_form, None).unwrap(); + let new_parent_comment = Comment::create(pool, &comment_form, None).await.unwrap(); let _new_child_comment = - Comment::create(conn, &child_comment_form, Some(&new_parent_comment.path)).unwrap(); + Comment::create(pool, &child_comment_form, Some(&new_parent_comment.path)) + .await + .unwrap(); comment_like.comment_id = new_parent_comment.id; - CommentLike::like(conn, &comment_like).unwrap(); - let after_comment_add = PersonAggregates::read(conn, inserted_person.id).unwrap(); + CommentLike::like(pool, &comment_like).await.unwrap(); + let after_comment_add = PersonAggregates::read(pool, inserted_person.id) + .await + .unwrap(); assert_eq!(2, after_comment_add.comment_count); assert_eq!(1, after_comment_add.comment_score); - Post::delete(conn, inserted_post.id).unwrap(); - let after_post_delete = PersonAggregates::read(conn, inserted_person.id).unwrap(); + Post::delete(pool, inserted_post.id).await.unwrap(); + let after_post_delete = PersonAggregates::read(pool, inserted_person.id) + .await + .unwrap(); assert_eq!(0, after_post_delete.comment_score); assert_eq!(0, after_post_delete.comment_count); assert_eq!(0, after_post_delete.post_score); assert_eq!(0, after_post_delete.post_count); // This should delete all the associated rows, and fire triggers - let person_num_deleted = Person::delete(conn, inserted_person.id).unwrap(); + let person_num_deleted = Person::delete(pool, inserted_person.id).await.unwrap(); assert_eq!(1, person_num_deleted); - Person::delete(conn, another_inserted_person.id).unwrap(); + Person::delete(pool, another_inserted_person.id) + .await + .unwrap(); // Delete the community - let community_num_deleted = Community::delete(conn, inserted_community.id).unwrap(); + let community_num_deleted = Community::delete(pool, inserted_community.id) + .await + .unwrap(); assert_eq!(1, community_num_deleted); // Should be none found - let after_delete = PersonAggregates::read(conn, inserted_person.id); + let after_delete = PersonAggregates::read(pool, inserted_person.id).await; assert!(after_delete.is_err()); - Instance::delete(conn, inserted_instance.id).unwrap(); + Instance::delete(pool, inserted_instance.id).await.unwrap(); } }