X-Git-Url: http://these/git/?a=blobdiff_plain;f=crates%2Fdb_schema%2Fsrc%2Faggregates%2Fperson_aggregates.rs;h=ff0cb843711cf6ff3fb71061bf2e1136d2e98512;hb=c9f140742925d6da20103124b49f2b58a35fc2b8;hp=29ece732903de409f65a48f23b42c4129c6918f9;hpb=4e6409f325bca5b2727b19c24d77ffa2b59109b1;p=lemmy.git

diff --git a/crates/db_schema/src/aggregates/person_aggregates.rs b/crates/db_schema/src/aggregates/person_aggregates.rs
index 29ece732..ff0cb843 100644
--- a/crates/db_schema/src/aggregates/person_aggregates.rs
+++ b/crates/db_schema/src/aggregates/person_aggregates.rs
@@ -2,7 +2,7 @@ use crate::{aggregates::structs::PersonAggregates, newtypes::PersonId, schema::p
 use diesel::{result::Error, *};
 
 impl PersonAggregates {
-  pub fn read(conn: &PgConnection, person_id: PersonId) -> Result<Self, Error> {
+  pub fn read(conn: &mut PgConnection, person_id: PersonId) -> Result<Self, Error> {
     person_aggregates::table
       .filter(person_aggregates::person_id.eq(person_id))
       .first::<Self>(conn)
@@ -27,7 +27,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_user_agg".into(),
@@ -35,7 +35,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_user_agg".into(),
@@ -43,7 +43,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_site_agg".into(),
@@ -52,7 +52,7 @@ mod tests {
       ..CommunityForm::default()
     };
 
-    let inserted_community = Community::create(&conn, &new_community).unwrap();
+    let inserted_community = Community::create(conn, &new_community).unwrap();
 
     let new_post = PostForm {
       name: "A test post".into(),
@@ -61,7 +61,7 @@ mod tests {
       ..PostForm::default()
     };
 
-    let inserted_post = Post::create(&conn, &new_post).unwrap();
+    let inserted_post = Post::create(conn, &new_post).unwrap();
 
     let post_like = PostLikeForm {
       post_id: inserted_post.id,
@@ -69,7 +69,7 @@ mod tests {
       score: 1,
     };
 
-    let _inserted_post_like = PostLike::like(&conn, &post_like).unwrap();
+    let _inserted_post_like = PostLike::like(conn, &post_like).unwrap();
 
     let comment_form = CommentForm {
       content: "A test comment".into(),
@@ -78,7 +78,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 mut comment_like = CommentLikeForm {
       comment_id: inserted_comment.id,
@@ -87,7 +87,7 @@ mod tests {
       score: 1,
     };
 
-    let _inserted_comment_like = CommentLike::like(&conn, &comment_like).unwrap();
+    let _inserted_comment_like = CommentLike::like(conn, &comment_like).unwrap();
 
     let child_comment_form = CommentForm {
       content: "A test comment".into(),
@@ -97,7 +97,7 @@ 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 child_comment_like = CommentLikeForm {
       comment_id: inserted_child_comment.id,
@@ -106,10 +106,9 @@ mod tests {
       score: 1,
     };
 
-    let _inserted_child_comment_like = CommentLike::like(&conn, &child_comment_like).unwrap();
+    let _inserted_child_comment_like = CommentLike::like(conn, &child_comment_like).unwrap();
 
-    let person_aggregates_before_delete =
-      PersonAggregates::read(&conn, inserted_person.id).unwrap();
+    let person_aggregates_before_delete = PersonAggregates::read(conn, inserted_person.id).unwrap();
 
     assert_eq!(1, person_aggregates_before_delete.post_count);
     assert_eq!(1, person_aggregates_before_delete.post_score);
@@ -117,45 +116,45 @@ mod tests {
     assert_eq!(2, person_aggregates_before_delete.comment_score);
 
     // Remove a post like
-    PostLike::remove(&conn, inserted_person.id, inserted_post.id).unwrap();
-    let after_post_like_remove = PersonAggregates::read(&conn, inserted_person.id).unwrap();
+    PostLike::remove(conn, inserted_person.id, inserted_post.id).unwrap();
+    let after_post_like_remove = PersonAggregates::read(conn, inserted_person.id).unwrap();
     assert_eq!(0, after_post_like_remove.post_score);
 
     // Remove a parent comment (the scores should also be removed)
-    Comment::delete(&conn, inserted_comment.id).unwrap();
-    Comment::delete(&conn, inserted_child_comment.id).unwrap();
-    let after_parent_comment_delete = PersonAggregates::read(&conn, inserted_person.id).unwrap();
+    Comment::delete(conn, inserted_comment.id).unwrap();
+    Comment::delete(conn, inserted_child_comment.id).unwrap();
+    let after_parent_comment_delete = PersonAggregates::read(conn, inserted_person.id).unwrap();
     assert_eq!(0, after_parent_comment_delete.comment_count);
     assert_eq!(0, after_parent_comment_delete.comment_score);
 
     // Add in the two comments again, then delete the post.
-    let new_parent_comment = Comment::create(&conn, &comment_form, None).unwrap();
+    let new_parent_comment = Comment::create(conn, &comment_form, None).unwrap();
     let _new_child_comment =
-      Comment::create(&conn, &child_comment_form, Some(&new_parent_comment.path)).unwrap();
+      Comment::create(conn, &child_comment_form, Some(&new_parent_comment.path)).unwrap();
     comment_like.comment_id = new_parent_comment.id;
-    CommentLike::like(&conn, &comment_like).unwrap();
-    let after_comment_add = PersonAggregates::read(&conn, inserted_person.id).unwrap();
+    CommentLike::like(conn, &comment_like).unwrap();
+    let after_comment_add = PersonAggregates::read(conn, inserted_person.id).unwrap();
     assert_eq!(2, after_comment_add.comment_count);
     assert_eq!(1, after_comment_add.comment_score);
 
-    Post::delete(&conn, inserted_post.id).unwrap();
-    let after_post_delete = PersonAggregates::read(&conn, inserted_person.id).unwrap();
+    Post::delete(conn, inserted_post.id).unwrap();
+    let after_post_delete = PersonAggregates::read(conn, inserted_person.id).unwrap();
     assert_eq!(0, after_post_delete.comment_score);
     assert_eq!(0, after_post_delete.comment_count);
     assert_eq!(0, after_post_delete.post_score);
     assert_eq!(0, after_post_delete.post_count);
 
     // 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);
-    Person::delete(&conn, another_inserted_person.id).unwrap();
+    Person::delete(conn, another_inserted_person.id).unwrap();
 
     // 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);
 
     // Should be none found
-    let after_delete = PersonAggregates::read(&conn, inserted_person.id);
+    let after_delete = PersonAggregates::read(conn, inserted_person.id);
     assert!(after_delete.is_err());
   }
 }