From 9920f802034270483daae4506871018316c31862 Mon Sep 17 00:00:00 2001
From: JonathanHallam <jonathan.hallam@digital.cabinet-office.gov.uk>
Date: Thu, 26 Sep 2024 14:47:28 +0100
Subject: [PATCH] Make CheckWorker CheckJob

Sidekiq workers are no longer supported
---
 app/controllers/batch_controller.rb                      | 2 +-
 app/controllers/check_controller.rb                      | 2 +-
 app/workers/{check_worker.rb => check_job.rb}            | 4 ++--
 app/workers/cleanup_worker.rb                            | 2 +-
 spec/requests/batch_spec.rb                              | 2 +-
 spec/workers/{check_worker_spec.rb => check_job_spec.rb} | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)
 rename app/workers/{check_worker.rb => check_job.rb} (97%)
 rename spec/workers/{check_worker_spec.rb => check_job_spec.rb} (98%)

diff --git a/app/controllers/batch_controller.rb b/app/controllers/batch_controller.rb
index d51b76b8..cb8e9c12 100644
--- a/app/controllers/batch_controller.rb
+++ b/app/controllers/batch_controller.rb
@@ -48,7 +48,7 @@ def create
       render(json: batch_report(batch), status: :created)
     else
       batch.checks.each do |check|
-        CheckWorker.run(check.id, priority: create_params.priority)
+        CheckJob.run(check.id, priority: create_params.priority)
       end
 
       render(json: batch_report(batch.reload), status: :accepted)
diff --git a/app/controllers/check_controller.rb b/app/controllers/check_controller.rb
index 3ff16bfe..00fac8ee 100644
--- a/app/controllers/check_controller.rb
+++ b/app/controllers/check_controller.rb
@@ -36,7 +36,7 @@ def check
 
     check = Check.create!(link:)
 
-    CheckWorker.run(
+    CheckJob.run(
       check.id,
       priority: check_params.priority,
       synchronous: check_params.synchronous,
diff --git a/app/workers/check_worker.rb b/app/workers/check_job.rb
similarity index 97%
rename from app/workers/check_worker.rb
rename to app/workers/check_job.rb
index 6c1ceeb3..9fbf8e53 100644
--- a/app/workers/check_worker.rb
+++ b/app/workers/check_job.rb
@@ -1,5 +1,5 @@
-class CheckWorker
-  include Sidekiq::Worker
+class CheckJob
+  include Sidekiq::Job
   include PerformAsyncInQueue
 
   sidekiq_options retry: 3, lock: :until_and_while_executing, lock_args_method: :unique_args
diff --git a/app/workers/cleanup_worker.rb b/app/workers/cleanup_worker.rb
index 3f5d18ec..9846d340 100644
--- a/app/workers/cleanup_worker.rb
+++ b/app/workers/cleanup_worker.rb
@@ -5,7 +5,7 @@ class CleanupWorker
 
   def perform
     checks_to_perform.each do |check_id|
-      CheckWorker.perform_async(check_id)
+      CheckJob.perform_async(check_id)
     end
 
     old_batches.delete_all
diff --git a/spec/requests/batch_spec.rb b/spec/requests/batch_spec.rb
index 26f1d83f..b6f78d02 100644
--- a/spec/requests/batch_spec.rb
+++ b/spec/requests/batch_spec.rb
@@ -40,7 +40,7 @@
       include_examples "returns batch report"
 
       it "creates a job" do
-        expect(CheckWorker.jobs.size).to eq(2)
+        expect(CheckJob.jobs.size).to eq(2)
       end
     end
 
diff --git a/spec/workers/check_worker_spec.rb b/spec/workers/check_job_spec.rb
similarity index 98%
rename from spec/workers/check_worker_spec.rb
rename to spec/workers/check_job_spec.rb
index e5ae7135..89a4d2a8 100644
--- a/spec/workers/check_worker_spec.rb
+++ b/spec/workers/check_job_spec.rb
@@ -1,6 +1,6 @@
 require "rails_helper"
 
-RSpec.describe CheckWorker do
+RSpec.describe CheckJob do
   specify { expect(described_class).to have_valid_sidekiq_options }
 
   describe "perform" do