use ApplicationJob with Delayed Job backend (#916)

app/controllers/bgeigie_imports_controller.rb

@@ -83,9 +83,7 @@ def submit
     if @bgeigie_import.would_auto_approve
       @bgeigie_import.approve!('ZBot Auto Approving System')
     else
-      @bgeigie_import.update_column(:status, 'submitted')
-      @bgeigie_import.update_column(:rejected, 'false')
-      @bgeigie_import.update_column(:rejected_by, nil)
+      @bgeigie_import.update_columns(status: 'submitted', rejected: false, rejected_by: nil)
       Notifications.import_awaiting_approval(@bgeigie_import).deliver_later
     end
     redirect_to @bgeigie_import
@@ -114,7 +112,7 @@ def show
 
   def create
     @bgeigie_import = current_user.bgeigie_imports.build(bgeigie_import_params)
-    @bgeigie_import.process_in_background if @bgeigie_import.save
+    ProcessBgeigieImportJob.perform_later(@bgeigie_import.id) if @bgeigie_import.save
     respond_with @bgeigie_import
   end
 

app/jobs/application_job.rb

@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+class ApplicationJob < ActiveJob::Base
+end

app/jobs/finalize_bgeigie_import_job.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-FinalizeBgeigieImportJob = Struct.new(:bgeigie_import_id) do
-  def perform
+class FinalizeBgeigieImportJob < ApplicationJob
+  def perform(bgeigie_import_id)
     BgeigieImport.find(bgeigie_import_id).finalize!
   end
 end

app/jobs/process_bgeigie_import_job.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-ProcessBgeigieImportJob = Struct.new(:bgeigie_import_id) do
-  def perform
+class ProcessBgeigieImportJob < ApplicationJob
+  def perform(bgeigie_import_id)
     BgeigieImport.find(bgeigie_import_id).process
   end
 end

app/models/bgeigie_import.rb

@@ -101,14 +101,9 @@ def process
     check_auto_approve # check if this drive can be auto approved
   end
 
-  def process_in_background
-    Delayed::Job.enqueue ProcessBgeigieImportJob.new(id)
-  end
-
   def approve!(userinfo)
-    update_column(:approved, true)
-    update_column(:approved_by, userinfo)
-    Delayed::Job.enqueue FinalizeBgeigieImportJob.new(id)
+    update_columns(approved: true, approved_by: userinfo)
+    FinalizeBgeigieImportJob.perform_later(id)
     Notifications.import_approved(self).deliver_later
   end
 

config/application.rb

@@ -54,6 +54,8 @@ class Application < Rails::Application
     # Version of your assets, change this if you want to expire all your assets
     config.assets.version = '1.0'
 
+    config.active_job.queue_adapter = :delayed_job
+
     config.active_record.schema_format = :sql
     config.active_record.yaml_column_permitted_classes = [
       ActiveSupport::HashWithIndifferentAccess,

spec/acceptance/user_uploads_bgeigie_log_spec.rb

@@ -3,6 +3,8 @@
 require 'spec_helper'
 
 feature 'User uploads bgeigie log', type: :feature do
+  include ActiveJob::TestHelper
+
   let!(:user) { Fabricate(:user) }
   let!(:moderator) { Fabricate(:user, moderator: true) }
 
@@ -17,11 +19,12 @@
       expect(page).to have_content('Unprocessed')
       fill_in 'Credits', with: 'Bill'
       fill_in 'Cities', with: 'Dublin'
-      Delayed::Worker.new.work_off
+      perform_enqueued_jobs
       click_button 'Save'
       expect(page).to have_content('Processed')
       click_button 'Submit for Approval'
       expect(page).to have_content('Submitted')
+      perform_enqueued_jobs
       expect(find_email(Notifications::APPROVERS_LIST,
                         with_subject: 'A Safecast import is awaiting approval')).to be_present
     end
@@ -42,7 +45,7 @@
       click_link 'Submitted'
       click_link File.basename(bgeigie_import.source.filename)
       click_button 'Approve'
-      Delayed::Worker.new.work_off
+      perform_enqueued_jobs
       visit(current_path)
       expect(page).to have_content('Processed')
       expect(find_email(user.email,

spec/integration/api/bgeigie_imports_spec.rb

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 feature '/bgeigie_imports API endpoint', type: :request do
+  include ActiveJob::TestHelper
+
   before(:each) do
     User.destroy_all
     @user ||= Fabricate(:user,
@@ -27,7 +29,7 @@
 
   context 'after processing' do
     before(:each) do
-      Delayed::Worker.new.work_off
+      perform_enqueued_jobs
       BgeigieImport.find_each(&:finalize!)
     end
     let!(:updated_result) do