X-Git-Url: http://these/git/?a=blobdiff_plain;f=crates%2Fdb_schema%2Fsrc%2Faggregates%2Fcomment_aggregates.rs;h=e081d1a1ece3c705c1a70250998de605c89bc219;hb=92568956353f21649ed9aff68b42699c9d036f30;hp=679efeac0f2cd73f23e62ff07e4ecdfd7dcf5aae;hpb=9c3efe32e7b2ef7978b7957eac10691beb551dde;p=lemmy.git diff --git a/crates/db_schema/src/aggregates/comment_aggregates.rs b/crates/db_schema/src/aggregates/comment_aggregates.rs index 679efeac..e081d1a1 100644 --- a/crates/db_schema/src/aggregates/comment_aggregates.rs +++ b/crates/db_schema/src/aggregates/comment_aggregates.rs @@ -2,89 +2,117 @@ use crate::{ aggregates::structs::CommentAggregates, newtypes::CommentId, schema::comment_aggregates, + utils::{functions::hot_rank, get_conn, DbPool}, }; -use diesel::{result::Error, *}; +use diesel::{result::Error, ExpressionMethods, QueryDsl}; +use diesel_async::RunQueryDsl; impl CommentAggregates { - pub fn read(conn: &PgConnection, comment_id: CommentId) -> Result { + pub async fn read(pool: &mut DbPool<'_>, comment_id: CommentId) -> Result { + let conn = &mut get_conn(pool).await?; comment_aggregates::table .filter(comment_aggregates::comment_id.eq(comment_id)) .first::(conn) + .await + } + + pub async fn update_hot_rank( + pool: &mut DbPool<'_>, + comment_id: CommentId, + ) -> Result { + let conn = &mut get_conn(pool).await?; + + diesel::update(comment_aggregates::table) + .filter(comment_aggregates::comment_id.eq(comment_id)) + .set(comment_aggregates::hot_rank.eq(hot_rank( + comment_aggregates::score, + comment_aggregates::published, + ))) + .get_result::(conn) + .await } } #[cfg(test)] mod tests { + #![allow(clippy::unwrap_used)] + #![allow(clippy::indexing_slicing)] + use crate::{ aggregates::comment_aggregates::CommentAggregates, source::{ - comment::{Comment, CommentForm, CommentLike, CommentLikeForm}, - community::{Community, CommunityForm}, - person::{Person, PersonForm}, - post::{Post, PostForm}, + comment::{Comment, CommentInsertForm, CommentLike, CommentLikeForm}, + community::{Community, CommunityInsertForm}, + instance::Instance, + person::{Person, PersonInsertForm}, + post::{Post, PostInsertForm}, }, 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 = 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: "thommy_comment_agg".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("thommy_comment_agg".into()) + .public_key("pubkey".into()) + .instance_id(inserted_instance.id) + .build(); - let another_person = PersonForm { - name: "jerry_comment_agg".into(), - public_key: Some("pubkey".to_string()), - ..PersonForm::default() - }; + let inserted_person = Person::create(pool, &new_person).await.unwrap(); - let another_inserted_person = Person::create(&conn, &another_person).unwrap(); + let another_person = PersonInsertForm::builder() + .name("jerry_comment_agg".into()) + .public_key("pubkey".into()) + .instance_id(inserted_instance.id) + .build(); - let new_community = CommunityForm { - name: "TIL_comment_agg".into(), - title: "nada".to_owned(), - public_key: Some("pubkey".to_string()), - ..CommunityForm::default() - }; + let another_inserted_person = Person::create(pool, &another_person).await.unwrap(); - let inserted_community = Community::create(&conn, &new_community).unwrap(); + let new_community = CommunityInsertForm::builder() + .name("TIL_comment_agg".into()) + .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 inserted_comment = Comment::create(&conn, &comment_form, None).unwrap(); + let comment_form = CommentInsertForm::builder() + .content("A test comment".into()) + .creator_id(inserted_person.id) + .post_id(inserted_post.id) + .build(); - let child_comment_form = CommentForm { - content: "A test comment".into(), - creator_id: inserted_person.id, - post_id: inserted_post.id, - ..CommentForm::default() - }; + let inserted_comment = Comment::create(pool, &comment_form, None).await.unwrap(); + + let child_comment_form = CommentInsertForm::builder() + .content("A test 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(); let comment_like = CommentLikeForm { comment_id: inserted_comment.id, @@ -93,9 +121,11 @@ mod tests { score: 1, }; - CommentLike::like(&conn, &comment_like).unwrap(); + CommentLike::like(pool, &comment_like).await.unwrap(); - let comment_aggs_before_delete = CommentAggregates::read(&conn, inserted_comment.id).unwrap(); + let comment_aggs_before_delete = CommentAggregates::read(pool, inserted_comment.id) + .await + .unwrap(); assert_eq!(1, comment_aggs_before_delete.score); assert_eq!(1, comment_aggs_before_delete.upvotes); @@ -109,35 +139,47 @@ mod tests { score: -1, }; - CommentLike::like(&conn, &comment_dislike).unwrap(); + CommentLike::like(pool, &comment_dislike).await.unwrap(); - let comment_aggs_after_dislike = CommentAggregates::read(&conn, inserted_comment.id).unwrap(); + let comment_aggs_after_dislike = CommentAggregates::read(pool, inserted_comment.id) + .await + .unwrap(); assert_eq!(0, comment_aggs_after_dislike.score); assert_eq!(1, comment_aggs_after_dislike.upvotes); assert_eq!(1, comment_aggs_after_dislike.downvotes); // Remove the first comment like - CommentLike::remove(&conn, inserted_person.id, inserted_comment.id).unwrap(); - let after_like_remove = CommentAggregates::read(&conn, inserted_comment.id).unwrap(); + CommentLike::remove(pool, inserted_person.id, inserted_comment.id) + .await + .unwrap(); + let after_like_remove = CommentAggregates::read(pool, inserted_comment.id) + .await + .unwrap(); assert_eq!(-1, after_like_remove.score); assert_eq!(0, after_like_remove.upvotes); assert_eq!(1, after_like_remove.downvotes); // Remove the parent post - Post::delete(&conn, inserted_post.id).unwrap(); + Post::delete(pool, inserted_post.id).await.unwrap(); // Should be none found, since the post was deleted - let after_delete = CommentAggregates::read(&conn, inserted_comment.id); + let after_delete = CommentAggregates::read(pool, inserted_comment.id).await; assert!(after_delete.is_err()); // This should delete all the associated rows, and fire triggers - Person::delete(&conn, another_inserted_person.id).unwrap(); - let person_num_deleted = Person::delete(&conn, inserted_person.id).unwrap(); + Person::delete(pool, another_inserted_person.id) + .await + .unwrap(); + let person_num_deleted = Person::delete(pool, inserted_person.id).await.unwrap(); assert_eq!(1, person_num_deleted); // 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); + + Instance::delete(pool, inserted_instance.id).await.unwrap(); } }