From b8ba719f73ec0a2ec7c11b96a740aad8132a5580 Mon Sep 17 00:00:00 2001 From: Matt Jankowski Date: Sun, 7 May 2017 08:44:28 -0400 Subject: [PATCH] Unblock domain service specs/refactor (#2867) * Add spec for unblock domain service * Refactor UnblockDomainService --- app/services/unblock_domain_service.rb | 30 ++++++++----- spec/services/unblock_domain_service_spec.rb | 46 ++++++++++++++++++++ 2 files changed, 66 insertions(+), 10 deletions(-) create mode 100644 spec/services/unblock_domain_service_spec.rb diff --git a/app/services/unblock_domain_service.rb b/app/services/unblock_domain_service.rb index 77460f76baf..169d2f78190 100644 --- a/app/services/unblock_domain_service.rb +++ b/app/services/unblock_domain_service.rb @@ -1,17 +1,27 @@ # frozen_string_literal: true class UnblockDomainService < BaseService + attr_accessor :domain_block + def call(domain_block, retroactive) - if retroactive - accounts = Account.where(domain: domain_block.domain).in_batches - - if domain_block.silence? - accounts.update_all(silenced: false) - else - accounts.update_all(suspended: false) - end - end - + @domain_block = domain_block + process_retroactive_updates if retroactive domain_block.destroy end + + def process_retroactive_updates + blocked_accounts.in_batches.update_all(update_options) + end + + def blocked_accounts + Account.where(domain: domain_block.domain) + end + + def update_options + { domain_block_impact => false } + end + + def domain_block_impact + domain_block.silence? ? :silenced : :suspended + end end diff --git a/spec/services/unblock_domain_service_spec.rb b/spec/services/unblock_domain_service_spec.rb new file mode 100644 index 00000000000..c32e5d65571 --- /dev/null +++ b/spec/services/unblock_domain_service_spec.rb @@ -0,0 +1,46 @@ +# frozen_string_literal: true + +require 'rails_helper' + +describe UnblockDomainService do + subject { described_class.new } + + describe 'call' do + before do + @silenced = Fabricate(:account, domain: 'example.com', silenced: true) + @suspended = Fabricate(:account, domain: 'example.com', suspended: true) + @domain_block = Fabricate(:domain_block, domain: 'example.com') + end + + context 'without retroactive' do + it 'removes the domain block' do + subject.call(@domain_block, false) + expect_deleted_domain_block + end + end + + context 'with retroactive' do + it 'unsilences accounts and removes block' do + @domain_block.update(severity: :silence) + + subject.call(@domain_block, true) + expect_deleted_domain_block + expect(@silenced.reload.silenced).to be false + expect(@suspended.reload.suspended).to be true + end + + it 'unsuspends accounts and removes block' do + @domain_block.update(severity: :suspend) + + subject.call(@domain_block, true) + expect_deleted_domain_block + expect(@suspended.reload.suspended).to be false + expect(@silenced.reload.silenced).to be true + end + end + end + + def expect_deleted_domain_block + expect { @domain_block.reload }.to raise_error(ActiveRecord::RecordNotFound) + end +end