mirror of
https://github.com/LemmyNet/lemmy.git
synced 2024-06-19 13:50:32 +00:00
* a lot * merge * Fix stuff broken by merge * Get rid of repetitive `&mut *context.conn().await?` * Add blank lines under each line with `conn =` * Fix style mistakes (partial) * Revert "Fix style mistakes (partial)" This reverts commit48a033b87f
. * Revert "Add blank lines under each line with `conn =`" This reverts commit773a6d3beb
. * Revert "Get rid of repetitive `&mut *context.conn().await?`" This reverts commitd2c6263ea1
. * Use DbConn for CaptchaAnswer methods * DbConn trait * Remove more `&mut *` * Fix stuff * Re-run CI * try to make ci start * fix * fix * Fix api_common::utils * Fix apub::activities::block * Fix apub::api::resolve_object * Fix some things * Revert "Fix some things" This reverts commit2bf8574bc8
. * Revert "Fix apub::api::resolve_object" This reverts commit3e4059aabb
. * Revert "Fix apub::activities::block" This reverts commit3b02389abd
. * Revert "Fix api_common::utils" This reverts commit7dc73de613
. * Revert "Revert "Fix api_common::utils"" This reverts commitf740f115e5
. * Revert "Revert "Fix apub::activities::block"" This reverts commit2ee206af7c
. * Revert "Revert "Fix apub::api::resolve_object"" This reverts commit96ed8bf2e9
. * Fix fetch_local_site_data * Fix get_comment_parent_creator * Remove unused perma deleted text * Fix routes::feeds * Fix lib.rs * Update lib.rs * rerun ci * Attempt to create custom GetConn and RunQueryDsl traits * Start over * Add GetConn trait * aaaa * Revert "aaaa" This reverts commitacc9ca1aed
. * Revert "Revert "aaaa"" This reverts commit443a2a00a5
. * still aaaaaaaaaaaaa * Return to earlier thing Revert "Add GetConn trait" This reverts commitab4e94aea5
. * Try to use DbPool enum * Revert "Try to use DbPool enum" This reverts commite4d1712646
. * DbConn and DbPool enums (db_schema only fails to compile for tests) * fmt * Make functions take `&mut DbPool<'_>` and make db_schema tests compile * Add try_join_with_pool macro and run fix-clippy on more crates * Fix some errors * I did it * Remove function variants that take connection * rerun ci * rerun ci * rerun ci
183 lines
5.5 KiB
Rust
183 lines
5.5 KiB
Rust
use crate::{
|
|
aggregates::structs::CommentAggregates,
|
|
newtypes::CommentId,
|
|
schema::comment_aggregates,
|
|
utils::{functions::hot_rank, get_conn, DbPool},
|
|
};
|
|
use diesel::{result::Error, ExpressionMethods, QueryDsl};
|
|
use diesel_async::RunQueryDsl;
|
|
|
|
impl CommentAggregates {
|
|
pub async fn read(pool: &mut DbPool<'_>, comment_id: CommentId) -> Result<Self, Error> {
|
|
let conn = &mut get_conn(pool).await?;
|
|
comment_aggregates::table
|
|
.filter(comment_aggregates::comment_id.eq(comment_id))
|
|
.first::<Self>(conn)
|
|
.await
|
|
}
|
|
|
|
pub async fn update_hot_rank(
|
|
pool: &mut DbPool<'_>,
|
|
comment_id: CommentId,
|
|
) -> Result<Self, Error> {
|
|
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::<Self>(conn)
|
|
.await
|
|
}
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use crate::{
|
|
aggregates::comment_aggregates::CommentAggregates,
|
|
source::{
|
|
comment::{Comment, CommentInsertForm, CommentLike, CommentLikeForm},
|
|
community::{Community, CommunityInsertForm},
|
|
instance::Instance,
|
|
person::{Person, PersonInsertForm},
|
|
post::{Post, PostInsertForm},
|
|
},
|
|
traits::{Crud, Likeable},
|
|
utils::build_db_pool_for_tests,
|
|
};
|
|
use serial_test::serial;
|
|
|
|
#[tokio::test]
|
|
#[serial]
|
|
async fn test_crud() {
|
|
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_comment_agg".into())
|
|
.public_key("pubkey".into())
|
|
.instance_id(inserted_instance.id)
|
|
.build();
|
|
|
|
let inserted_person = Person::create(pool, &new_person).await.unwrap();
|
|
|
|
let another_person = PersonInsertForm::builder()
|
|
.name("jerry_comment_agg".into())
|
|
.public_key("pubkey".into())
|
|
.instance_id(inserted_instance.id)
|
|
.build();
|
|
|
|
let another_inserted_person = Person::create(pool, &another_person).await.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 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 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(pool, &child_comment_form, Some(&inserted_comment.path))
|
|
.await
|
|
.unwrap();
|
|
|
|
let comment_like = CommentLikeForm {
|
|
comment_id: inserted_comment.id,
|
|
post_id: inserted_post.id,
|
|
person_id: inserted_person.id,
|
|
score: 1,
|
|
};
|
|
|
|
CommentLike::like(pool, &comment_like).await.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);
|
|
assert_eq!(0, comment_aggs_before_delete.downvotes);
|
|
|
|
// Add a post dislike from the other person
|
|
let comment_dislike = CommentLikeForm {
|
|
comment_id: inserted_comment.id,
|
|
post_id: inserted_post.id,
|
|
person_id: another_inserted_person.id,
|
|
score: -1,
|
|
};
|
|
|
|
CommentLike::like(pool, &comment_dislike).await.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(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(pool, inserted_post.id).await.unwrap();
|
|
|
|
// Should be none found, since the post was deleted
|
|
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(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(pool, inserted_community.id)
|
|
.await
|
|
.unwrap();
|
|
assert_eq!(1, community_num_deleted);
|
|
|
|
Instance::delete(pool, inserted_instance.id).await.unwrap();
|
|
}
|
|
}
|