X-Git-Url: http://these/git/?a=blobdiff_plain;f=crates%2Fdb_schema%2Fsrc%2Faggregates%2Fcommunity_aggregates.rs;h=9dfa710fbea0531bf2da8999d27896dbbb830374;hb=c9f140742925d6da20103124b49f2b58a35fc2b8;hp=1643fead72b8926d28c884ef286576db4dbdf849;hpb=4e6409f325bca5b2727b19c24d77ffa2b59109b1;p=lemmy.git

diff --git a/crates/db_schema/src/aggregates/community_aggregates.rs b/crates/db_schema/src/aggregates/community_aggregates.rs
index 1643fead..9dfa710f 100644
--- a/crates/db_schema/src/aggregates/community_aggregates.rs
+++ b/crates/db_schema/src/aggregates/community_aggregates.rs
@@ -6,7 +6,7 @@ use crate::{
 use diesel::{result::Error, *};
 
 impl CommunityAggregates {
-  pub fn read(conn: &PgConnection, community_id: CommunityId) -> Result<Self, Error> {
+  pub fn read(conn: &mut PgConnection, community_id: CommunityId) -> Result<Self, Error> {
     community_aggregates::table
       .filter(community_aggregates::community_id.eq(community_id))
       .first::<Self>(conn)
@@ -31,7 +31,7 @@ mod tests {
   #[test]
   #[serial]
   fn test_crud() {
-    let conn = establish_unpooled_connection();
+    let conn = &mut establish_unpooled_connection();
 
     let new_person = PersonForm {
       name: "thommy_community_agg".into(),
@@ -39,7 +39,7 @@ mod tests {
       ..PersonForm::default()
     };
 
-    let inserted_person = Person::create(&conn, &new_person).unwrap();
+    let inserted_person = Person::create(conn, &new_person).unwrap();
 
     let another_person = PersonForm {
       name: "jerry_community_agg".into(),
@@ -47,7 +47,7 @@ mod tests {
       ..PersonForm::default()
     };
 
-    let another_inserted_person = Person::create(&conn, &another_person).unwrap();
+    let another_inserted_person = Person::create(conn, &another_person).unwrap();
 
     let new_community = CommunityForm {
       name: "TIL_community_agg".into(),
@@ -56,7 +56,7 @@ mod tests {
       ..CommunityForm::default()
     };
 
-    let inserted_community = Community::create(&conn, &new_community).unwrap();
+    let inserted_community = Community::create(conn, &new_community).unwrap();
 
     let another_community = CommunityForm {
       name: "TIL_community_agg_2".into(),
@@ -65,7 +65,7 @@ mod tests {
       ..CommunityForm::default()
     };
 
-    let another_inserted_community = Community::create(&conn, &another_community).unwrap();
+    let another_inserted_community = Community::create(conn, &another_community).unwrap();
 
     let first_person_follow = CommunityFollowerForm {
       community_id: inserted_community.id,
@@ -73,7 +73,7 @@ mod tests {
       pending: false,
     };
 
-    CommunityFollower::follow(&conn, &first_person_follow).unwrap();
+    CommunityFollower::follow(conn, &first_person_follow).unwrap();
 
     let second_person_follow = CommunityFollowerForm {
       community_id: inserted_community.id,
@@ -81,7 +81,7 @@ mod tests {
       pending: false,
     };
 
-    CommunityFollower::follow(&conn, &second_person_follow).unwrap();
+    CommunityFollower::follow(conn, &second_person_follow).unwrap();
 
     let another_community_follow = CommunityFollowerForm {
       community_id: another_inserted_community.id,
@@ -89,7 +89,7 @@ mod tests {
       pending: false,
     };
 
-    CommunityFollower::follow(&conn, &another_community_follow).unwrap();
+    CommunityFollower::follow(conn, &another_community_follow).unwrap();
 
     let new_post = PostForm {
       name: "A test post".into(),
@@ -98,7 +98,7 @@ mod tests {
       ..PostForm::default()
     };
 
-    let inserted_post = Post::create(&conn, &new_post).unwrap();
+    let inserted_post = Post::create(conn, &new_post).unwrap();
 
     let comment_form = CommentForm {
       content: "A test comment".into(),
@@ -107,7 +107,7 @@ mod tests {
       ..CommentForm::default()
     };
 
-    let inserted_comment = Comment::create(&conn, &comment_form, None).unwrap();
+    let inserted_comment = Comment::create(conn, &comment_form, None).unwrap();
 
     let child_comment_form = CommentForm {
       content: "A test comment".into(),
@@ -117,10 +117,10 @@ mod tests {
     };
 
     let _inserted_child_comment =
-      Comment::create(&conn, &child_comment_form, Some(&inserted_comment.path)).unwrap();
+      Comment::create(conn, &child_comment_form, Some(&inserted_comment.path)).unwrap();
 
     let community_aggregates_before_delete =
-      CommunityAggregates::read(&conn, inserted_community.id).unwrap();
+      CommunityAggregates::read(conn, inserted_community.id).unwrap();
 
     assert_eq!(2, community_aggregates_before_delete.subscribers);
     assert_eq!(1, community_aggregates_before_delete.posts);
@@ -128,46 +128,46 @@ mod tests {
 
     // Test the other community
     let another_community_aggs =
-      CommunityAggregates::read(&conn, another_inserted_community.id).unwrap();
+      CommunityAggregates::read(conn, another_inserted_community.id).unwrap();
     assert_eq!(1, another_community_aggs.subscribers);
     assert_eq!(0, another_community_aggs.posts);
     assert_eq!(0, another_community_aggs.comments);
 
     // Unfollow test
-    CommunityFollower::unfollow(&conn, &second_person_follow).unwrap();
-    let after_unfollow = CommunityAggregates::read(&conn, inserted_community.id).unwrap();
+    CommunityFollower::unfollow(conn, &second_person_follow).unwrap();
+    let after_unfollow = CommunityAggregates::read(conn, inserted_community.id).unwrap();
     assert_eq!(1, after_unfollow.subscribers);
 
     // Follow again just for the later tests
-    CommunityFollower::follow(&conn, &second_person_follow).unwrap();
-    let after_follow_again = CommunityAggregates::read(&conn, inserted_community.id).unwrap();
+    CommunityFollower::follow(conn, &second_person_follow).unwrap();
+    let after_follow_again = CommunityAggregates::read(conn, inserted_community.id).unwrap();
     assert_eq!(2, after_follow_again.subscribers);
 
     // Remove a parent comment (the comment count should also be 0)
-    Post::delete(&conn, inserted_post.id).unwrap();
-    let after_parent_post_delete = CommunityAggregates::read(&conn, inserted_community.id).unwrap();
+    Post::delete(conn, inserted_post.id).unwrap();
+    let after_parent_post_delete = CommunityAggregates::read(conn, inserted_community.id).unwrap();
     assert_eq!(0, after_parent_post_delete.comments);
     assert_eq!(0, after_parent_post_delete.posts);
 
     // Remove the 2nd person
-    Person::delete(&conn, another_inserted_person.id).unwrap();
-    let after_person_delete = CommunityAggregates::read(&conn, inserted_community.id).unwrap();
+    Person::delete(conn, another_inserted_person.id).unwrap();
+    let after_person_delete = CommunityAggregates::read(conn, inserted_community.id).unwrap();
     assert_eq!(1, after_person_delete.subscribers);
 
     // This should 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(conn, inserted_person.id).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(conn, inserted_community.id).unwrap();
     assert_eq!(1, community_num_deleted);
 
     let another_community_num_deleted =
-      Community::delete(&conn, another_inserted_community.id).unwrap();
+      Community::delete(conn, another_inserted_community.id).unwrap();
     assert_eq!(1, another_community_num_deleted);
 
     // Should be none found, since the creator was deleted
-    let after_delete = CommunityAggregates::read(&conn, inserted_community.id);
+    let after_delete = CommunityAggregates::read(conn, inserted_community.id);
     assert!(after_delete.is_err());
   }
 }