Merge pull request #781 from sgmap/activejob

Activejob

README.md

@@ -64,10 +64,10 @@ Afin de générer la BDD de l'application, il est nécessaire d'éxécuter les c
     mailcatcher -f
     rails s
 
-## Lancement des workers
+## Programmation des jobs
 
-    Delayed::Job.enqueue(AutoArchiveProcedureWorker.new, cron: "* * * * *")
+    AutoArchiveProcedureJob.set(cron: "* * * * *").perform_later
-    Delayed::Job.enqueue(WeeklyOverviewWorker.new, cron: "0 8 * * 0")
+    WeeklyOverviewJob.set(cron: "0 8 * * 0").perform_later
 
 ## Exécution des tests (RSpec)
 

app/jobs/application_job.rb

@@ -1,2 +1,9 @@
 class ApplicationJob < ActiveJob::Base
+  before_perform do |job|
+    Rails.logger.info("#{job.class.name} started at #{Time.now}")
+  end
+
+  after_perform do |job|
+    Rails.logger.info("#{job.class.name} ended at #{Time.now}")
+  end
 end

app/jobs/auto_archive_procedure_job.rb

@@ -1,6 +1,7 @@
-class AutoArchiveProcedureWorker
+class AutoArchiveProcedureJob < ApplicationJob
+  queue_as :cron
+
   def perform(*args)
-    Rails.logger.info("AutoArchiveProcedureWorker started at #{Time.now}")
     Procedure.publiees.where("auto_archive_on <= ?", Date.today).each do |procedure|
       procedure.dossiers.state_en_construction.each do |dossier|
         dossier.received!
@@ -8,12 +9,5 @@ class AutoArchiveProcedureWorker
 
       procedure.archive
     end
-    Rails.logger.info("AutoArchiveProcedureWorker ended at #{Time.now}")
   end
-
-  def queue_name
-    "cron"
-  end
-
-  handle_asynchronously :perform
 end

app/jobs/weekly_overview_job.rb

@@ -1,6 +1,7 @@
-class WeeklyOverviewWorker
+class WeeklyOverviewJob < ApplicationJob
+  queue_as :cron
+
   def perform(*args)
-    Rails.logger.info("WeeklyOverviewWorker started at #{Time.now}")
     # Feature flipped to avoid mails in staging due to unprocessed dossier
     if Features.weekly_overview
       Gestionnaire.all
@@ -8,12 +9,5 @@ class WeeklyOverviewWorker
         .reject { |_, overview| overview.nil? }
         .each { |gestionnaire, overview| GestionnaireMailer.last_week_overview(gestionnaire, overview).deliver_now }
     end
-    Rails.logger.info("WeeklyOverviewWorker ended at #{Time.now}")
   end
-
-  def queue_name
-    "cron"
-  end
-
-  handle_asynchronously :perform
 end

config/application.rb

@@ -33,5 +33,7 @@ module TPS
     else
       URL = "http://localhost:3000/"
     end
+
+    config.active_job.queue_adapter = :delayed_job
   end
 end

config/schedule.yml

@@ -1,6 +0,0 @@
-auto_archive_procedure:
-  cron: "* * * * *"
-  class: "AutoArchiveProcedureWorker"
-weekly_overview_worker:
-  cron: "0 8 * * 0"
-  class: "WeeklyOverviewWorker"

spec/jobs/application_job_spec.rb

@@ -0,0 +1,16 @@
+require 'rails_helper'
+include ActiveJob::TestHelper
+
+RSpec.describe ApplicationJob, type: :job do
+  describe 'perform' do
+    it do
+      expect(Rails.logger).to receive(:info).with(/.+started at.+/)
+      expect(Rails.logger).to receive(:info).with(/.+ended at.+/)
+      perform_enqueued_jobs { ChildJob.perform_later }
+    end
+  end
+
+  class ChildJob < ApplicationJob
+    def perform; end
+  end
+end

spec/jobs/auto_archive_procedure_job_spec.rb

@@ -1,15 +1,12 @@
 require 'rails_helper'
 
-RSpec.describe AutoArchiveProcedureWorker, type: :worker do
+RSpec.describe AutoArchiveProcedureJob, type: :job do
-  before { Delayed::Worker.delay_jobs = false }
-  after { Delayed::Worker.delay_jobs = true }
-
   let!(:procedure) { create(:procedure, published_at: Time.now, archived_at: nil, auto_archive_on: nil )}
   let!(:procedure_hier) { create(:procedure, published_at: Time.now, archived_at: nil, auto_archive_on: 1.day.ago )}
   let!(:procedure_aujourdhui) { create(:procedure, published_at: Time.now, archived_at: nil, auto_archive_on: Date.today )}
   let!(:procedure_demain) { create(:procedure, published_at: Time.now, archived_at: nil, auto_archive_on: 1.day.from_now )}
 
-  subject { AutoArchiveProcedureWorker.new.perform }
+  subject { AutoArchiveProcedureJob.new.perform }
 
   context "when procedures have no auto_archive_on" do
     before do

spec/jobs/weekly_overview_job_spec.rb

@@ -1,9 +1,6 @@
 require 'rails_helper'
 
-RSpec.describe WeeklyOverviewWorker, type: :worker do
+RSpec.describe WeeklyOverviewJob, type: :job do
-  before { Delayed::Worker.delay_jobs = false }
-  after { Delayed::Worker.delay_jobs = true }
-
   describe 'perform' do
     let!(:gestionnaire) { create(:gestionnaire) }
     let(:overview) { double('overview') }
@@ -16,7 +13,7 @@ RSpec.describe WeeklyOverviewWorker, type: :worker do
         before :each do
           expect_any_instance_of(Gestionnaire).to receive(:last_week_overview).and_return(overview)
           allow(GestionnaireMailer).to receive(:last_week_overview).and_return(mailer_double)
-          WeeklyOverviewWorker.new.perform
+          WeeklyOverviewJob.new.perform
         end
 
         it { expect(GestionnaireMailer).to have_received(:last_week_overview).with(gestionnaire, overview) }
@@ -27,7 +24,7 @@ RSpec.describe WeeklyOverviewWorker, type: :worker do
         before :each do
           expect_any_instance_of(Gestionnaire).to receive(:last_week_overview).and_return(nil)
           allow(GestionnaireMailer).to receive(:last_week_overview)
-          WeeklyOverviewWorker.new.perform
+          WeeklyOverviewJob.new.perform
         end
 
         it { expect(GestionnaireMailer).not_to have_received(:last_week_overview) }
@@ -38,7 +35,7 @@ RSpec.describe WeeklyOverviewWorker, type: :worker do
       before { allow(Features).to receive(:weekly_overview).and_return(false) }
       before :each do
         allow(Gestionnaire).to receive(:all)
-        WeeklyOverviewWorker.new.perform
+        WeeklyOverviewJob.new.perform
       end
 
       it { expect(Gestionnaire).not_to receive(:all) }

spec/rails_helper.rb

@@ -24,6 +24,8 @@ require 'rspec/rails'
 # If you are not using ActiveRecord, you can remove this line.
 ActiveRecord::Migration.maintain_test_schema!
 
+ActiveJob::Base.queue_adapter = :test
+
 RSpec.configure do |config|
   # Remove this line if you're not using ActiveRecord or ActiveRecord fixtures
   config.fixture_path = "#{::Rails.root}/spec/fixtures"