Make functions work with both connection and pool (#3420)

[lemmy.git] / crates / db_schema / src / aggregates / comment_aggregates.rs

diff --git a/crates/db_schema/src/aggregates/comment_aggregates.rs b/crates/db_schema/src/aggregates/comment_aggregates.rs
index 1130d9101c89341230d09e50d72cd6287dea0d55..12b57222805cc23e82484e98085016599d697d95 100644 (file)
--- a/crates/db_schema/src/aggregates/comment_aggregates.rs
+++ b/crates/db_schema/src/aggregates/comment_aggregates.rs
@@ -2,14 +2,34 @@ use crate::{
   aggregates::structs::CommentAggregates,
   newtypes::CommentId,
   schema::comment_aggregates,
+  utils::{functions::hot_rank, get_conn, DbPool},
 };
-use diesel::{result::Error, *};
+use diesel::{result::Error, ExpressionMethods, QueryDsl};
+use diesel_async::RunQueryDsl;
 
 impl CommentAggregates {
-  pub fn read(conn: &mut PgConnection, comment_id: CommentId) -> Result<Self, Error> {
+  pub async fn read(pool: &mut DbPool<'_>, comment_id: CommentId) -> Result<Self, Error> {
+    let conn = &mut get_conn(pool).await?;
     comment_aggregates::table
       .filter(comment_aggregates::comment_id.eq(comment_id))
       .first::<Self>(conn)
+      .await
+  }
+
+  pub async fn update_hot_rank(
+    pool: &mut DbPool<'_>,
+    comment_id: CommentId,
+  ) -> Result<Self, Error> {
+    let conn = &mut get_conn(pool).await?;
+
+    diesel::update(comment_aggregates::table)
+      .filter(comment_aggregates::comment_id.eq(comment_id))
+      .set(comment_aggregates::hot_rank.eq(hot_rank(
+        comment_aggregates::score,
+        comment_aggregates::published,
+      )))
+      .get_result::<Self>(conn)
+      .await
   }
 }
 
@@ -25,16 +45,19 @@ mod tests {
       post::{Post, PostInsertForm},
     },
     traits::{Crud, Likeable},
-    utils::establish_unpooled_connection,
+    utils::build_db_pool_for_tests,
   };
   use serial_test::serial;
 
-  #[test]
+  #[tokio::test]
   #[serial]
-  fn test_crud() {
-    let conn = &mut establish_unpooled_connection();
+  async fn test_crud() {
+    let pool = &build_db_pool_for_tests().await;
+    let pool = &mut pool.into();
 
-    let inserted_instance = Instance::create(conn, "my_domain.tld").unwrap();
+    let inserted_instance = Instance::read_or_create(pool, "my_domain.tld".to_string())
+      .await
+      .unwrap();
 
     let new_person = PersonInsertForm::builder()
       .name("thommy_comment_agg".into())
@@ -42,7 +65,7 @@ mod tests {
       .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 another_person = PersonInsertForm::builder()
       .name("jerry_comment_agg".into())
@@ -50,7 +73,7 @@ mod tests {
       .instance_id(inserted_instance.id)
       .build();
 
-    let another_inserted_person = Person::create(conn, &another_person).unwrap();
+    let another_inserted_person = Person::create(pool, &another_person).await.unwrap();
 
     let new_community = CommunityInsertForm::builder()
       .name("TIL_comment_agg".into())
@@ -59,7 +82,7 @@ mod tests {
       .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();
 
     let new_post = PostInsertForm::builder()
       .name("A test post".into())
@@ -67,7 +90,7 @@ mod tests {
       .community_id(inserted_community.id)
       .build();
 
-    let inserted_post = Post::create(conn, &new_post).unwrap();
+    let inserted_post = Post::create(pool, &new_post).await.unwrap();
 
     let comment_form = CommentInsertForm::builder()
       .content("A test comment".into())
@@ -75,7 +98,7 @@ mod tests {
       .post_id(inserted_post.id)
       .build();
 
-    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())
@@ -84,7 +107,9 @@ mod tests {
       .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 comment_like = CommentLikeForm {
       comment_id: inserted_comment.id,
@@ -93,9 +118,11 @@ mod tests {
       score: 1,
     };
 
-    CommentLike::like(conn, &comment_like).unwrap();
+    CommentLike::like(pool, &comment_like).await.unwrap();
 
-    let comment_aggs_before_delete = CommentAggregates::read(conn, inserted_comment.id).unwrap();
+    let comment_aggs_before_delete = CommentAggregates::read(pool, inserted_comment.id)
+      .await
+      .unwrap();
 
     assert_eq!(1, comment_aggs_before_delete.score);
     assert_eq!(1, comment_aggs_before_delete.upvotes);
@@ -109,37 +136,47 @@ mod tests {
       score: -1,
     };
 
-    CommentLike::like(conn, &comment_dislike).unwrap();
+    CommentLike::like(pool, &comment_dislike).await.unwrap();
 
-    let comment_aggs_after_dislike = CommentAggregates::read(conn, inserted_comment.id).unwrap();
+    let comment_aggs_after_dislike = CommentAggregates::read(pool, inserted_comment.id)
+      .await
+      .unwrap();
 
     assert_eq!(0, comment_aggs_after_dislike.score);
     assert_eq!(1, comment_aggs_after_dislike.upvotes);
     assert_eq!(1, comment_aggs_after_dislike.downvotes);
 
     // Remove the first comment like
-    CommentLike::remove(conn, inserted_person.id, inserted_comment.id).unwrap();
-    let after_like_remove = CommentAggregates::read(conn, inserted_comment.id).unwrap();
+    CommentLike::remove(pool, inserted_person.id, inserted_comment.id)
+      .await
+      .unwrap();
+    let after_like_remove = CommentAggregates::read(pool, inserted_comment.id)
+      .await
+      .unwrap();
     assert_eq!(-1, after_like_remove.score);
     assert_eq!(0, after_like_remove.upvotes);
     assert_eq!(1, after_like_remove.downvotes);
 
     // Remove the parent post
-    Post::delete(conn, inserted_post.id).unwrap();
+    Post::delete(pool, inserted_post.id).await.unwrap();
 
     // Should be none found, since the post was deleted
-    let after_delete = CommentAggregates::read(conn, inserted_comment.id);
+    let after_delete = CommentAggregates::read(pool, inserted_comment.id).await;
     assert!(after_delete.is_err());
 
     // This should delete all the associated rows, and fire triggers
-    Person::delete(conn, another_inserted_person.id).unwrap();
-    let person_num_deleted = Person::delete(conn, inserted_person.id).unwrap();
+    Person::delete(pool, another_inserted_person.id)
+      .await
+      .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);
 
-    Instance::delete(conn, inserted_instance.id).unwrap();
+    Instance::delete(pool, inserted_instance.id).await.unwrap();
   }
 }