Convert jobs with no arguments to Sidekiq

thomasleese · thomasleese · commit 0bd3ccdf336d · 2026-04-30T09:14:22.000+01:00
This converts any of the jobs which take no arguments (and are likely
queued on a schedule) to Sidekiq. Jobs without arguments are easier to
convert to Sidekiq as there's no need to handle the argument
serialisation and deserialisation, therefore we can switch these jobs
directly.

Jira-Issue: MAV-7288
diff --git a/app/controllers/api/testing/refresh_reporting_controller.rb b/app/controllers/api/testing/refresh_reporting_controller.rb
@@ -3,10 +3,10 @@
 class API::Testing::RefreshReportingController < API::Testing::BaseController
   def create
     if params[:wait].present?
-      ReportingAPI::RefreshJob.perform_now
+      ReportingAPI::RefreshJob.new.perform
       render status: :ok
     else
-      ReportingAPI::RefreshJob.perform_later
+      ReportingAPI::RefreshJob.perform_async
       render status: :accepted
     end
   end
diff --git a/app/controllers/api/testing/vaccinations_search_in_nhs_controller.rb b/app/controllers/api/testing/vaccinations_search_in_nhs_controller.rb
@@ -6,11 +6,11 @@ class API::Testing::VaccinationsSearchInNHSController < API::Testing::BaseContro
 
   def create
     if params[:wait].present?
-      EnqueueVaccinationsSearchInNHSJob.perform_now
+      EnqueueVaccinationsSearchInNHSJob.new.perform
       wait_for_search_jobs_to_complete
       render status: :ok
     else
-      EnqueueVaccinationsSearchInNHSJob.perform_later
+      EnqueueVaccinationsSearchInNHSJob.perform_async
       render status: :accepted
     end
   end
diff --git a/app/jobs/enqueue_automated_careplus_reports_job.rb b/app/jobs/enqueue_automated_careplus_reports_job.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-class EnqueueAutomatedCareplusReportsJob < ApplicationJobActiveJob
-  queue_as :careplus
+class EnqueueAutomatedCareplusReportsJob < ApplicationJobSidekiq
+  sidekiq_options queue: :careplus
 
   def perform
     ids = Team.eligible_for_automated_careplus_reports.ids
diff --git a/app/jobs/enqueue_location_position_updater_job.rb b/app/jobs/enqueue_location_position_updater_job.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-class EnqueueLocationPositionUpdaterJob < ApplicationJobActiveJob
-  queue_as :third_party_data_imports
+class EnqueueLocationPositionUpdaterJob < ApplicationJobSidekiq
+  sidekiq_options queue: :third_party_data_imports
 
   def perform
     ids = Location.where(position: nil).has_address.ids
diff --git a/app/jobs/enqueue_patients_aged_out_of_schools_job.rb b/app/jobs/enqueue_patients_aged_out_of_schools_job.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-class EnqueuePatientsAgedOutOfSchoolsJob < ApplicationJobActiveJob
-  queue_as :patients
+class EnqueuePatientsAgedOutOfSchoolsJob < ApplicationJobSidekiq
+  sidekiq_options queue: :patients
 
   def perform
     academic_year = AcademicYear.pending
diff --git a/app/jobs/enqueue_process_unmatched_consent_forms_job.rb b/app/jobs/enqueue_process_unmatched_consent_forms_job.rb
@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
-class EnqueueProcessUnmatchedConsentFormsJob < ApplicationJobActiveJob
+class EnqueueProcessUnmatchedConsentFormsJob < ApplicationJobSidekiq
   include SingleConcurrencyConcern
 
-  queue_as :consents
+  sidekiq_options queue: :consents
 
   def perform
     ConsentForm.unmatched.find_each do |consent_form|
diff --git a/app/jobs/enqueue_school_consent_reminders_job.rb b/app/jobs/enqueue_school_consent_reminders_job.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-class EnqueueSchoolConsentRemindersJob < ApplicationJobActiveJob
-  queue_as :notifications
+class EnqueueSchoolConsentRemindersJob < ApplicationJobSidekiq
+  sidekiq_options queue: :notifications
 
   def perform
     sessions =
