From d658af7ff8893d332f1509082a9d919f70af99af Mon Sep 17 00:00:00 2001 From: ThibG Date: Wed, 15 Jul 2020 21:08:19 +0200 Subject: Fix removing allowed domains being done synchronously (#14302) * Fix removing allowed domains being done synchronously * Add tests --- app/services/after_unallow_domain_service.rb | 9 +++++++++ app/services/unallow_domain_service.rb | 5 ++--- app/workers/after_unallow_domain_worker.rb | 9 +++++++++ 3 files changed, 20 insertions(+), 3 deletions(-) create mode 100644 app/services/after_unallow_domain_service.rb create mode 100644 app/workers/after_unallow_domain_worker.rb (limited to 'app') diff --git a/app/services/after_unallow_domain_service.rb b/app/services/after_unallow_domain_service.rb new file mode 100644 index 000000000..ccd0b8ae9 --- /dev/null +++ b/app/services/after_unallow_domain_service.rb @@ -0,0 +1,9 @@ +# frozen_string_literal: true + +class AfterUnallowDomainService < BaseService + def call(domain) + Account.where(domain: domain).find_each do |account| + SuspendAccountService.new.call(account, reserve_username: false) + end + end +end diff --git a/app/services/unallow_domain_service.rb b/app/services/unallow_domain_service.rb index 870c79951..fc5260761 100644 --- a/app/services/unallow_domain_service.rb +++ b/app/services/unallow_domain_service.rb @@ -12,8 +12,7 @@ class UnallowDomainService < BaseService private def suspend_accounts!(domain) - Account.where(domain: domain).find_each do |account| - SuspendAccountService.new.call(account, reserve_username: false) - end + Account.where(domain: domain).in_batches.update_all(suspended_at: Time.now.utc) + AfterUnallowDomainWorker.perform_async(domain) end end diff --git a/app/workers/after_unallow_domain_worker.rb b/app/workers/after_unallow_domain_worker.rb new file mode 100644 index 000000000..46049cbb2 --- /dev/null +++ b/app/workers/after_unallow_domain_worker.rb @@ -0,0 +1,9 @@ +# frozen_string_literal: true + +class AfterUnallowDomainWorker + include Sidekiq::Worker + + def perform(domain) + AfterUnallowDomainService.new.call(domain) + end +end -- cgit