From 8ec8410651ad95ef1da4484497caf93899c31e9b Mon Sep 17 00:00:00 2001
From: Matt Jankowski <mjankowski@thoughtbot.com>
Date: Thu, 18 May 2017 15:10:41 -0400
Subject: After remote follow worker specs (#3098)

* Add specs for the after remote follow workers

* Refactor the after remote follow workers
---
 app/workers/after_remote_follow_request_worker.rb | 22 +++++++++++++++++-----
 app/workers/after_remote_follow_worker.rb         | 22 +++++++++++++++++-----
 2 files changed, 34 insertions(+), 10 deletions(-)

(limited to 'app/workers')

diff --git a/app/workers/after_remote_follow_request_worker.rb b/app/workers/after_remote_follow_request_worker.rb
index 928069211..84eb6ade2 100644
--- a/app/workers/after_remote_follow_request_worker.rb
+++ b/app/workers/after_remote_follow_request_worker.rb
@@ -5,15 +5,27 @@ class AfterRemoteFollowRequestWorker
 
   sidekiq_options queue: 'pull', retry: 5
 
+  attr_reader :follow_request
+
   def perform(follow_request_id)
-    follow_request  = FollowRequest.find(follow_request_id)
-    updated_account = FetchRemoteAccountService.new.call(follow_request.target_account.remote_url)
+    @follow_request = FollowRequest.find(follow_request_id)
+    process_follow_service if processing_required?
+  rescue ActiveRecord::RecordNotFound
+    true
+  end
 
-    return if updated_account.nil? || updated_account.locked?
+  private
 
+  def process_follow_service
     follow_request.destroy
     FollowService.new.call(follow_request.account, updated_account.acct)
-  rescue ActiveRecord::RecordNotFound
-    true
+  end
+
+  def processing_required?
+    !updated_account.nil? && !updated_account.locked?
+  end
+
+  def updated_account
+    @_updated_account ||= FetchRemoteAccountService.new.call(follow_request.target_account.remote_url)
   end
 end
diff --git a/app/workers/after_remote_follow_worker.rb b/app/workers/after_remote_follow_worker.rb
index d12fa3454..edab83f85 100644
--- a/app/workers/after_remote_follow_worker.rb
+++ b/app/workers/after_remote_follow_worker.rb
@@ -5,15 +5,27 @@ class AfterRemoteFollowWorker
 
   sidekiq_options queue: 'pull', retry: 5
 
+  attr_reader :follow
+
   def perform(follow_id)
-    follow          = Follow.find(follow_id)
-    updated_account = FetchRemoteAccountService.new.call(follow.target_account.remote_url)
+    @follow = Follow.find(follow_id)
+    process_follow_service if processing_required?
+  rescue ActiveRecord::RecordNotFound
+    true
+  end
 
-    return if updated_account.nil? || !updated_account.locked?
+  private
 
+  def process_follow_service
     follow.destroy
     FollowService.new.call(follow.account, updated_account.acct)
-  rescue ActiveRecord::RecordNotFound
-    true
+  end
+
+  def updated_account
+    @_updated_account ||= FetchRemoteAccountService.new.call(follow.target_account.remote_url)
+  end
+
+  def processing_required?
+    !updated_account.nil? && updated_account.locked?
   end
 end
-- 
cgit