From 719b76a6e71d895459c79cf9f199f8886ff8673e Mon Sep 17 00:00:00 2001
From: Dessalines <dessalines@users.noreply.github.com>
Date: Fri, 15 Dec 2023 05:36:58 -0500
Subject: [PATCH] Create comment in transaction. Fixes #3741 (#4265)

* Create comment in transaction. Fixes #3741

* Removing if let on comment create.
---
 crates/db_schema/src/impls/comment.rs | 99 ++++++++++++++-------------
 1 file changed, 51 insertions(+), 48 deletions(-)

diff --git a/crates/db_schema/src/impls/comment.rs b/crates/db_schema/src/impls/comment.rs
index 35bc8314a..aef399c59 100644
--- a/crates/db_schema/src/impls/comment.rs
+++ b/crates/db_schema/src/impls/comment.rs
@@ -59,52 +59,55 @@ impl Comment {
   ) -> Result<Comment, Error> {
     let conn = &mut get_conn(pool).await?;
 
-    // Insert, to get the id
-    let inserted_comment = insert_into(comment)
-      .values(comment_form)
-      .on_conflict(ap_id)
-      .do_update()
-      .set(comment_form)
-      .get_result::<Self>(conn)
-      .await;
+    conn
+      .build_transaction()
+      .run(|conn| {
+        Box::pin(async move {
+          // Insert, to get the id
+          let inserted_comment = insert_into(comment)
+            .values(comment_form)
+            .on_conflict(ap_id)
+            .do_update()
+            .set(comment_form)
+            .get_result::<Self>(conn)
+            .await?;
 
-    if let Ok(comment_insert) = inserted_comment {
-      let comment_id = comment_insert.id;
+          let comment_id = inserted_comment.id;
 
-      // You need to update the ltree column
-      let ltree = Ltree(if let Some(parent_path) = parent_path {
-        // The previous parent will already have 0 in it
-        // Append this comment id
-        format!("{}.{}", parent_path.0, comment_id)
-      } else {
-        // '0' is always the first path, append to that
-        format!("{}.{}", 0, comment_id)
-      });
+          // You need to update the ltree column
+          let ltree = Ltree(if let Some(parent_path) = parent_path {
+            // The previous parent will already have 0 in it
+            // Append this comment id
+            format!("{}.{}", parent_path.0, comment_id)
+          } else {
+            // '0' is always the first path, append to that
+            format!("{}.{}", 0, comment_id)
+          });
 
-      let updated_comment = diesel::update(comment.find(comment_id))
-        .set(path.eq(ltree))
-        .get_result::<Self>(conn)
-        .await;
+          let updated_comment = diesel::update(comment.find(comment_id))
+            .set(path.eq(ltree))
+            .get_result::<Self>(conn)
+            .await;
 
-      // Update the child count for the parent comment_aggregates
-      // You could do this with a trigger, but since you have to do this manually anyway,
-      // you can just have it here
-      if let Some(parent_path) = parent_path {
-        // You have to update counts for all parents, not just the immediate one
-        // TODO if the performance of this is terrible, it might be better to do this as part of a
-        // scheduled query... although the counts would often be wrong.
-        //
-        // The child_count query for reference:
-        // select c.id, c.path, count(c2.id) as child_count from comment c
-        // left join comment c2 on c2.path <@ c.path and c2.path != c.path
-        // group by c.id
+          // Update the child count for the parent comment_aggregates
+          // You could do this with a trigger, but since you have to do this manually anyway,
+          // you can just have it here
+          if let Some(parent_path) = parent_path {
+            // You have to update counts for all parents, not just the immediate one
+            // TODO if the performance of this is terrible, it might be better to do this as part of a
+            // scheduled query... although the counts would often be wrong.
+            //
+            // The child_count query for reference:
+            // select c.id, c.path, count(c2.id) as child_count from comment c
+            // left join comment c2 on c2.path <@ c.path and c2.path != c.path
+            // group by c.id
 
-        let parent_id = parent_path.0.split('.').nth(1);
+            let parent_id = parent_path.0.split('.').nth(1);
 
-        if let Some(parent_id) = parent_id {
-          let top_parent = format!("0.{}", parent_id);
-          let update_child_count_stmt = format!(
-            "
+            if let Some(parent_id) = parent_id {
+              let top_parent = format!("0.{}", parent_id);
+              let update_child_count_stmt = format!(
+                "
 update comment_aggregates ca set child_count = c.child_count
 from (
   select c.id, c.path, count(c2.id) as child_count from comment c
@@ -113,15 +116,15 @@ from (
   group by c.id
 ) as c
 where ca.comment_id = c.id"
-          );
+              );
 
-          sql_query(update_child_count_stmt).execute(conn).await?;
-        }
-      }
-      updated_comment
-    } else {
-      inserted_comment
-    }
+              sql_query(update_child_count_stmt).execute(conn).await?;
+            }
+          }
+          updated_comment
+        }) as _
+      })
+      .await
   }
   pub async fn read_from_apub_id(
     pool: &mut DbPool<'_>,