diff --git a/app/jobs/enqueue_school_consent_requests_job.rb b/app/jobs/enqueue_school_consent_requests_job.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-class EnqueueSchoolConsentRequestsJob < ApplicationJobActiveJob
-  queue_as :notifications
+class EnqueueSchoolConsentRequestsJob < ApplicationJobSidekiq
+  sidekiq_options queue: :notifications
 
   def perform
     sessions =
diff --git a/app/jobs/enqueue_school_session_reminders_job.rb b/app/jobs/enqueue_school_session_reminders_job.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-class EnqueueSchoolSessionRemindersJob < ApplicationJobActiveJob
-  queue_as :notifications
+class EnqueueSchoolSessionRemindersJob < ApplicationJobSidekiq
+  sidekiq_options queue: :notifications
 
   def perform
     sessions =
diff --git a/app/jobs/enqueue_update_patients_from_pds_job.rb b/app/jobs/enqueue_update_patients_from_pds_job.rb
@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
-class EnqueueUpdatePatientsFromPDSJob < ApplicationJobActiveJob
+class EnqueueUpdatePatientsFromPDSJob < ApplicationJobSidekiq
   include SingleConcurrencyConcern
 
-  queue_as :pds
+  sidekiq_options queue: :pds
 
   def perform
     scope = Patient.not_deceased
diff --git a/app/jobs/enqueue_vaccinations_search_in_nhs_job.rb b/app/jobs/enqueue_vaccinations_search_in_nhs_job.rb
@@ -7,10 +7,10 @@
 # sessions, starting from 2 days before invitations or consent requests are sent
 # out and ending once the last date of the sessions has passed. For all other
 # patients we want to ensure a search is performed every 28 days at most.
-class EnqueueVaccinationsSearchInNHSJob < ApplicationJobActiveJob
-  queue_as :immunisations_api_search
+class EnqueueVaccinationsSearchInNHSJob < ApplicationJobSidekiq
+  sidekiq_options queue: :immunisations_api_search
 
-  def perform(programme_types: nil)
+  def perform(programme_types = nil)
     programme_types ||= Programme.all.map(&:type)
     patient_ids = []
 
diff --git a/app/jobs/invalidate_self_consents_job.rb b/app/jobs/invalidate_self_consents_job.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-class InvalidateSelfConsentsJob < ApplicationJobActiveJob
-  queue_as :consents
+class InvalidateSelfConsentsJob < ApplicationJobSidekiq
+  sidekiq_options queue: :consents
 
   def perform
     programmes = Programme.all
diff --git a/app/jobs/patients_clear_registration_job.rb b/app/jobs/patients_clear_registration_job.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-class PatientsClearRegistrationJob < ApplicationJobActiveJob
-  queue_as :patients
+class PatientsClearRegistrationJob < ApplicationJobSidekiq
+  sidekiq_options queue: :patients
 
   def perform
     academic_year = AcademicYear.pending
diff --git a/app/jobs/patients_refused_consent_already_vaccinated_job.rb b/app/jobs/patients_refused_consent_already_vaccinated_job.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-class PatientsRefusedConsentAlreadyVaccinatedJob < ApplicationJobActiveJob
-  queue_as :patients
+class PatientsRefusedConsentAlreadyVaccinatedJob < ApplicationJobSidekiq
+  sidekiq_options queue: :patients
 
   def perform
     return unless should_perform?
diff --git a/app/jobs/remove_import_csv_job.rb b/app/jobs/remove_import_csv_job.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-class RemoveImportCSVJob < ApplicationJobActiveJob
-  queue_as :imports
+class RemoveImportCSVJob < ApplicationJobSidekiq
+  sidekiq_options queue: :imports
 
   def perform
     [ClassImport, CohortImport, ImmunisationImport].each do |import_type|
diff --git a/app/jobs/reporting_api/refresh_job.rb b/app/jobs/reporting_api/refresh_job.rb
@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-class ReportingAPI::RefreshJob < ApplicationJobActiveJob
-  def perform
-    ReportingAPI::Total.refresh!
-  end
+class ReportingAPI::RefreshJob < ApplicationJobSidekiq
+  def perform = ReportingAPI::Total.refresh!
 end
