Allow running scheduled jobs immediately

This simply schedules the jobs to be run now.

Author: rosa

app/controllers/mission_control/jobs/discards_controller.rb

@@ -8,7 +8,7 @@ def create
 
   private
     def jobs_relation
-      ActiveJob.jobs.failed
+      ActiveJob.jobs
     end
 
     def redirect_location

app/controllers/mission_control/jobs/dispatches_controller.rb

@@ -3,11 +3,16 @@ class MissionControl::Jobs::DispatchesController < MissionControl::Jobs::Applica
 
   def create
     @job.dispatch
-    redirect_to application_jobs_url(@application, :blocked), notice: "Dispatched job with id #{@job.job_id}"
+    redirect_to redirect_location
   end
 
   private
-  def jobs_relation
-    ApplicationJob.jobs.blocked
-  end
+    def jobs_relation
+      ActiveJob.jobs
+    end
+
+    def redirect_location
+      status = @job.status.presence_in(supported_job_statuses) || :blocked
+      application_jobs_url(@application, status)
+    end
 end

app/views/mission_control/jobs/jobs/blocked/_actions.html.erb

@@ -1,3 +1,3 @@
 <div class="buttons is-right">
-  <%= button_to "Dispatch", application_job_dispatch_path(@application, job.job_id), class: "button is-warning is-light mr-0" %>
+  <%= button_to "Run now", application_job_dispatch_path(@application, job.job_id), class: "button is-warning is-light mr-0" %>
 </div>

app/views/mission_control/jobs/jobs/scheduled/_actions.html.erb

@@ -1,4 +1,5 @@
 <div class="buttons is-right">
+  <%= button_to "Run now", application_job_dispatch_path(@application, job.job_id), class: "button is-warning is-light mr-0" %>
   <%= button_to "Discard", application_job_discard_path(@application, job.job_id), class: "button is-danger is-light mr-0",
     form: { data: { turbo_confirm: "This will delete the job and can't be undone. Are you sure?" } } %>
 </div>

lib/active_job/executing.rb

@@ -25,7 +25,7 @@ def discard
   end
 
   def dispatch
-    ActiveJob.jobs.blocked.dispatch_job(self)
+    ActiveJob.jobs.dispatch_job(self)
   end
 
   private

lib/active_job/jobs_relation.rb

@@ -154,7 +154,12 @@ def discard_job(job)
   end
 
   # Dispatch the provided job.
+  #
+  # This operation is only valid for blocked or scheduled jobs. It will
+  # raise an error +ActiveJob::Errors::InvalidOperation+ otherwise.
   def dispatch_job(job)
+    raise ActiveJob::Errors::InvalidOperation, "This operation can only be performed on blocked or scheduled jobs, but this job is #{job.status}" unless job.blocked? || job.scheduled?
+
     queue_adapter.dispatch_job(job, self)
   end
 

lib/active_job/queue_adapters/solid_queue_ext.rb

@@ -123,9 +123,13 @@ def execution_error_from_solid_queue_job(solid_queue_job)
     end
 
     def dispatch_immediately(job)
-      SolidQueue::Job.transaction do
-        job.dispatch_bypassing_concurrency_limits
-        job.blocked_execution.destroy!
+      if job.blocked?
+        SolidQueue::Job.transaction do
+          job.dispatch_bypassing_concurrency_limits
+          job.blocked_execution.destroy!
+        end
+      else
+        job.scheduled_execution.update!(scheduled_at: Time.now)
       end
     end
 

test/dummy/db/seeds.rb

@@ -10,7 +10,7 @@ def clean_database
 end
 
 class JobsLoader
-  attr_reader :application, :server, :failed_jobs_count, :pending_jobs_count, :finished_jobs_count, :blocked_jobs_count
+  attr_reader :application, :server, :failed_jobs_count, :pending_jobs_count, :finished_jobs_count, :blocked_jobs_count, :scheduled_jobs_count
 
   def initialize(application, server, failed_jobs_count: 100, pending_jobs_count: 50)
     @application = application
@@ -19,6 +19,7 @@ def initialize(application, server, failed_jobs_count: 100, pending_jobs_count:
     @pending_jobs_count = randomize(pending_jobs_count)
     @finished_jobs_count = randomize(pending_jobs_count)
     @blocked_jobs_count = randomize(pending_jobs_count)
+    @scheduled_jobs_count = randomize(pending_jobs_count)
   end
 
   def load
@@ -27,6 +28,7 @@ def load
       load_failed_jobs
       load_pending_jobs
       load_blocked_jobs
+      load_scheduled_jobs
       load_recurring_tasks
     end
   end
@@ -64,6 +66,15 @@ def load_blocked_jobs
       end
     end
 
+    def load_scheduled_jobs
+      return unless supported_status?(:scheduled)
+
+      puts "Generating #{scheduled_jobs_count} scheduled jobs for #{application} - #{server}..."
+      scheduled_jobs_count.times do |index|
+        DummyJob.set(wait: randomize(60).minutes).perform_later(index)
+      end
+    end
+
     def load_recurring_tasks
       return unless server.queue_adapter.supports_recurring_tasks?