Skip to content

A platform for community discussion. Free, open, simple.

FIX: Move quoted post rebaking on avatar upload to a background job (#40231)

Amanda Alves Branquinho13492ae613c6
diff --git a/app/jobs/regular/rebake_quoted_posts_for_user.rb b/app/jobs/regular/rebake_quoted_posts_for_user.rb
new file mode 100644
index 00000000000..3d7b69d3f02
--- /dev/null
+++ b/app/jobs/regular/rebake_quoted_posts_for_user.rb
@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+module Jobs
+ class RebakeQuotedPostsForUser < ::Jobs::Base
+ def execute(args)
+ user_id = args[:user_id]
+ return if user_id.blank?
+
+ Post.rebake_all_quoted_posts(user_id)
+ end
+ end
+end
diff --git a/app/models/user.rb b/app/models/user.rb
index 0aee8a67f90..4f876d0a6a7 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -1608,7 +1608,8 @@ class User < ActiveRecord::Base
end
# mark all the user's quoted posts as "needing a rebake"
- Post.rebake_all_quoted_posts(id) if saved_change_to_uploaded_avatar_id?
+ # use background job to avoid blocking on large datasets
+ Jobs.enqueue(:rebake_quoted_posts_for_user, user_id: id) if saved_change_to_uploaded_avatar_id?
end
def first_post_created_at
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index 52d3ade3a80..7900fb8d0f6 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -854,8 +854,9 @@ RSpec.describe User do
user.update!(name: "Sam")
expect(post.reload.baked_version).not_to be_nil
- user.update!(uploaded_avatar_id: 100)
- expect(post.reload.baked_version).to be_nil
+ expect_enqueued_with(job: :rebake_quoted_posts_for_user, args: { user_id: user.id }) do
+ user.update!(uploaded_avatar_id: 100)
+ end
end
end
end
@@ -2038,6 +2039,27 @@ RSpec.describe User do
user.refresh_avatar
end
end
+
+ it "enqueues rebake job instead of blocking when avatar is updated" do
+ user = Fabricate(:user)
+ upload = Fabricate(:upload)
+
+ allow(Post).to receive(:rebake_all_quoted_posts)
+
+ expect_enqueued_with(job: :rebake_quoted_posts_for_user, args: { user_id: user.id }) do
+ user.update!(uploaded_avatar_id: upload.id)
+ end
+
+ expect(Post).not_to have_received(:rebake_all_quoted_posts)
+ end
+
+ it "does not enqueue rebake job when avatar is not changed" do
+ user = Fabricate(:user)
+
+ expect_not_enqueued_with(job: :rebake_quoted_posts_for_user) do
+ user.update!(name: "New Name")
+ end
+ end
end
describe "real users" do