1 files changed, 19 insertions, 9 deletions
diff --git a/app/services/unblock_domain_service.rb b/app/services/unblock_domain_service.rb
index 77460f76b..169d2f781 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
+    @domain_block = domain_block
+    process_retroactive_updates if retroactive
+    domain_block.destroy
+  end
 
-      if domain_block.silence?
-        accounts.update_all(silenced: false)
-      else
-        accounts.update_all(suspended: false)
-      end
-    end
+  def process_retroactive_updates
+    blocked_accounts.in_batches.update_all(update_options)
+  end
 
-    domain_block.destroy
+  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