Pre-calculate comment counts and activity scores

app/helpers/bubbles_helper.rb

@@ -9,7 +9,7 @@ def bubble_rotation(bubble)
 
   def bubble_size(bubble)
     rank =
-      case bubble.activity_count
+      case bubble.activity_score
       when 0..5   then "one"
       when 6..10  then "two"
       when 11..25 then "three"

app/models/account.rb

@@ -1,11 +1,11 @@
 class Account < ApplicationRecord
   include Joinable
 
-  has_many :users, dependent: :destroy
-
   has_many :buckets, dependent: :destroy
   has_many :bubbles, through: :buckets
 
+  has_many :users, dependent: :destroy
+
   has_many :workflows, dependent: :destroy
   has_many :stages, through: :workflows, class_name: "Workflow::Stage"
 

app/models/bubble.rb

@@ -1,5 +1,5 @@
 class Bubble < ApplicationRecord
-  include Assignable, Boostable, Colored, Eventable, Messages, Poppable, Searchable, Staged, Taggable
+  include Assignable, Boostable, Colored, Commentable, Eventable, Messages, Poppable, Searchable, Staged, Taggable
 
   belongs_to :bucket, touch: true
   belongs_to :creator, class_name: "User", default: -> { Current.user }
@@ -10,19 +10,9 @@ class Bubble < ApplicationRecord
 
   scope :reverse_chronologically, -> { order created_at: :desc, id: :desc }
   scope :chronologically, -> { order created_at: :asc, id: :asc }
+  scope :ordered_by_activity, -> { order activity_score: :desc }
   scope :in_bucket, ->(bucket) { where bucket: bucket }
 
-  # FIXME: Compute activity and comment count at write time so it's easier to query for.
-  scope :left_joins_comments, -> do
-    left_joins(:messages).merge(Message.left_joins_messageable(:comments))
-  end
-  scope :ordered_by_activity, -> do
-    left_joins_comments.select("bubbles.*, COUNT(comments.id) + bubbles.boost_count AS activity").group(:id).order("activity DESC")
-  end
-  scope :ordered_by_comments, -> do
-    left_joins_comments.select("bubbles.*, COUNT(comments.id) AS comment_count").group(:id).order("comment_count DESC")
-  end
-
   scope :indexed_by, ->(index) do
     case index
     when "most_active"    then ordered_by_activity
@@ -34,8 +24,8 @@ class Bubble < ApplicationRecord
     end
   end
 
-  def activity_count
-    boost_count + messages.comments.size
+  def rescore
+    update! activity_score: boost_count + comments_count
   end
 
   private

app/models/bubble/boostable.rb

@@ -7,8 +7,9 @@ module Bubble::Boostable
 
   def boost!
     transaction do
-      increment! :boost_count
       track_event :boosted
+      increment! :boost_count
+      rescore
     end
   end
 end

app/models/bubble/commentable.rb

@@ -0,0 +1,17 @@
+module Bubble::Commentable
+  extend ActiveSupport::Concern
+
+  included do
+    scope :ordered_by_comments, -> { order comments_count: :desc }
+  end
+
+  def comment_created
+    increment! :comments_count
+    rescore
+  end
+
+  def comment_destroyed
+    decrement! :comments_count
+    rescore
+  end
+end

app/models/message.rb

@@ -5,8 +5,15 @@ class Message < ApplicationRecord
 
   scope :chronologically, -> { order created_at: :asc, id: :desc }
 
-  # FIXME: Will be made redundant when we compute activity and comment count at write time. See commit.
-  scope :left_joins_messageable, ->(messageable_type) do
-    joins "LEFT OUTER JOIN #{messageable_type} ON messages.messageable_id = #{messageable_type}.id"
-  end
+  after_create :created
+  after_destroy :destroyed
+
+  private
+    def created
+      bubble.comment_created if comment?
+    end
+
+    def destroyed
+      bubble.comment_destroyed if comment?
+    end
 end

db/migrate/20241115234456_add_comments_count_to_bubbles.rb

@@ -0,0 +1,5 @@
+class AddCommentsCountToBubbles < ActiveRecord::Migration[8.0]
+  def change
+    add_column :bubbles, :comments_count, :integer, null: false, default: 0
+  end
+end

db/migrate/20241115234505_add_activity_score_to_bubbles.rb

@@ -0,0 +1,5 @@
+class AddActivityScoreToBubbles < ActiveRecord::Migration[8.0]
+  def change
+    add_column :bubbles, :activity_score, :integer, null: false, default: 0
+  end
+end

test/fixtures/bubbles.yml

@@ -6,13 +6,17 @@ logo:
   due_on: <%= 3.days.from_now %>
   created_at: <%= 1.week.ago %>
   boost_count: 5
+  comments_count: 2
+  activity_score: 7
 
 layout:
   bucket: writebook
   creator: david
   title: Layout is broken
   color: "#698F9C"
   created_at: <%= 1.week.ago %>
+  comments_count: 1
+  activity_score: 1
 
 text:
   bucket: writebook

test/models/bubble_test.rb

@@ -14,8 +14,10 @@ class BubbleTest < ActiveSupport::TestCase
   end
 
   test "boosting" do
-    assert_difference %w[ bubbles(:logo).boost_count Event.count ], +1 do
-      bubbles(:logo).boost!
+    assert_changes "bubbles(:logo).activity_score", +1 do
+      assert_difference %w[ bubbles(:logo).boost_count Event.count ], +1 do
+        bubbles(:logo).boost!
+      end
     end
   end
 
@@ -33,7 +35,7 @@ class BubbleTest < ActiveSupport::TestCase
   end
 
   test "ordering by activity" do
-    bubbles(:layout).update! boost_count: 1_000
+    bubbles(:layout).tap { |b| b.update!(boost_count: 1_000) }.rescore
     assert_equal bubbles(:layout, :logo, :shipping, :text), Bubble.ordered_by_activity
   end
 

test/models/comment_test.rb

@@ -10,4 +10,18 @@ class CommentTest < ActiveSupport::TestCase
 
     assert_includes Comment.search("something rustic"), message.comment
   end
+
+  test "updating bubble counter" do
+    assert_changes "bubbles(:logo).activity_score" do
+      assert_difference "bubbles(:logo).comments_count", 1 do
+        bubbles(:logo).capture Comment.new(body: "I'd prefer something more rustic")
+      end
+    end
+
+    assert_changes "bubbles(:logo).activity_score" do
+      assert_difference "bubbles(:logo).comments_count", -1 do
+        bubbles(:logo).messages.comments.last.destroy
+      end
+    end
+  end
 end