♻️ Favor configuration over hard-coding

jeremyf · jeremyf · commit 2b23eb671fad · 2024-02-14T10:13:00.000-05:00
Given that Hyrax provides a mechanism for specifying a queue name, we
should echo that configuration, but also provide our own configuration
as well as the same fallback.
diff --git a/app/jobs/bulkrax/create_relationships_job.rb b/app/jobs/bulkrax/create_relationships_job.rb
@@ -40,7 +40,7 @@ class CreateRelationshipsJob < ApplicationJob
 
     include DynamicRecordLookup
 
-    queue_as :import
+    queue_as Bulkrax.config.ingest_queue_name
 
     # @param parent_identifier [String] Work/Collection ID or Bulkrax::Entry source_identifiers
     # @param importer_run [Bulkrax::ImporterRun] current importer run (needed to properly update counters)
diff --git a/app/jobs/bulkrax/delete_job.rb b/app/jobs/bulkrax/delete_job.rb
@@ -2,7 +2,7 @@
 
 module Bulkrax
   class DeleteJob < ApplicationJob
-    queue_as :import
+    queue_as Bulkrax.config.ingest_queue_name
 
     # rubocop:disable Rails/SkipsModelValidations
     def perform(entry, importer_run)
diff --git a/app/jobs/bulkrax/download_cloud_file_job.rb b/app/jobs/bulkrax/download_cloud_file_job.rb
@@ -2,7 +2,7 @@
 
 module Bulkrax
   class DownloadCloudFileJob < ApplicationJob
-    queue_as :import
+    queue_as Bulkrax.config.ingest_queue_name
 
     # Retrieve cloud file and write to the imports directory
     # Note: if using the file system, the mounted directory in
diff --git a/app/jobs/bulkrax/import_collection_job.rb b/app/jobs/bulkrax/import_collection_job.rb
@@ -2,7 +2,7 @@
 
 module Bulkrax
   class ImportCollectionJob < ApplicationJob
-    queue_as :import
+    queue_as Bulkrax.config.ingest_queue_name
 
     # rubocop:disable Rails/SkipsModelValidations
     def perform(*args)
diff --git a/app/jobs/bulkrax/import_file_set_job.rb b/app/jobs/bulkrax/import_file_set_job.rb
@@ -6,7 +6,7 @@ class MissingParentError < ::StandardError; end
   class ImportFileSetJob < ApplicationJob
     include DynamicRecordLookup
 
-    queue_as :import
+    queue_as Bulkrax.config.ingest_queue_name
 
     attr_reader :importer_run_id
 
diff --git a/app/jobs/bulkrax/import_work_job.rb b/app/jobs/bulkrax/import_work_job.rb
@@ -2,7 +2,7 @@
 
 module Bulkrax
   class ImportWorkJob < ApplicationJob
-    queue_as :import
+    queue_as Bulkrax.config.ingest_queue_name
 
     # rubocop:disable Rails/SkipsModelValidations
     #
diff --git a/app/jobs/bulkrax/importer_job.rb b/app/jobs/bulkrax/importer_job.rb
@@ -2,7 +2,7 @@
 
 module Bulkrax
   class ImporterJob < ApplicationJob
-    queue_as :import
+    queue_as Bulkrax.config.ingest_queue_name
 
     def perform(importer_id, only_updates_since_last_import = false)
       importer = Importer.find(importer_id)
diff --git a/lib/bulkrax.rb b/lib/bulkrax.rb

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`
`3`	`3`	`module Bulkrax`
`4`	`4`	`class ImportWorkJob < ApplicationJob`
`5`		`- queue_as :import`
	`5`	`+ queue_as Bulkrax.config.ingest_queue_name`
`6`	`6`
`7`	`7`	`# rubocop:disable Rails/SkipsModelValidations`
`8`	`8`	`#`