Allow enqueuer to enqueue multiple jobs with the same instance (#4218)

Author: johha

app/actions/app_delete.rb

@@ -97,7 +97,7 @@ def route_mappings_to_delete(app)
 
     def delete_buildpack_cache(app)
       delete_job = Jobs::V3::BuildpackCacheDelete.new(app.guid)
-      Jobs::Enqueuer.new(delete_job, queue: Jobs::Queues.generic).enqueue
+      Jobs::Enqueuer.new(queue: Jobs::Queues.generic).enqueue(delete_job)
     end
 
     def logger

app/actions/buildpack_delete.rb

@@ -8,7 +8,7 @@ def delete(buildpacks)
         end
         if buildpack.key
           blobstore_delete = Jobs::Runtime::BlobstoreDelete.new(buildpack.key, :buildpack_blobstore)
-          Jobs::Enqueuer.new(blobstore_delete, queue: Jobs::Queues.generic).enqueue
+          Jobs::Enqueuer.new(queue: Jobs::Queues.generic).enqueue(blobstore_delete)
         end
       end
 

app/actions/buildpack_upload.rb

@@ -4,7 +4,7 @@ def upload_async(message:, buildpack:, config:)
       logger.info("uploading buildpacks bits for buildpack #{buildpack.guid}")
 
       upload_job = Jobs::V3::BuildpackBits.new(buildpack.guid, message.bits_path, message.bits_name)
-      Jobs::Enqueuer.new(upload_job, queue: Jobs::Queues.local(config)).enqueue_pollable
+      Jobs::Enqueuer.new(queue: Jobs::Queues.local(config)).enqueue_pollable(upload_job)
     end
 
     private

app/actions/droplet_copy.rb

@@ -60,7 +60,7 @@ def copy_buildpack_droplet(new_droplet)
       new_droplet.buildpack_lifecycle_data(reload: true)
 
       copy_job = Jobs::V3::DropletBitsCopier.new(@source_droplet.guid, new_droplet.guid)
-      Jobs::Enqueuer.new(copy_job, queue: Jobs::Queues.generic).enqueue
+      Jobs::Enqueuer.new(queue: Jobs::Queues.generic).enqueue(copy_job)
     end
   end
 end

app/actions/droplet_delete.rb

@@ -16,7 +16,7 @@ def delete(droplets)
 
         if droplet.blobstore_key
           blobstore_delete = Jobs::Runtime::BlobstoreDelete.new(droplet.blobstore_key, :droplet_blobstore)
-          Jobs::Enqueuer.new(blobstore_delete, queue: Jobs::Queues.generic).enqueue
+          Jobs::Enqueuer.new(queue: Jobs::Queues.generic).enqueue(blobstore_delete)
         end
 
         Repositories::DropletEventRepository.record_delete(

app/actions/droplet_upload.rb

@@ -20,7 +20,7 @@ def upload_async(message:, droplet:, config:, user_audit_info:)
           droplet.space.organization_guid
         )
 
-        enqueued_job = Jobs::Enqueuer.new(upload_job, queue: Jobs::Queues.local(config)).enqueue_pollable
+        enqueued_job = Jobs::Enqueuer.new(queue: Jobs::Queues.local(config)).enqueue_pollable(upload_job)
       end
 
       enqueued_job

app/actions/mixins/bindings_delete.rb

@@ -19,7 +19,7 @@ def delete_bindings(bindings, user_audit_info:)
           result = binding_delete_action.delete(binding)
           unless result[:finished]
             polling_job = DeleteBindingJob.new(type, binding.guid, user_audit_info:)
-            Jobs::Enqueuer.new(polling_job, queue: Jobs::Queues.generic).enqueue_pollable
+            Jobs::Enqueuer.new(queue: Jobs::Queues.generic).enqueue_pollable(polling_job)
             unbinding_operation_in_progress!(binding)
           end
         rescue StandardError => e

app/actions/package_copy.rb

@@ -20,12 +20,7 @@ def copy(destination_app_guid:, source_package:, user_audit_info:, record_event:
       package.db.transaction do
         package.save
 
-        if source_package.type == 'bits'
-          @enqueued_job = Jobs::Enqueuer.new(
-            Jobs::V3::PackageBitsCopier.new(source_package.guid, package.guid),
-            queue: Jobs::Queues.generic
-          ).enqueue
-        end
+        @enqueued_job = Jobs::Enqueuer.new(queue: Jobs::Queues.generic).enqueue(Jobs::V3::PackageBitsCopier.new(source_package.guid, package.guid)) if source_package.type == 'bits'
 
         record_audit_event(package, source_package, user_audit_info) if record_event
       end

app/actions/package_delete.rb

@@ -10,7 +10,7 @@ def delete(packages)
       packages.each do |package|
         unless package.docker?
           package_src_delete_job = create_package_source_deletion_job(package)
-          Jobs::Enqueuer.new(package_src_delete_job, queue: Jobs::Queues.generic).enqueue if package_src_delete_job
+          Jobs::Enqueuer.new(queue: Jobs::Queues.generic).enqueue(package_src_delete_job) if package_src_delete_job
         end
 
         package.destroy

app/actions/package_upload.rb

@@ -14,7 +14,7 @@ def upload_async(message:, package:, config:, user_audit_info:, record_event: tr
         package.state = PackageModel::PENDING_STATE
         package.save
 
-        enqueued_job = Jobs::Enqueuer.new(upload_job, queue: Jobs::Queues.local(config)).enqueue
+        enqueued_job = Jobs::Enqueuer.new(queue: Jobs::Queues.local(config)).enqueue(upload_job)
 
         record_upload(package, user_audit_info) if record_event
       end