jobs: migrate user deletions to ActiveJob.

app/jobs/delete_favorites_job.rb

@@ -0,0 +1,12 @@
+class DeleteFavoritesJob < ApplicationJob
+  queue_as :default
+  queue_with_priority 20
+
+  def perform(user)
+    Post.without_timeout do
+      user.favorites.find_each do |favorite|
+        Favorite.remove(post: favorite.post, user: user)
+      end
+    end
+  end
+end

app/logical/user_deletion.rb

@@ -3,15 +3,6 @@ class UserDeletion
 
   attr_reader :user, :password
 
-  def self.remove_favorites_for(user_id)
-    user = User.find(user_id)
-    Post.without_timeout do
-      Post.raw_tag_match("fav:#{user_id}").where("true /* UserDeletion.remove_favorites_for */").find_each do |post|
-        Favorite.remove(post: post, user: user)
-      end
-    end
-  end
-
   def initialize(user, password)
     @user = user
     @password = password
@@ -59,7 +50,7 @@ private
   end
 
   def remove_favorites
-    UserDeletion.delay(:queue => "default").remove_favorites_for(user.id)
+    DeleteFavoritesJob.perform_later(user)
   end
 
   def rename

test/jobs/delete_favorites_job_test.rb

@@ -0,0 +1,21 @@
+require 'test_helper'
+
+class DeleteFavoritesJobTest < ActiveJob::TestCase
+  context "DeleteFavoritesJob" do
+    should "delete all favorites" do
+      user = create(:user)
+      posts = create_list(:post, 3)
+      favorites = posts.each { |post| post.add_favorite!(user) }
+
+      assert_equal(3, user.favorite_count)
+      assert_equal(3, user.favorites.count)
+      assert_equal(3, Post.raw_tag_match("fav:#{user.id}").count)
+
+      DeleteFavoritesJob.perform_now(user)
+
+      assert_equal(0, user.reload.favorite_count)
+      assert_equal(0, user.favorites.count)
+      assert_equal(0, Post.raw_tag_match("fav:#{user.id}").count)
+    end
+  end
+end

test/test_helper.rb

@@ -57,6 +57,7 @@ end
 
 
 class ActiveSupport::TestCase
+  include ActiveJob::TestHelper
   include FactoryBot::Syntax::Methods
   include PostArchiveTestHelper
   include PoolArchiveTestHelper

test/unit/user_deletion_test.rb

@@ -3,14 +3,10 @@ require 'test_helper'
 class UserDeletionTest < ActiveSupport::TestCase
   context "an invalid user deletion" do
     context "for an invalid password" do
-      setup do
-        @user = FactoryBot.create(:user)
-        CurrentUser.user = @user
-        CurrentUser.ip_addr = "127.0.0.1"
-        @deletion = UserDeletion.new(@user, "wrongpassword")
-      end
-
       should "fail" do
+        @user = create(:user)
+        @deletion = UserDeletion.new(@user, "wrongpassword")
+
         assert_raise(UserDeletion::ValidationError) do
           @deletion.delete!
         end
@@ -18,14 +14,10 @@ class UserDeletionTest < ActiveSupport::TestCase
     end
 
     context "for an admin" do
-      setup do
-        @user = FactoryBot.create(:admin_user)
-        CurrentUser.user = @user
-        CurrentUser.ip_addr = "127.0.0.1"
-        @deletion = UserDeletion.new(@user, "password")
-      end
-
       should "fail" do
+        @user = create(:admin_user)
+        @deletion = UserDeletion.new(@user, "password")
+
         assert_raise(UserDeletion::ValidationError) do
           @deletion.delete!
         end
@@ -35,36 +27,33 @@ class UserDeletionTest < ActiveSupport::TestCase
 
   context "a valid user deletion" do
     setup do
-      @user = FactoryBot.create(:user)
+      @user = create(:user, email: "ted@danbooru.com")
-      CurrentUser.user = @user
-      CurrentUser.ip_addr = "127.0.0.1"
-
-      @post = FactoryBot.create(:post)
-      Favorite.add(post: @post, user: @user)
-
-      @user.update_attributes(:email => "ted@danbooru.com")
-
       @deletion = UserDeletion.new(@user, "password")
-      @deletion.delete!
-      @user.reload
     end
 
     should "blank out the email" do
-      assert_nil(@user.email)
+      @deletion.delete!
+      assert_nil(@user.reload.email)
     end
 
     should "rename the user" do
-      assert_equal("user_#{@user.id}", @user.name)
+      @deletion.delete!
+      assert_equal("user_#{@user.id}", @user.reload.name)
     end
 
     should "reset the password" do
+      @deletion.delete!
       assert_nil(User.authenticate(@user.name, "password"))
     end
 
     should "remove any favorites" do
-      @post.reload
+      @post = create(:post)
+      Favorite.add(post: @post, user: @user)
+
+      perform_enqueued_jobs { @deletion.delete! }
+
       assert_equal(0, Favorite.count)
-      assert_equal("", @post.fav_string)
+      assert_equal("", @post.reload.fav_string)
       assert_equal(0, @post.fav_count)
     end
   end