-use crate::{aggregates::structs::SiteAggregates, schema::site_aggregates};
-use diesel::{result::Error, *};
+use crate::{
+ aggregates::structs::SiteAggregates,
+ schema::site_aggregates,
+ utils::{get_conn, DbPool},
+};
+use diesel::result::Error;
+use diesel_async::RunQueryDsl;
impl SiteAggregates {
- pub fn read(conn: &mut PgConnection) -> Result<Self, Error> {
- site_aggregates::table.first::<Self>(conn)
+ 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 {
+ #![allow(clippy::unwrap_used)]
+ #![allow(clippy::indexing_slicing)]
+
use crate::{
aggregates::site_aggregates::SiteAggregates,
source::{
comment::{Comment, CommentInsertForm},
- community::{Community, CommunityInsertForm},
+ community::{Community, CommunityInsertForm, CommunityUpdateForm},
instance::Instance,
person::{Person, PersonInsertForm},
post::{Post, PostInsertForm},
site::{Site, SiteInsertForm},
},
traits::Crud,
- utils::establish_unpooled_connection,
+ utils::{build_db_pool_for_tests, DbPool},
};
use serial_test::serial;
- #[test]
- #[serial]
- fn test_crud() {
- let conn = &mut establish_unpooled_connection();
-
- let inserted_instance = Instance::create(conn, "my_domain.tld").unwrap();
+ 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())
.instance_id(inserted_instance.id)
.build();
- let inserted_person = Person::create(conn, &new_person).unwrap();
+ 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(conn, &site_form).unwrap();
+ let inserted_site = Site::create(pool, &site_form).await.unwrap();
let new_community = CommunityInsertForm::builder()
.name("TIL_site_agg".into())
.instance_id(inserted_instance.id)
.build();
- let inserted_community = Community::create(conn, &new_community).unwrap();
+ 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())
.build();
// Insert two of those posts
- let inserted_post = Post::create(conn, &new_post).unwrap();
- let _inserted_post_again = Post::create(conn, &new_post).unwrap();
+ 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())
.build();
// Insert two of those comments
- let inserted_comment = Comment::create(conn, &comment_form, None).unwrap();
+ let inserted_comment = Comment::create(pool, &comment_form, None).await.unwrap();
let child_comment_form = CommentInsertForm::builder()
.content("A test comment".into())
.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 site_aggregates_before_delete = SiteAggregates::read(conn).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!(2, site_aggregates_before_delete.comments);
// Try a post delete
- Post::delete(conn, inserted_post.id).unwrap();
- let site_aggregates_after_post_delete = SiteAggregates::read(conn).unwrap();
+ 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(conn, inserted_person.id).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);
// Site should still exist, it can without a site creator.
- let after_delete_creator = SiteAggregates::read(conn);
+ let after_delete_creator = SiteAggregates::read(pool).await;
assert!(after_delete_creator.is_ok());
- Site::delete(conn, inserted_site.id).unwrap();
- let after_delete_site = SiteAggregates::read(conn);
+ Site::delete(pool, inserted_site.id).await.unwrap();
+ let after_delete_site = SiteAggregates::read(pool).await;
assert!(after_delete_site.is_err());
- Instance::delete(conn, inserted_instance.id).unwrap();
+ 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();
}
}
projects / lemmy.git / blobdiff