2024-04-16 12:48:15 +00:00
|
|
|
pub(crate) use crate::diesel::OptionalExtension;
|
2022-11-09 10:05:00 +00:00
|
|
|
use crate::{
|
|
|
|
aggregates::structs::PersonAggregates,
|
|
|
|
newtypes::PersonId,
|
|
|
|
schema::person_aggregates,
|
|
|
|
utils::{get_conn, DbPool},
|
|
|
|
};
|
Remove id column and use different primary key on some tables (#4093)
* post_saved
* fmt
* remove unique and not null
* put person_id first in primary key and remove index
* use post_saved.find
* change captcha_answer
* remove removal of not null
* comment_aggregates
* comment_like
* comment_saved
* aggregates
* remove "\"
* deduplicate site_aggregates
* person_post_aggregates
* community_moderator
* community_block
* community_person_ban
* custom_emoji_keyword
* federation allow/block list
* federation_queue_state
* instance_block
* local_site_rate_limit, local_user_language, login_token
* person_ban, person_block, person_follower, post_like, post_read, received_activity
* community_follower, community_language, site_language
* fmt
* image_upload
* remove unused newtypes
* remove more indexes
* use .find
* merge
* fix site_aggregates_site function
* fmt
* Primary keys dess (#17)
* Also order reports by oldest first (ref #4123) (#4129)
* Support signed fetch for federation (fixes #868) (#4125)
* Support signed fetch for federation (fixes #868)
* taplo
* add federation queue state to get_federated_instances api (#4104)
* add federation queue state to get_federated_instances api
* feature gate
* move retry sleep function
* move stuff around
* Add UI setting for collapsing bot comments. Fixes #3838 (#4098)
* Add UI setting for collapsing bot comments. Fixes #3838
* Fixing clippy check.
* Only keep sent and received activities for 7 days (fixes #4113, fixes #4110) (#4131)
* Only check auth secure on release mode. (#4127)
* Only check auth secure on release mode.
* Fixing wrong js-client.
* Adding is_debug_mode var.
* Fixing the desktop image on the README. (#4135)
* Delete dupes and add possibly missing unique constraint on person_aggregates.
* Fixing clippy lints.
---------
Co-authored-by: Nutomic <me@nutomic.com>
Co-authored-by: phiresky <phireskyde+git@gmail.com>
* fmt
* Update community_block.rs
* Update instance_block.rs
* Update person_block.rs
* Update person_block.rs
---------
Co-authored-by: Dessalines <dessalines@users.noreply.github.com>
Co-authored-by: Nutomic <me@nutomic.com>
Co-authored-by: phiresky <phireskyde+git@gmail.com>
2023-11-13 13:14:07 +00:00
|
|
|
use diesel::{result::Error, QueryDsl};
|
2022-11-09 10:05:00 +00:00
|
|
|
use diesel_async::RunQueryDsl;
|
2020-12-03 18:39:56 +00:00
|
|
|
|
2021-02-26 13:49:58 +00:00
|
|
|
impl PersonAggregates {
|
2024-04-16 12:48:15 +00:00
|
|
|
pub async fn read(pool: &mut DbPool<'_>, person_id: PersonId) -> Result<Option<Self>, Error> {
|
2022-11-09 10:05:00 +00:00
|
|
|
let conn = &mut get_conn(pool).await?;
|
2021-02-26 13:49:58 +00:00
|
|
|
person_aggregates::table
|
Remove id column and use different primary key on some tables (#4093)
* post_saved
* fmt
* remove unique and not null
* put person_id first in primary key and remove index
* use post_saved.find
* change captcha_answer
* remove removal of not null
* comment_aggregates
* comment_like
* comment_saved
* aggregates
* remove "\"
* deduplicate site_aggregates
* person_post_aggregates
* community_moderator
* community_block
* community_person_ban
* custom_emoji_keyword
* federation allow/block list
* federation_queue_state
* instance_block
* local_site_rate_limit, local_user_language, login_token
* person_ban, person_block, person_follower, post_like, post_read, received_activity
* community_follower, community_language, site_language
* fmt
* image_upload
* remove unused newtypes
* remove more indexes
* use .find
* merge
* fix site_aggregates_site function
* fmt
* Primary keys dess (#17)
* Also order reports by oldest first (ref #4123) (#4129)
* Support signed fetch for federation (fixes #868) (#4125)
* Support signed fetch for federation (fixes #868)
* taplo
* add federation queue state to get_federated_instances api (#4104)
* add federation queue state to get_federated_instances api
* feature gate
* move retry sleep function
* move stuff around
* Add UI setting for collapsing bot comments. Fixes #3838 (#4098)
* Add UI setting for collapsing bot comments. Fixes #3838
* Fixing clippy check.
* Only keep sent and received activities for 7 days (fixes #4113, fixes #4110) (#4131)
* Only check auth secure on release mode. (#4127)
* Only check auth secure on release mode.
* Fixing wrong js-client.
* Adding is_debug_mode var.
* Fixing the desktop image on the README. (#4135)
* Delete dupes and add possibly missing unique constraint on person_aggregates.
* Fixing clippy lints.
---------
Co-authored-by: Nutomic <me@nutomic.com>
Co-authored-by: phiresky <phireskyde+git@gmail.com>
* fmt
* Update community_block.rs
* Update instance_block.rs
* Update person_block.rs
* Update person_block.rs
---------
Co-authored-by: Dessalines <dessalines@users.noreply.github.com>
Co-authored-by: Nutomic <me@nutomic.com>
Co-authored-by: phiresky <phireskyde+git@gmail.com>
2023-11-13 13:14:07 +00:00
|
|
|
.find(person_id)
|
2024-04-16 12:48:15 +00:00
|
|
|
.first(conn)
|
2022-11-09 10:05:00 +00:00
|
|
|
.await
|
2024-04-16 12:48:15 +00:00
|
|
|
.optional()
|
2020-12-03 18:39:56 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-12-07 20:58:53 +00:00
|
|
|
#[cfg(test)]
|
2024-03-26 09:17:42 +00:00
|
|
|
#[allow(clippy::unwrap_used)]
|
|
|
|
#[allow(clippy::indexing_slicing)]
|
2020-12-07 20:58:53 +00:00
|
|
|
mod tests {
|
2023-07-17 15:04:14 +00:00
|
|
|
|
2020-12-21 23:27:42 +00:00
|
|
|
use crate::{
|
2021-02-26 13:49:58 +00:00
|
|
|
aggregates::person_aggregates::PersonAggregates,
|
2021-10-16 13:33:38 +00:00
|
|
|
source::{
|
2023-07-03 18:13:53 +00:00
|
|
|
comment::{Comment, CommentInsertForm, CommentLike, CommentLikeForm, CommentUpdateForm},
|
2022-10-27 09:24:07 +00:00
|
|
|
community::{Community, CommunityInsertForm},
|
|
|
|
instance::Instance,
|
|
|
|
person::{Person, PersonInsertForm},
|
|
|
|
post::{Post, PostInsertForm, PostLike, PostLikeForm},
|
2021-10-16 13:33:38 +00:00
|
|
|
},
|
|
|
|
traits::{Crud, Likeable},
|
2022-11-09 10:05:00 +00:00
|
|
|
utils::build_db_pool_for_tests,
|
2020-12-18 17:27:25 +00:00
|
|
|
};
|
2024-01-04 09:47:18 +00:00
|
|
|
use pretty_assertions::assert_eq;
|
2021-02-25 19:43:39 +00:00
|
|
|
use serial_test::serial;
|
2020-12-07 20:58:53 +00:00
|
|
|
|
2022-11-09 10:05:00 +00:00
|
|
|
#[tokio::test]
|
2021-02-25 19:43:39 +00:00
|
|
|
#[serial]
|
2022-11-09 10:05:00 +00:00
|
|
|
async fn test_crud() {
|
|
|
|
let pool = &build_db_pool_for_tests().await;
|
2023-07-11 13:09:59 +00:00
|
|
|
let pool = &mut pool.into();
|
2020-12-07 20:58:53 +00:00
|
|
|
|
2023-03-01 02:36:57 +00:00
|
|
|
let inserted_instance = Instance::read_or_create(pool, "my_domain.tld".to_string())
|
|
|
|
.await
|
|
|
|
.unwrap();
|
2022-10-27 09:24:07 +00:00
|
|
|
|
|
|
|
let new_person = PersonInsertForm::builder()
|
|
|
|
.name("thommy_user_agg".into())
|
|
|
|
.public_key("pubkey".to_string())
|
|
|
|
.instance_id(inserted_instance.id)
|
|
|
|
.build();
|
2020-12-07 20:58:53 +00:00
|
|
|
|
2022-11-09 10:05:00 +00:00
|
|
|
let inserted_person = Person::create(pool, &new_person).await.unwrap();
|
2020-12-07 20:58:53 +00:00
|
|
|
|
2022-10-27 09:24:07 +00:00
|
|
|
let another_person = PersonInsertForm::builder()
|
|
|
|
.name("jerry_user_agg".into())
|
|
|
|
.public_key("pubkey".to_string())
|
|
|
|
.instance_id(inserted_instance.id)
|
|
|
|
.build();
|
2020-12-07 20:58:53 +00:00
|
|
|
|
2022-11-09 10:05:00 +00:00
|
|
|
let another_inserted_person = Person::create(pool, &another_person).await.unwrap();
|
2020-12-07 20:58:53 +00:00
|
|
|
|
2022-10-27 09:24:07 +00:00
|
|
|
let new_community = CommunityInsertForm::builder()
|
|
|
|
.name("TIL_site_agg".into())
|
|
|
|
.title("nada".to_owned())
|
|
|
|
.public_key("pubkey".to_string())
|
|
|
|
.instance_id(inserted_instance.id)
|
|
|
|
.build();
|
2020-12-07 20:58:53 +00:00
|
|
|
|
2022-11-09 10:05:00 +00:00
|
|
|
let inserted_community = Community::create(pool, &new_community).await.unwrap();
|
2020-12-07 20:58:53 +00:00
|
|
|
|
2022-10-27 09:24:07 +00:00
|
|
|
let new_post = PostInsertForm::builder()
|
|
|
|
.name("A test post".into())
|
|
|
|
.creator_id(inserted_person.id)
|
|
|
|
.community_id(inserted_community.id)
|
|
|
|
.build();
|
2020-12-07 20:58:53 +00:00
|
|
|
|
2022-11-09 10:05:00 +00:00
|
|
|
let inserted_post = Post::create(pool, &new_post).await.unwrap();
|
2020-12-07 20:58:53 +00:00
|
|
|
|
|
|
|
let post_like = PostLikeForm {
|
|
|
|
post_id: inserted_post.id,
|
2021-02-26 13:49:58 +00:00
|
|
|
person_id: inserted_person.id,
|
2020-12-07 20:58:53 +00:00
|
|
|
score: 1,
|
|
|
|
};
|
|
|
|
|
2022-11-09 10:05:00 +00:00
|
|
|
let _inserted_post_like = PostLike::like(pool, &post_like).await.unwrap();
|
2020-12-07 20:58:53 +00:00
|
|
|
|
2022-10-27 09:24:07 +00:00
|
|
|
let comment_form = CommentInsertForm::builder()
|
|
|
|
.content("A test comment".into())
|
|
|
|
.creator_id(inserted_person.id)
|
|
|
|
.post_id(inserted_post.id)
|
|
|
|
.build();
|
2020-12-07 20:58:53 +00:00
|
|
|
|
2022-11-09 10:05:00 +00:00
|
|
|
let inserted_comment = Comment::create(pool, &comment_form, None).await.unwrap();
|
2020-12-07 20:58:53 +00:00
|
|
|
|
2020-12-09 16:52:10 +00:00
|
|
|
let mut comment_like = CommentLikeForm {
|
2020-12-07 20:58:53 +00:00
|
|
|
comment_id: inserted_comment.id,
|
2021-02-26 13:49:58 +00:00
|
|
|
person_id: inserted_person.id,
|
2020-12-07 20:58:53 +00:00
|
|
|
post_id: inserted_post.id,
|
|
|
|
score: 1,
|
|
|
|
};
|
|
|
|
|
2022-11-09 10:05:00 +00:00
|
|
|
let _inserted_comment_like = CommentLike::like(pool, &comment_like).await.unwrap();
|
2020-12-07 20:58:53 +00:00
|
|
|
|
2022-10-27 09:24:07 +00:00
|
|
|
let child_comment_form = CommentInsertForm::builder()
|
|
|
|
.content("A test comment".into())
|
|
|
|
.creator_id(inserted_person.id)
|
|
|
|
.post_id(inserted_post.id)
|
|
|
|
.build();
|
2020-12-07 20:58:53 +00:00
|
|
|
|
2022-07-30 03:55:59 +00:00
|
|
|
let inserted_child_comment =
|
2022-11-09 10:05:00 +00:00
|
|
|
Comment::create(pool, &child_comment_form, Some(&inserted_comment.path))
|
|
|
|
.await
|
|
|
|
.unwrap();
|
2020-12-07 20:58:53 +00:00
|
|
|
|
|
|
|
let child_comment_like = CommentLikeForm {
|
|
|
|
comment_id: inserted_child_comment.id,
|
2021-02-26 13:49:58 +00:00
|
|
|
person_id: another_inserted_person.id,
|
2020-12-07 20:58:53 +00:00
|
|
|
post_id: inserted_post.id,
|
|
|
|
score: 1,
|
|
|
|
};
|
|
|
|
|
2022-11-09 10:05:00 +00:00
|
|
|
let _inserted_child_comment_like = CommentLike::like(pool, &child_comment_like).await.unwrap();
|
2020-12-07 20:58:53 +00:00
|
|
|
|
2022-11-09 10:05:00 +00:00
|
|
|
let person_aggregates_before_delete = PersonAggregates::read(pool, inserted_person.id)
|
|
|
|
.await
|
2024-04-16 12:48:15 +00:00
|
|
|
.unwrap()
|
2022-11-09 10:05:00 +00:00
|
|
|
.unwrap();
|
2020-12-07 20:58:53 +00:00
|
|
|
|
2021-02-26 13:49:58 +00:00
|
|
|
assert_eq!(1, person_aggregates_before_delete.post_count);
|
|
|
|
assert_eq!(1, person_aggregates_before_delete.post_score);
|
|
|
|
assert_eq!(2, person_aggregates_before_delete.comment_count);
|
|
|
|
assert_eq!(2, person_aggregates_before_delete.comment_score);
|
2020-12-07 20:58:53 +00:00
|
|
|
|
|
|
|
// Remove a post like
|
2022-11-09 10:05:00 +00:00
|
|
|
PostLike::remove(pool, inserted_person.id, inserted_post.id)
|
|
|
|
.await
|
|
|
|
.unwrap();
|
|
|
|
let after_post_like_remove = PersonAggregates::read(pool, inserted_person.id)
|
|
|
|
.await
|
2024-04-16 12:48:15 +00:00
|
|
|
.unwrap()
|
2022-11-09 10:05:00 +00:00
|
|
|
.unwrap();
|
2020-12-07 20:58:53 +00:00
|
|
|
assert_eq!(0, after_post_like_remove.post_score);
|
|
|
|
|
2023-07-03 18:13:53 +00:00
|
|
|
Comment::update(
|
|
|
|
pool,
|
|
|
|
inserted_comment.id,
|
2023-08-08 09:41:41 +00:00
|
|
|
&CommentUpdateForm {
|
|
|
|
removed: Some(true),
|
|
|
|
..Default::default()
|
|
|
|
},
|
2023-07-03 18:13:53 +00:00
|
|
|
)
|
|
|
|
.await
|
|
|
|
.unwrap();
|
|
|
|
Comment::update(
|
|
|
|
pool,
|
|
|
|
inserted_child_comment.id,
|
2023-08-08 09:41:41 +00:00
|
|
|
&CommentUpdateForm {
|
|
|
|
removed: Some(true),
|
|
|
|
..Default::default()
|
|
|
|
},
|
2023-07-03 18:13:53 +00:00
|
|
|
)
|
|
|
|
.await
|
|
|
|
.unwrap();
|
|
|
|
|
|
|
|
let after_parent_comment_removed = PersonAggregates::read(pool, inserted_person.id)
|
|
|
|
.await
|
2024-04-16 12:48:15 +00:00
|
|
|
.unwrap()
|
2023-07-03 18:13:53 +00:00
|
|
|
.unwrap();
|
|
|
|
assert_eq!(0, after_parent_comment_removed.comment_count);
|
2023-07-27 21:36:51 +00:00
|
|
|
// TODO: fix person aggregate comment score calculation
|
|
|
|
// assert_eq!(0, after_parent_comment_removed.comment_score);
|
2023-07-03 18:13:53 +00:00
|
|
|
|
2020-12-07 20:58:53 +00:00
|
|
|
// Remove a parent comment (the scores should also be removed)
|
2022-11-09 10:05:00 +00:00
|
|
|
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
|
2024-04-16 12:48:15 +00:00
|
|
|
.unwrap()
|
2022-11-09 10:05:00 +00:00
|
|
|
.unwrap();
|
2020-12-07 20:58:53 +00:00
|
|
|
assert_eq!(0, after_parent_comment_delete.comment_count);
|
2023-07-27 21:36:51 +00:00
|
|
|
// TODO: fix person aggregate comment score calculation
|
|
|
|
// assert_eq!(0, after_parent_comment_delete.comment_score);
|
2020-12-07 20:58:53 +00:00
|
|
|
|
2020-12-09 16:52:10 +00:00
|
|
|
// Add in the two comments again, then delete the post.
|
2022-11-09 10:05:00 +00:00
|
|
|
let new_parent_comment = Comment::create(pool, &comment_form, None).await.unwrap();
|
2022-07-30 03:55:59 +00:00
|
|
|
let _new_child_comment =
|
2022-11-09 10:05:00 +00:00
|
|
|
Comment::create(pool, &child_comment_form, Some(&new_parent_comment.path))
|
|
|
|
.await
|
|
|
|
.unwrap();
|
2020-12-09 16:52:10 +00:00
|
|
|
comment_like.comment_id = new_parent_comment.id;
|
2022-11-09 10:05:00 +00:00
|
|
|
CommentLike::like(pool, &comment_like).await.unwrap();
|
|
|
|
let after_comment_add = PersonAggregates::read(pool, inserted_person.id)
|
|
|
|
.await
|
2024-04-16 12:48:15 +00:00
|
|
|
.unwrap()
|
2022-11-09 10:05:00 +00:00
|
|
|
.unwrap();
|
2020-12-09 16:52:10 +00:00
|
|
|
assert_eq!(2, after_comment_add.comment_count);
|
2023-07-27 21:36:51 +00:00
|
|
|
// TODO: fix person aggregate comment score calculation
|
|
|
|
// assert_eq!(1, after_comment_add.comment_score);
|
2020-12-09 16:52:10 +00:00
|
|
|
|
2022-11-09 10:05:00 +00:00
|
|
|
Post::delete(pool, inserted_post.id).await.unwrap();
|
|
|
|
let after_post_delete = PersonAggregates::read(pool, inserted_person.id)
|
|
|
|
.await
|
2024-04-16 12:48:15 +00:00
|
|
|
.unwrap()
|
2022-11-09 10:05:00 +00:00
|
|
|
.unwrap();
|
2023-07-27 21:36:51 +00:00
|
|
|
// TODO: fix person aggregate comment score calculation
|
|
|
|
// assert_eq!(0, after_post_delete.comment_score);
|
2020-12-09 16:52:10 +00:00
|
|
|
assert_eq!(0, after_post_delete.comment_count);
|
|
|
|
assert_eq!(0, after_post_delete.post_score);
|
|
|
|
assert_eq!(0, after_post_delete.post_count);
|
|
|
|
|
2020-12-07 20:58:53 +00:00
|
|
|
// This should delete all the associated rows, and fire triggers
|
2022-11-09 10:05:00 +00:00
|
|
|
let person_num_deleted = Person::delete(pool, inserted_person.id).await.unwrap();
|
2021-02-26 13:49:58 +00:00
|
|
|
assert_eq!(1, person_num_deleted);
|
2022-11-09 10:05:00 +00:00
|
|
|
Person::delete(pool, another_inserted_person.id)
|
|
|
|
.await
|
|
|
|
.unwrap();
|
2020-12-07 20:58:53 +00:00
|
|
|
|
2021-04-08 11:29:08 +00:00
|
|
|
// Delete the community
|
2022-11-09 10:05:00 +00:00
|
|
|
let community_num_deleted = Community::delete(pool, inserted_community.id)
|
|
|
|
.await
|
|
|
|
.unwrap();
|
2021-04-08 11:29:08 +00:00
|
|
|
assert_eq!(1, community_num_deleted);
|
|
|
|
|
2020-12-07 20:58:53 +00:00
|
|
|
// Should be none found
|
2024-04-16 12:48:15 +00:00
|
|
|
let after_delete = PersonAggregates::read(pool, inserted_person.id)
|
|
|
|
.await
|
|
|
|
.unwrap();
|
|
|
|
assert!(after_delete.is_none());
|
2022-10-27 09:24:07 +00:00
|
|
|
|
2022-11-09 10:05:00 +00:00
|
|
|
Instance::delete(pool, inserted_instance.id).await.unwrap();
|
2020-12-07 20:58:53 +00:00
|
|
|
}
|
|
|
|
}
|