Merge pull request #763 from alphagov/answer-analysis-job-remove

Remove AnswerAnalysisJob in favour of method

Author: jackbot

app/jobs/answer_analysis_job.rb

@@ -14,9 +14,6 @@ def perform(question_id)
       logger.warn("Already an answer created for #{question_id}")
     end
 
-    if answer.persisted?
-      AnswerAnalysisJob.perform_later(answer.id)
-
-    end
+    AnswerAnalysis.enqueue_async_analysis(answer) if answer.persisted?
   end
 end

app/jobs/compose_answer_job.rb

@@ -0,0 +1,6 @@
+module AnswerAnalysis
+  def self.enqueue_async_analysis(answer)
+    TagTopicsJob.perform_later(answer.id)
+    AnswerRelevancyJob.perform_later(answer.id)
+  end
+end

lib/answer_analysis.rb

@@ -5,7 +5,6 @@
 
   before do
     allow(AnswerComposition::Composer).to receive(:call).and_return(returned_answer)
-    allow(AnswerAnalysisJob).to receive(:perform_later)
   end
 
   it_behaves_like "a job in queue", "answer"
@@ -17,9 +16,9 @@
         .and change(AnswerSource, :count).by(2)
     end
 
-    it "calls the AnswerAnalysisJob with the answer id" do
+    it "enqueues the answer analysis jobs" do
+      expect(AnswerAnalysis).to receive(:enqueue_async_analysis).with(returned_answer)
       described_class.new.perform(question.id)
-      expect(AnswerAnalysisJob).to have_received(:perform_later).with(returned_answer.id)
     end
 
     context "when the question has already been answered" do

spec/jobs/answer_analysis_job_spec.rb

@@ -0,0 +1,10 @@
+RSpec.describe AnswerAnalysis do
+  describe ".enqueue_async_analysis" do
+    it "enqueues the analysis jobs" do
+      answer = build(:answer)
+      expect(described_class::TagTopicsJob).to receive(:perform_later).with(answer.id)
+      expect(described_class::AnswerRelevancyJob).to receive(:perform_later).with(answer.id)
+      described_class.enqueue_async_analysis(answer)
+    end
+  end
+end