Extract Job::Schedulable concern from Job::Executable

Author: rosa

app/models/solid_queue/job/executable.rb

@@ -6,14 +6,12 @@ module Executable
       extend ActiveSupport::Concern
 
       included do
-        include Clearable, ConcurrencyControls
+        include Clearable, ConcurrencyControls, Schedulable
 
         has_one :ready_execution, dependent: :destroy
         has_one :claimed_execution, dependent: :destroy
         has_one :failed_execution, dependent: :destroy
 
-        has_one :scheduled_execution, dependent: :destroy
-
         after_create :prepare_for_execution
 
         scope :finished, -> { where.not(finished_at: nil) }
@@ -35,20 +33,11 @@ def dispatch_all(jobs)
           successfully_dispatched(jobs)
         end
 
-        def schedule_all(jobs)
-          schedule_all_at_once(jobs)
-          successfully_scheduled(jobs)
-        end
-
         private
           def dispatch_all_at_once(jobs)
             ReadyExecution.create_all_from_jobs jobs
           end
 
-          def schedule_all_at_once(jobs)
-            ScheduledExecution.create_all_from_jobs(jobs)
-          end
-
           def dispatch_all_one_by_one(jobs)
             jobs.each(&:dispatch)
           end
@@ -64,13 +53,9 @@ def dispatched_and_ready(jobs)
           def dispatched_and_blocked(jobs)
             where(id: BlockedExecution.where(job_id: jobs.map(&:id)).pluck(:job_id))
           end
-
-          def successfully_scheduled(jobs)
-            where(id: ScheduledExecution.where(job_id: jobs.map(&:id)).pluck(:job_id))
-          end
       end
 
-      %w[ ready claimed failed scheduled ].each do |status|
+      %w[ ready claimed failed ].each do |status|
         define_method("#{status}?") { public_send("#{status}_execution").present? }
       end
 
@@ -117,10 +102,6 @@ def failed_with(exception)
       end
 
       private
-        def schedule
-          ScheduledExecution.create_or_find_by!(job_id: id)
-        end
-
         def ready
           ReadyExecution.create_or_find_by!(job_id: id)
         end

app/models/solid_queue/job/schedulable.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+module SolidQueue
+  class Job
+    module Schedulable
+      extend ActiveSupport::Concern
+
+      included do
+        has_one :scheduled_execution, dependent: :destroy
+
+        scope :scheduled, -> { where.not(finished_at: nil) }
+      end
+
+      class_methods do
+        def schedule_all(jobs)
+          schedule_all_at_once(jobs)
+          successfully_scheduled(jobs)
+        end
+
+        private
+          def schedule_all_at_once(jobs)
+            ScheduledExecution.create_all_from_jobs(jobs)
+          end
+
+          def successfully_scheduled(jobs)
+            where(id: ScheduledExecution.where(job_id: jobs.map(&:id)).pluck(:job_id))
+          end
+      end
+
+      def due?
+        scheduled_at.nil? || scheduled_at <= Time.current
+      end
+
+      private
+        def schedule
+          ScheduledExecution.create_or_find_by!(job_id: id)
+        end
+    end
+  end
+end