From 9ac136bace8a051ba61f7b84fad8a289cbf7ef53 Mon Sep 17 00:00:00 2001
From: Jose Farias <jose@37signals.com>
Date: Tue, 19 Nov 2024 13:27:09 -0600
Subject: [PATCH] Rescore bubble from Message, not Comment

---
 app/models/bubble/commentable.rb   |  4 ++--
 app/models/comment.rb              |  8 --------
 app/models/concerns/messageable.rb |  6 ------
 app/models/message.rb              | 12 ++++++------
 4 files changed, 8 insertions(+), 22 deletions(-)

diff --git a/app/models/bubble/commentable.rb b/app/models/bubble/commentable.rb
index 3d35119cd..f80f34777 100644
--- a/app/models/bubble/commentable.rb
+++ b/app/models/bubble/commentable.rb
@@ -5,12 +5,12 @@ module Bubble::Commentable
     scope :ordered_by_comments, -> { order comments_count: :desc }
   end
 
-  def comment_captured
+  def comment_created
     increment! :comments_count
     rescore
   end
 
-  def comment_uncaptured
+  def comment_destroyed
     decrement! :comments_count
     rescore
   end
diff --git a/app/models/comment.rb b/app/models/comment.rb
index 4c12d2364..4a9afb28b 100644
--- a/app/models/comment.rb
+++ b/app/models/comment.rb
@@ -4,12 +4,4 @@ class Comment < ApplicationRecord
   belongs_to :creator, class_name: "User", default: -> { Current.user }
 
   searchable_by :body, using: :comments_search_index
-
-  def captured_as(message)
-    message.bubble.comment_captured
-  end
-
-  def uncaptured_as(message)
-    message.bubble.comment_uncaptured
-  end
 end
diff --git a/app/models/concerns/messageable.rb b/app/models/concerns/messageable.rb
index 7be25c747..1005f5492 100644
--- a/app/models/concerns/messageable.rb
+++ b/app/models/concerns/messageable.rb
@@ -7,10 +7,4 @@ module Messageable
     has_one :message, as: :messageable, touch: true
     has_one :bubble, through: :message
   end
-
-  def captured_as(...)
-  end
-
-  def uncaptured_as(...)
-  end
 end
diff --git a/app/models/message.rb b/app/models/message.rb
index 8f283829a..f688f27dd 100644
--- a/app/models/message.rb
+++ b/app/models/message.rb
@@ -5,15 +5,15 @@ class Message < ApplicationRecord
 
   scope :chronologically, -> { order created_at: :asc, id: :desc }
 
-  after_create :captured
-  after_destroy :uncaptured
+  after_create :created
+  after_destroy :destroyed
 
   private
-    def captured
-      messageable.captured_as(self)
+    def created
+      bubble.comment_created if comment?
     end
 
-    def uncaptured
-      messageable.uncaptured_as(self)
+    def destroyed
+      bubble.comment_destroyed if comment?
     end
 end