mirror of
https://github.com/LemmyNet/lemmy.git
synced 2024-06-26 09:10: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
206 lines
6.3 KiB
Rust
206 lines
6.3 KiB
Rust
use crate::{
|
|
aggregates::structs::SiteAggregates,
|
|
schema::site_aggregates,
|
|
utils::{get_conn, DbPool},
|
|
};
|
|
use diesel::result::Error;
|
|
use diesel_async::RunQueryDsl;
|
|
|
|
impl SiteAggregates {
|
|
pub async fn read(pool: &mut DbPool<'_>) -> Result<Self, Error> {
|
|
let conn = &mut get_conn(pool).await?;
|
|
site_aggregates::table.first::<Self>(conn).await
|
|
}
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use crate::{
|
|
aggregates::site_aggregates::SiteAggregates,
|
|
source::{
|
|
comment::{Comment, CommentInsertForm},
|
|
community::{Community, CommunityInsertForm, CommunityUpdateForm},
|
|
instance::Instance,
|
|
person::{Person, PersonInsertForm},
|
|
post::{Post, PostInsertForm},
|
|
site::{Site, SiteInsertForm},
|
|
},
|
|
traits::Crud,
|
|
utils::{build_db_pool_for_tests, DbPool},
|
|
};
|
|
use serial_test::serial;
|
|
|
|
async fn prepare_site_with_community(
|
|
pool: &mut DbPool<'_>,
|
|
) -> (Instance, Person, Site, Community) {
|
|
let inserted_instance = Instance::read_or_create(pool, "my_domain.tld".to_string())
|
|
.await
|
|
.unwrap();
|
|
|
|
let new_person = PersonInsertForm::builder()
|
|
.name("thommy_site_agg".into())
|
|
.public_key("pubkey".to_string())
|
|
.instance_id(inserted_instance.id)
|
|
.build();
|
|
|
|
let inserted_person = Person::create(pool, &new_person).await.unwrap();
|
|
|
|
let site_form = SiteInsertForm::builder()
|
|
.name("test_site".into())
|
|
.instance_id(inserted_instance.id)
|
|
.build();
|
|
|
|
let inserted_site = Site::create(pool, &site_form).await.unwrap();
|
|
|
|
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();
|
|
|
|
let inserted_community = Community::create(pool, &new_community).await.unwrap();
|
|
(
|
|
inserted_instance,
|
|
inserted_person,
|
|
inserted_site,
|
|
inserted_community,
|
|
)
|
|
}
|
|
|
|
#[tokio::test]
|
|
#[serial]
|
|
async fn test_crud() {
|
|
let pool = &build_db_pool_for_tests().await;
|
|
let pool = &mut pool.into();
|
|
|
|
let (inserted_instance, inserted_person, inserted_site, inserted_community) =
|
|
prepare_site_with_community(pool).await;
|
|
|
|
let new_post = PostInsertForm::builder()
|
|
.name("A test post".into())
|
|
.creator_id(inserted_person.id)
|
|
.community_id(inserted_community.id)
|
|
.build();
|
|
|
|
// Insert two of those posts
|
|
let inserted_post = Post::create(pool, &new_post).await.unwrap();
|
|
let _inserted_post_again = 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();
|
|
|
|
// Insert two of those comments
|
|
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 site_aggregates_before_delete = SiteAggregates::read(pool).await.unwrap();
|
|
|
|
// TODO: this is unstable, sometimes it returns 0 users, sometimes 1
|
|
//assert_eq!(0, site_aggregates_before_delete.users);
|
|
assert_eq!(1, site_aggregates_before_delete.communities);
|
|
assert_eq!(2, site_aggregates_before_delete.posts);
|
|
assert_eq!(2, site_aggregates_before_delete.comments);
|
|
|
|
// Try a post delete
|
|
Post::delete(pool, inserted_post.id).await.unwrap();
|
|
let site_aggregates_after_post_delete = SiteAggregates::read(pool).await.unwrap();
|
|
assert_eq!(1, site_aggregates_after_post_delete.posts);
|
|
assert_eq!(0, site_aggregates_after_post_delete.comments);
|
|
|
|
// This shouuld delete all the associated rows, and fire triggers
|
|
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);
|
|
|
|
// Site should still exist, it can without a site creator.
|
|
let after_delete_creator = SiteAggregates::read(pool).await;
|
|
assert!(after_delete_creator.is_ok());
|
|
|
|
Site::delete(pool, inserted_site.id).await.unwrap();
|
|
let after_delete_site = SiteAggregates::read(pool).await;
|
|
assert!(after_delete_site.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, inserted_person, inserted_site, inserted_community) =
|
|
prepare_site_with_community(pool).await;
|
|
|
|
let site_aggregates_before = SiteAggregates::read(pool).await.unwrap();
|
|
assert_eq!(1, site_aggregates_before.communities);
|
|
|
|
Community::update(
|
|
pool,
|
|
inserted_community.id,
|
|
&CommunityUpdateForm::builder().deleted(Some(true)).build(),
|
|
)
|
|
.await
|
|
.unwrap();
|
|
|
|
let site_aggregates_after_delete = SiteAggregates::read(pool).await.unwrap();
|
|
assert_eq!(0, site_aggregates_after_delete.communities);
|
|
|
|
Community::update(
|
|
pool,
|
|
inserted_community.id,
|
|
&CommunityUpdateForm::builder().deleted(Some(false)).build(),
|
|
)
|
|
.await
|
|
.unwrap();
|
|
|
|
Community::update(
|
|
pool,
|
|
inserted_community.id,
|
|
&CommunityUpdateForm::builder().removed(Some(true)).build(),
|
|
)
|
|
.await
|
|
.unwrap();
|
|
|
|
let site_aggregates_after_remove = SiteAggregates::read(pool).await.unwrap();
|
|
assert_eq!(0, site_aggregates_after_remove.communities);
|
|
|
|
Community::update(
|
|
pool,
|
|
inserted_community.id,
|
|
&CommunityUpdateForm::builder().deleted(Some(true)).build(),
|
|
)
|
|
.await
|
|
.unwrap();
|
|
|
|
let site_aggregates_after_remove_delete = SiteAggregates::read(pool).await.unwrap();
|
|
assert_eq!(0, site_aggregates_after_remove_delete.communities);
|
|
|
|
Community::delete(pool, inserted_community.id)
|
|
.await
|
|
.unwrap();
|
|
Site::delete(pool, inserted_site.id).await.unwrap();
|
|
Person::delete(pool, inserted_person.id).await.unwrap();
|
|
Instance::delete(pool, inserted_instance.id).await.unwrap();
|
|
}
|
|
}
|