-use crate::{aggregates::structs::PostAggregates, newtypes::PostId, schema::post_aggregates};
-use diesel::{result::Error, *};
+use crate::{
+ aggregates::structs::PostAggregates,
+ newtypes::PostId,
+ schema::post_aggregates,
+ utils::{functions::hot_rank, get_conn, DbPool},
+};
+use diesel::{result::Error, ExpressionMethods, QueryDsl};
+use diesel_async::RunQueryDsl;
impl PostAggregates {
- pub fn read(conn: &PgConnection, post_id: PostId) -> Result<Self, Error> {
+ pub async fn read(pool: &mut DbPool<'_>, post_id: PostId) -> Result<Self, Error> {
+ let conn = &mut get_conn(pool).await?;
post_aggregates::table
.filter(post_aggregates::post_id.eq(post_id))
.first::<Self>(conn)
+ .await
+ }
+
+ pub async fn update_hot_rank(pool: &mut DbPool<'_>, post_id: PostId) -> Result<Self, Error> {
+ let conn = &mut get_conn(pool).await?;
+
+ diesel::update(post_aggregates::table)
+ .filter(post_aggregates::post_id.eq(post_id))
+ .set((
+ post_aggregates::hot_rank.eq(hot_rank(post_aggregates::score, post_aggregates::published)),
+ post_aggregates::hot_rank_active.eq(hot_rank(
+ post_aggregates::score,
+ post_aggregates::newest_comment_time_necro,
+ )),
+ ))
+ .get_result::<Self>(conn)
+ .await
}
}
#[cfg(test)]
mod tests {
+ #![allow(clippy::unwrap_used)]
+ #![allow(clippy::indexing_slicing)]
+
use crate::{
aggregates::post_aggregates::PostAggregates,
source::{
- comment::{Comment, CommentForm},
- community::{Community, CommunityForm},
- person::{Person, PersonForm},
- post::{Post, PostForm, PostLike, PostLikeForm},
+ comment::{Comment, CommentInsertForm, 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 = 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_community_agg".into(),
- ..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_community_agg".into())
+ .public_key("pubkey".to_string())
+ .instance_id(inserted_instance.id)
+ .build();
- let another_person = PersonForm {
- name: "jerry_community_agg".into(),
- ..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_community_agg".into())
+ .public_key("pubkey".to_string())
+ .instance_id(inserted_instance.id)
+ .build();
- let new_community = CommunityForm {
- name: "TIL_community_agg".into(),
- title: "nada".to_owned(),
- ..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_community_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).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,
- parent_id: Some(inserted_comment.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).unwrap();
+ let inserted_child_comment =
+ Comment::create(pool, &child_comment_form, Some(&inserted_comment.path))
+ .await
+ .unwrap();
let post_like = PostLikeForm {
post_id: inserted_post.id,
score: 1,
};
- PostLike::like(&conn, &post_like).unwrap();
+ PostLike::like(pool, &post_like).await.unwrap();
- let post_aggs_before_delete = PostAggregates::read(&conn, inserted_post.id).unwrap();
+ let post_aggs_before_delete = PostAggregates::read(pool, inserted_post.id).await.unwrap();
assert_eq!(2, post_aggs_before_delete.comments);
assert_eq!(1, post_aggs_before_delete.score);
score: -1,
};
- PostLike::like(&conn, &post_dislike).unwrap();
+ PostLike::like(pool, &post_dislike).await.unwrap();
- let post_aggs_after_dislike = PostAggregates::read(&conn, inserted_post.id).unwrap();
+ let post_aggs_after_dislike = PostAggregates::read(pool, inserted_post.id).await.unwrap();
assert_eq!(2, post_aggs_after_dislike.comments);
assert_eq!(0, post_aggs_after_dislike.score);
assert_eq!(1, post_aggs_after_dislike.upvotes);
assert_eq!(1, post_aggs_after_dislike.downvotes);
- // Remove the parent comment
- Comment::delete(&conn, inserted_comment.id).unwrap();
- let after_comment_delete = PostAggregates::read(&conn, inserted_post.id).unwrap();
+ // Remove the comments
+ Comment::delete(pool, inserted_comment.id).await.unwrap();
+ Comment::delete(pool, inserted_child_comment.id)
+ .await
+ .unwrap();
+ let after_comment_delete = PostAggregates::read(pool, inserted_post.id).await.unwrap();
assert_eq!(0, after_comment_delete.comments);
assert_eq!(0, after_comment_delete.score);
assert_eq!(1, after_comment_delete.upvotes);
assert_eq!(1, after_comment_delete.downvotes);
// Remove the first post like
- PostLike::remove(&conn, inserted_person.id, inserted_post.id).unwrap();
- let after_like_remove = PostAggregates::read(&conn, inserted_post.id).unwrap();
+ PostLike::remove(pool, inserted_person.id, inserted_post.id)
+ .await
+ .unwrap();
+ let after_like_remove = PostAggregates::read(pool, inserted_post.id).await.unwrap();
assert_eq!(0, after_like_remove.comments);
assert_eq!(-1, after_like_remove.score);
assert_eq!(0, after_like_remove.upvotes);
assert_eq!(1, after_like_remove.downvotes);
// 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);
// Should be none found, since the creator was deleted
- let after_delete = PostAggregates::read(&conn, inserted_post.id);
+ let after_delete = PostAggregates::read(pool, inserted_post.id).await;
assert!(after_delete.is_err());
+
+ Instance::delete(pool, inserted_instance.id).await.unwrap();
+ }
+
+ #[tokio::test]
+ #[serial]
+ async fn test_soft_delete() {
+ let pool = &build_db_pool_for_tests().await;
+ let pool = &mut pool.into();
+
+ let inserted_instance = Instance::read_or_create(pool, "my_domain.tld".to_string())
+ .await
+ .unwrap();
+
+ let new_person = PersonInsertForm::builder()
+ .name("thommy_community_agg".into())
+ .public_key("pubkey".to_string())
+ .instance_id(inserted_instance.id)
+ .build();
+
+ let inserted_person = Person::create(pool, &new_person).await.unwrap();
+
+ let new_community = CommunityInsertForm::builder()
+ .name("TIL_community_agg".into())
+ .title("nada".to_owned())
+ .public_key("pubkey".to_string())
+ .instance_id(inserted_instance.id)
+ .build();
+
+ let inserted_community = Community::create(pool, &new_community).await.unwrap();
+
+ let new_post = PostInsertForm::builder()
+ .name("A test post".into())
+ .creator_id(inserted_person.id)
+ .community_id(inserted_community.id)
+ .build();
+
+ 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(pool, &comment_form, None).await.unwrap();
+
+ let post_aggregates_before = PostAggregates::read(pool, inserted_post.id).await.unwrap();
+ assert_eq!(1, post_aggregates_before.comments);
+
+ Comment::update(
+ pool,
+ inserted_comment.id,
+ &CommentUpdateForm::builder().removed(Some(true)).build(),
+ )
+ .await
+ .unwrap();
+
+ let post_aggregates_after_remove = PostAggregates::read(pool, inserted_post.id).await.unwrap();
+ assert_eq!(0, post_aggregates_after_remove.comments);
+
+ Comment::update(
+ pool,
+ inserted_comment.id,
+ &CommentUpdateForm::builder().removed(Some(false)).build(),
+ )
+ .await
+ .unwrap();
+
+ Comment::update(
+ pool,
+ inserted_comment.id,
+ &CommentUpdateForm::builder().deleted(Some(true)).build(),
+ )
+ .await
+ .unwrap();
+
+ let post_aggregates_after_delete = PostAggregates::read(pool, inserted_post.id).await.unwrap();
+ assert_eq!(0, post_aggregates_after_delete.comments);
+
+ Comment::update(
+ pool,
+ inserted_comment.id,
+ &CommentUpdateForm::builder().removed(Some(true)).build(),
+ )
+ .await
+ .unwrap();
+
+ let post_aggregates_after_delete_remove =
+ PostAggregates::read(pool, inserted_post.id).await.unwrap();
+ assert_eq!(0, post_aggregates_after_delete_remove.comments);
+
+ Comment::delete(pool, inserted_comment.id).await.unwrap();
+ Post::delete(pool, inserted_post.id).await.unwrap();
+ Person::delete(pool, inserted_person.id).await.unwrap();
+ Community::delete(pool, inserted_community.id)
+ .await
+ .unwrap();
+ Instance::delete(pool, inserted_instance.id).await.unwrap();
}
}
projects / lemmy.git / blobdiff