diff --git a/app/jobs/send_vaccination_confirmations_job.rb b/app/jobs/send_vaccination_confirmations_job.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-class SendVaccinationConfirmationsJob < ApplicationJobActiveJob
-  queue_as :notifications
+class SendVaccinationConfirmationsJob < ApplicationJobSidekiq
+  sidekiq_options queue: :notifications
 
   def perform
     # Find the oldest record that has had a confirmation sent, and send confirmations for all subsequent records
diff --git a/app/jobs/trim_active_record_sessions_job.rb b/app/jobs/trim_active_record_sessions_job.rb
@@ -2,7 +2,7 @@
 
 # Based off https://github.com/rails/activerecord-session_store/blob/9198a952916df925f36ac2beab247296ee5c0341/lib/tasks/database.rake#L14-L20
 
-class TrimActiveRecordSessionsJob < ApplicationJobActiveJob
+class TrimActiveRecordSessionsJob < ApplicationJobSidekiq
   def perform
     ActiveRecord::SessionStore::Session.where(
       "updated_at < ?",
diff --git a/app/lib/team_merger.rb b/app/lib/team_merger.rb
@@ -394,9 +394,7 @@ def migrate_generic_locations(merged_team)
   end
 
   def refresh_materialized_views
-    ReportingAPI::RefreshJob.perform_later
-  rescue StandardError => e
-    Rails.logger.warn "TeamMerge: could not refresh materialized views: #{e.message}"
+    ReportingAPI::RefreshJob.perform_async
   end
 
   def append_migration_counts
diff --git a/spec/features/doubles_vaccination_administered_spec.rb b/spec/features/doubles_vaccination_administered_spec.rb
@@ -128,7 +128,7 @@ def then_i_see_the_patient_is_vaccinated_for_td_ipv
   end
 
   def when_vaccination_confirmations_are_sent
-    SendVaccinationConfirmationsJob.perform_now
+    SendVaccinationConfirmationsJob.new.perform
   end
 
   def then_an_email_is_sent_to_the_parent_confirming_the_vaccinations
diff --git a/spec/features/flu_vaccination_administered_spec.rb b/spec/features/flu_vaccination_administered_spec.rb
@@ -339,7 +339,7 @@ def and_the_vaccination_record_is_synced_to_nhs
   end
 
   def when_vaccination_confirmations_are_sent
-    SendVaccinationConfirmationsJob.perform_now
+    SendVaccinationConfirmationsJob.new.perform
   end
 
   def then_an_email_is_sent_to_the_parent_confirming_the_vaccination
diff --git a/spec/features/hpv_vaccination_administered_spec.rb b/spec/features/hpv_vaccination_administered_spec.rb
@@ -297,7 +297,7 @@ def then_i_see_the_patient
   end
 
   def when_vaccination_confirmations_are_sent
-    SendVaccinationConfirmationsJob.perform_now
+    SendVaccinationConfirmationsJob.new.perform
   end
 
   def then_an_email_is_sent_to_the_parent_confirming_the_vaccination
diff --git a/spec/features/hpv_vaccination_clinic_spec.rb b/spec/features/hpv_vaccination_clinic_spec.rb
@@ -120,7 +120,7 @@ def then_i_see_that_the_status_is_vaccinated
   end
 
   def when_vaccination_confirmations_are_sent
-    SendVaccinationConfirmationsJob.perform_now
+    SendVaccinationConfirmationsJob.new.perform
   end
 
   def then_an_email_is_sent_to_the_parent_confirming_the_vaccination
diff --git a/spec/features/hpv_vaccination_delayed_spec.rb b/spec/features/hpv_vaccination_delayed_spec.rb
@@ -109,7 +109,7 @@ def then_i_see_the_patient_has_no_outcome_yet
   end
 
   def when_vaccination_confirmations_are_sent
-    SendVaccinationConfirmationsJob.perform_now
+    SendVaccinationConfirmationsJob.new.perform
   end
 
   def then_an_email_is_sent_to_the_parent_confirming_the_delay
diff --git a/spec/features/menacwy_vaccination_administered_spec.rb b/spec/features/menacwy_vaccination_administered_spec.rb
@@ -209,7 +209,7 @@ def and_i_see_the_vaccination_details
   end
 
   def when_vaccination_confirmations_are_sent
-    SendVaccinationConfirmationsJob.perform_now
+    SendVaccinationConfirmationsJob.new.perform
   end
 
   def then_an_email_is_sent_to_the_parent_confirming_the_vaccination
diff --git a/spec/features/mmr_vaccination_administered_spec.rb b/spec/features/mmr_vaccination_administered_spec.rb
@@ -297,7 +297,7 @@ def then_i_see_the_right_programme_on_the_entries
   end
 
   def when_vaccination_confirmations_are_sent
-    SendVaccinationConfirmationsJob.perform_now
+    SendVaccinationConfirmationsJob.new.perform
   end
 
   def then_an_email_is_sent_to_the_parent_confirming_the_vaccination
diff --git a/spec/features/mmrv_vaccination_administered_spec.rb b/spec/features/mmrv_vaccination_administered_spec.rb
@@ -260,7 +260,7 @@ def then_i_see_the_right_entries
   end
 
   def when_vaccination_confirmations_are_sent
-    SendVaccinationConfirmationsJob.perform_now
+    SendVaccinationConfirmationsJob.new.perform
   end
 
   def then_an_email_is_sent_to_the_parent_confirming_the_vaccination
diff --git a/spec/features/scheduled_consent_requests_and_reminders_spec.rb b/spec/features/scheduled_consent_requests_and_reminders_spec.rb
@@ -188,7 +188,7 @@ def when_1_more_day_passes
   end
 
   def then_no_consent_requests_have_been_sent
-    EnqueueSchoolConsentRequestsJob.perform_now
+    EnqueueSchoolConsentRequestsJob.new.perform
     perform_enqueued_jobs
     Sidekiq::Job.drain_all
 
@@ -215,7 +215,7 @@ def when_7_more_days_pass
   end
 
   def then_all_four_parents_received_all_programme_consent_requests
-    EnqueueSchoolConsentRequestsJob.perform_now
+    EnqueueSchoolConsentRequestsJob.new.perform
     perform_enqueued_jobs
     Sidekiq::Job.drain_all
 
@@ -264,7 +264,7 @@ def then_all_four_parents_received_all_programme_consent_requests
   end
 
   def then_all_four_parents_received_all_programme_reminders
-    EnqueueSchoolConsentRemindersJob.perform_now
+    EnqueueSchoolConsentRemindersJob.new.perform
     perform_enqueued_jobs
     Sidekiq::Job.drain_all
 
diff --git a/spec/features/session_school_reminder_spec.rb b/spec/features/session_school_reminder_spec.rb
@@ -38,7 +38,7 @@ def and_a_patient_has_given_consent
   end
 
   def when_school_session_reminders_are_sent
-    EnqueueSchoolSessionRemindersJob.perform_now
+    EnqueueSchoolSessionRemindersJob.new.perform
     perform_enqueued_jobs
     Sidekiq::Job.drain_all
   end
diff --git a/spec/features/td_ipv_vaccination_administered_spec.rb b/spec/features/td_ipv_vaccination_administered_spec.rb
@@ -209,7 +209,7 @@ def and_i_see_the_vaccination_details
   end
 
   def when_vaccination_confirmations_are_sent
-    SendVaccinationConfirmationsJob.perform_now
+    SendVaccinationConfirmationsJob.new.perform
   end
 
   def then_an_email_is_sent_to_the_parent_confirming_the_vaccination
diff --git a/spec/features/vaccination_offline_spec.rb b/spec/features/vaccination_offline_spec.rb
@@ -591,7 +591,7 @@ def then_the_clinic_location_is_displayed
   end
 
   def when_vaccination_confirmations_are_sent
-    SendVaccinationConfirmationsJob.perform_now
+    SendVaccinationConfirmationsJob.new.perform
   end
 
   def then_an_email_is_sent_to_the_parent_confirming_the_vaccination
diff --git a/spec/jobs/enqueue_location_position_updater_job_spec.rb b/spec/jobs/enqueue_location_position_updater_job_spec.rb
@@ -1,35 +1,33 @@
 # frozen_string_literal: true
 
 describe EnqueueLocationPositionUpdaterJob do
-  describe "#perform" do
-    subject(:perform_now) { described_class.perform_now }
+  subject(:perform) { described_class.new.perform }
 
-    let!(:location_with_address_no_position) do
-      create(:community_clinic, position: nil)
-    end
+  let!(:location_with_address_no_position) do
+    create(:community_clinic, position: nil)
+  end
 
-    let!(:location_with_position) { create(:community_clinic) }
+  let!(:location_with_position) { create(:community_clinic) }
 
-    let!(:location_without_address) do
-      create(:community_clinic, :without_address)
-    end
+  let!(:location_without_address) do
+    create(:community_clinic, :without_address)
+  end
 
-    it "enqueues jobs for locations with address but no position" do
-      expect { perform_now }.to enqueue_sidekiq_job(
-        LocationPositionUpdaterJob
-      ).with(location_with_address_no_position.id)
-    end
+  it "enqueues jobs for locations with address but no position" do
+    expect { perform }.to enqueue_sidekiq_job(LocationPositionUpdaterJob).with(
+      location_with_address_no_position.id
+    )
+  end
 
-    it "does not enqueue jobs for locations with position" do
-      expect { perform_now }.not_to enqueue_sidekiq_job(
-        LocationPositionUpdaterJob
-      ).with(location_with_position.id)
-    end
+  it "does not enqueue jobs for locations with position" do
+    expect { perform }.not_to enqueue_sidekiq_job(
+      LocationPositionUpdaterJob
+    ).with(location_with_position.id)
+  end
 
-    it "does not enqueue jobs for locations without address" do
-      expect { perform_now }.not_to enqueue_sidekiq_job(
-        LocationPositionUpdaterJob
-      ).with(location_without_address.id)
-    end
+  it "does not enqueue jobs for locations without address" do
+    expect { perform }.not_to enqueue_sidekiq_job(
+      LocationPositionUpdaterJob
+    ).with(location_without_address.id)
   end
 end
diff --git a/spec/jobs/enqueue_patients_aged_out_of_schools_job_spec.rb b/spec/jobs/enqueue_patients_aged_out_of_schools_job_spec.rb
diff --git a/spec/jobs/enqueue_process_unmatched_consent_forms_job_spec.rb b/spec/jobs/enqueue_process_unmatched_consent_forms_job_spec.rb
diff --git a/spec/jobs/enqueue_school_consent_reminders_job_spec.rb b/spec/jobs/enqueue_school_consent_reminders_job_spec.rb
diff --git a/spec/jobs/enqueue_school_consent_requests_job_spec.rb b/spec/jobs/enqueue_school_consent_requests_job_spec.rb
diff --git a/spec/jobs/enqueue_school_session_reminders_job_spec.rb b/spec/jobs/enqueue_school_session_reminders_job_spec.rb
diff --git a/spec/jobs/enqueue_update_patients_from_pds_job_spec.rb b/spec/jobs/enqueue_update_patients_from_pds_job_spec.rb
diff --git a/spec/jobs/enqueue_vaccinations_search_in_nhs_job_spec.rb b/spec/jobs/enqueue_vaccinations_search_in_nhs_job_spec.rb
diff --git a/spec/jobs/invalidate_self_consents_job_spec.rb b/spec/jobs/invalidate_self_consents_job_spec.rb
diff --git a/spec/jobs/patients_refused_consent_already_vaccinated_job_spec.rb b/spec/jobs/patients_refused_consent_already_vaccinated_job_spec.rb
diff --git a/spec/requests/api/testing/refresh_reporting_spec.rb b/spec/requests/api/testing/refresh_reporting_spec.rb
diff --git a/spec/requests/api/testing/vaccinations_search_in_nhs_spec.rb b/spec/requests/api/testing/vaccinations_search_in_nhs_spec.rb
