Skip to content

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

FIX: Delete reviewable notes before reviewables during user deletion (#38709)

Natalie Taya799a90a51c1
diff --git a/app/models/user.rb b/app/models/user.rb
index 539a55fe9d0..d6e42e0f52f 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -1315,6 +1315,8 @@ class User < ActiveRecord::Base
def delete_posts_in_batches(guardian, batch_size = 20)
raise Discourse::InvalidAccess unless guardian.can_delete_all_posts? self
+ reviewable_ids = Reviewable.where(created_by_id: id).select(:id)
+ ReviewableNote.where(reviewable_id: reviewable_ids).delete_all
Reviewable.where(created_by_id: id).delete_all
posts
diff --git a/app/services/user_destroyer.rb b/app/services/user_destroyer.rb
index eab3b25b392..e582ad5ac8a 100644
--- a/app/services/user_destroyer.rb
+++ b/app/services/user_destroyer.rb
@@ -29,6 +29,8 @@ class UserDestroyer
UserSecurityKey.where(user_id: user.id).delete_all
Bookmark.where(user_id: user.id).delete_all
Draft.where(user_id: user.id).delete_all
+ reviewable_ids = Reviewable.where(created_by_id: user.id).select(:id)
+ ReviewableNote.where(reviewable_id: reviewable_ids).delete_all
Reviewable.where(created_by_id: user.id).delete_all
ReviewableClaimedTopic.where(user_id: user.id).delete_all
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index d29257edeba..c52d9cbb82f 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -635,6 +635,18 @@ RSpec.describe User do
posts.each { |p| expect(Topic.find_by(id: p.topic_id)).to be_nil if p.is_first_post? }
end
+ it "deletes reviewables that have notes" do
+ reviewable = Fabricate(:reviewable_queued_post, created_by: user)
+ Fabricate(:reviewable_note, reviewable: reviewable)
+
+ posts
+ user.delete_posts_in_batches(guardian, 20)
+
+ expect(Post.where(id: post_ids)).to be_empty
+ expect(Reviewable.where(created_by: user).count).to eq(0)
+ expect(ReviewableNote.where(reviewable_id: reviewable.id).count).to eq(0)
+ end
+
it "does not allow non moderators to delete all posts" do
invalid_guardian = Guardian.new(Fabricate(:user))
diff --git a/spec/services/user_destroyer_spec.rb b/spec/services/user_destroyer_spec.rb
index cca9e865068..48a6073eda9 100644
--- a/spec/services/user_destroyer_spec.rb
+++ b/spec/services/user_destroyer_spec.rb
@@ -140,6 +140,13 @@ RSpec.describe UserDestroyer do
UserDestroyer.new(admin).destroy(user)
expect(Reviewable.where(created_by_id: user.id).count).to eq(0)
end
+
+ it "removes the queued post even when it has notes" do
+ Fabricate(:reviewable_note, reviewable: reviewable)
+ UserDestroyer.new(admin).destroy(user)
+ expect(Reviewable.where(created_by_id: user.id).count).to eq(0)
+ expect(ReviewableNote.where(reviewable_id: reviewable.id).count).to eq(0)
+ end
end
context "with a reviewable user" do