Merge pull request #762 from alphagov/answer-analysis-job

Add AnswerAnalysisJob to kick off separate analysis jobs

Author: jackbot

app/jobs/answer_analysis_job.rb

@@ -0,0 +1,6 @@
+class AnswerAnalysisJob < ApplicationJob
+  def perform(answer_id)
+    AnswerAnalysis::TagTopicsJob.perform_later(answer_id)
+    AnswerAnalysis::AnswerRelevancyJob.perform_later(answer_id)
+  end
+end

app/jobs/compose_answer_job.rb

@@ -15,10 +15,8 @@ def perform(question_id)
     end
 
     if answer.persisted?
-      # TODO: Once we've added a few metrics we should move these to a single job that
-      # kicks off all analysis jobs.
-      AnswerAnalysis::TagTopicsJob.perform_later(answer.id)
-      AnswerAnalysis::AnswerRelevancyJob.perform_later(answer.id)
+      AnswerAnalysisJob.perform_later(answer.id)
+
     end
   end
 end

spec/jobs/answer_analysis_job_spec.rb

@@ -0,0 +1,18 @@
+RSpec.describe AnswerAnalysisJob do
+  let(:answer) { build :answer }
+
+  before do
+    allow(AnswerAnalysis::TagTopicsJob).to receive(:perform_later)
+    allow(AnswerAnalysis::AnswerRelevancyJob).to receive(:perform_later)
+  end
+
+  it "calls the AnswerAnalysis::TagTopicsJob with the answer id" do
+    described_class.new.perform(answer.id)
+    expect(AnswerAnalysis::TagTopicsJob).to have_received(:perform_later).with(answer.id)
+  end
+
+  it "calls the AnswerAnalysis::AnswerRelevancyJob with the answer id" do
+    described_class.new.perform(answer.id)
+    expect(AnswerAnalysis::AnswerRelevancyJob).to have_received(:perform_later).with(answer.id)
+  end
+end

spec/jobs/compose_answer_job_spec.rb

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