good_job 2.4.0 → 2.6.0

data/engine/app/controllers/good_job/assets_controller.rb

@@ -23,6 +23,10 @@ module GoodJob
       render file: GoodJob::Engine.root.join("app", "assets", "vendor", "chartist", "chartist.js")
     end
 
+    def rails_ujs_js
+      render file: GoodJob::Engine.root.join("app", "assets", "vendor", "rails_ujs.js")
+    end
+
     def style_css
       render file: GoodJob::Engine.root.join("app", "assets", "style.css")
     end

data/engine/app/controllers/good_job/base_controller.rb

@@ -2,5 +2,13 @@
 module GoodJob
   class BaseController < ActionController::Base # rubocop:disable Rails/ApplicationController
     protect_from_forgery with: :exception
+
+    around_action :switch_locale
+
+    private
+
+    def switch_locale(&action)
+      I18n.with_locale(:en, &action)
+    end
   end
 end

data/engine/app/controllers/good_job/cron_entries_controller.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+module GoodJob
+  class CronEntriesController < GoodJob::BaseController
+    def index
+      @cron_entries = CronEntry.all
+    end
+
+    def show
+      @cron_entry = CronEntry.find(params[:id])
+      @jobs_filter = JobsFilter.new(params, @cron_entry.jobs)
+    end
+
+    def enqueue
+      @cron_entry = CronEntry.find(params[:id])
+      @cron_entry.enqueue(Time.current)
+      redirect_back(fallback_location: cron_entries_path, notice: "Cron entry has been enqueued.")
+    end
+  end
+end

data/engine/app/controllers/good_job/jobs_controller.rb

@@ -1,6 +1,10 @@
 # frozen_string_literal: true
 module GoodJob
   class JobsController < GoodJob::BaseController
+    rescue_from GoodJob::ActiveJobJob::AdapterNotGoodJobError,
+                GoodJob::ActiveJobJob::ActionForStateMismatchError,
+                with: :redirect_on_error
+
     def index
       @filter = JobsFilter.new(params)
     end
@@ -10,5 +14,37 @@ module GoodJob
                                       .order(Arel.sql("COALESCE(scheduled_at, created_at) DESC"))
       redirect_to root_path, alert: "Executions for Active Job #{params[:id]} not found" if @executions.empty?
     end
+
+    def discard
+      @job = ActiveJobJob.find(params[:id])
+      @job.discard_job("Discarded through dashboard")
+      redirect_back(fallback_location: jobs_path, notice: "Job has been discarded")
+    end
+
+    def reschedule
+      @job = ActiveJobJob.find(params[:id])
+      @job.reschedule_job
+      redirect_back(fallback_location: jobs_path, notice: "Job has been rescheduled")
+    end
+
+    def retry
+      @job = ActiveJobJob.find(params[:id])
+      @job.retry_job
+      redirect_back(fallback_location: jobs_path, notice: "Job has been retried")
+    end
+
+    private
+
+    def redirect_on_error(exception)
+      alert = case exception
+              when GoodJob::ActiveJobJob::AdapterNotGoodJobError
+                "ActiveJob Queue Adapter must be GoodJob."
+              when GoodJob::ActiveJobJob::ActionForStateMismatchError
+                "Job is not in an appropriate state for this action."
+              else
+                exception.to_s
+              end
+      redirect_back(fallback_location: jobs_path, alert: alert)
+    end
   end
 end

data/engine/app/filters/good_job/base_filter.rb

@@ -1,10 +1,13 @@
 # frozen_string_literal: true
 module GoodJob
   class BaseFilter
-    attr_accessor :params
+    DEFAULT_LIMIT = 25
 
-    def initialize(params)
+    attr_accessor :params, :base_query
+
+    def initialize(params, base_query = nil)
       @params = params
+      @base_query = base_query || default_base_query
     end
 
     def records
@@ -13,7 +16,7 @@ module GoodJob
       filtered_query.display_all(
         after_scheduled_at: after_scheduled_at,
         after_id: params[:after_id]
-      ).limit(params.fetch(:limit, 25))
+      ).limit(params.fetch(:limit, DEFAULT_LIMIT))
     end
 
     def last
@@ -22,13 +25,13 @@ module GoodJob
 
     def job_classes
       base_query.group("serialized_params->>'job_class'").count
-                .sort_by { |name, _count| name }
+                .sort_by { |name, _count| name.to_s }
                 .to_h
     end
 
     def queues
       base_query.group(:queue_name).count
-                .sort_by { |name, _count| name }
+                .sort_by { |name, _count| name.to_s }
                 .to_h
     end
 
@@ -38,8 +41,10 @@ module GoodJob
 
     def to_params(override)
       {
-        state: params[:state],
         job_class: params[:job_class],
+        limit: params[:limit],
+        queue_name: params[:queue_name],
+        state: params[:state],
       }.merge(override).delete_if { |_, v| v.nil? }
     end
 
@@ -90,7 +95,7 @@ module GoodJob
 
     private
 
-    def base_query
+    def default_base_query
       raise NotImplementedError
     end
 

data/engine/app/filters/good_job/executions_filter.rb

@@ -12,7 +12,7 @@ module GoodJob
 
     private
 
-    def base_query
+    def default_base_query
       GoodJob::Execution.all
     end
 

data/engine/app/filters/good_job/jobs_filter.rb

@@ -14,12 +14,14 @@ module GoodJob
 
     private
 
-    def base_query
+    def default_base_query
       GoodJob::ActiveJobJob.all
     end
 
     def filtered_query
-      query = base_query
+      query = base_query.includes(:executions)
+                        .joins_advisory_locks.select('good_jobs.*', 'pg_locks.locktype AS locktype')
+
       query = query.job_class(params[:job_class]) if params[:job_class]
       query = query.where(queue_name: params[:queue_name]) if params[:queue_name]
 

data/engine/app/views/good_job/cron_entries/index.html.erb

@@ -0,0 +1,51 @@
+<% if @cron_entries.present? %>
+  <div class="card my-3">
+    <div class="table-responsive">
+      <table class="table card-table table-bordered table-hover table-sm mb-0">
+        <thead>
+          <th>Key</th>
+          <th>Schedule</th>
+          <th>
+            Properties
+            <%= tag.button "Toggle", type: "button", class: "btn btn-sm btn-outline-primary", role: "button",
+                           data: { bs_toggle: "collapse", bs_target: ".cron-entry-properties" },
+                           aria: { expanded: false, controls: @cron_entries.map { |cron_entry| "##{dom_id(cron_entry, 'properties')}" }.join(" ") }
+            %>
+          </th>
+          <th>Description</th>
+          <th>Next scheduled</th>
+          <th>Last run</th>
+          <th>Actions</th>
+        </thead>
+        <tbody>
+          <% @cron_entries.each do |cron_entry| %>
+            <tr id="<%= dom_id(cron_entry) %>">
+              <td class="font-monospace"><%= cron_entry.key %></td>
+              <td class="font-monospace"><%= cron_entry.schedule %></td>
+              <td>
+                <%= tag.button("Preview", type: "button", class: "btn btn-sm btn-outline-primary", role: "button",
+                        data: { bs_toggle: "collapse", bs_target: "##{dom_id(cron_entry, 'properties')}" },
+                        aria: { expanded: false, controls: dom_id(cron_entry, 'properties') }) %>
+                <%= tag.pre(JSON.pretty_generate(cron_entry.display_properties), id: dom_id(cron_entry, 'properties'), class: "collapse cron-entry-properties") %>
+              </td>
+              <td><%= cron_entry.description %></td>
+              <td><%= cron_entry.next_at %></td>
+              <td>
+                <% if cron_entry.last_job.present? %>
+                  <%= link_to cron_entry.last_at, cron_entry_path(cron_entry), title: "Job #{cron_entry.last_job.id}" %>
+                <% end %>
+              </td>
+              <td>
+                <%= button_to enqueue_cron_entry_path(cron_entry.id), method: :post, class: "btn btn-sm btn-outline-primary", form_class: "d-inline-block", aria: { label: "Run cron entry now" }, title: "Run cron entry now", data: { confirm: "Confirm run cron entry now" } do %>
+                  <%= render "good_job/shared/icons/play" %>
+                <% end %>
+              </td>
+            </tr>
+          <% end %>
+        </tbody>
+      </table>
+    </div>
+  </div>
+<% else %>
+  <em>No cron schedules present.</em>
+<% end %>

data/engine/app/views/good_job/cron_entries/show.html.erb

@@ -0,0 +1,4 @@
+<h1 class="mb-3">Cron Entry Key: <code><%= @cron_entry.id %></code></h1>
+
+<%= render 'good_job/shared/filter', filter: @jobs_filter %>
+<%= render 'good_job/jobs/table', jobs: @jobs_filter.records %>

data/engine/app/views/good_job/{shared/_executions_table.erb → executions/_table.erb}

@@ -44,7 +44,7 @@
               <%= tag.pre JSON.pretty_generate(execution.serialized_params), id: dom_id(execution, "params"), class: "collapse job-params" %>
             </td>
             <td>
-              <%= button_to execution_path(execution.id), method: :delete, class: "btn btn-sm btn-outline-danger", title: "Delete execution" do %>
+              <%= button_to execution_path(execution.id), method: :delete, class: "btn btn-sm btn-outline-danger", title: "Delete execution", data: { confirm: "Confirm delete" } do %>
                 <%= render "good_job/shared/icons/trash" %>
               <% end %>
             </td>

data/engine/app/views/good_job/executions/index.html.erb

@@ -5,7 +5,7 @@
 <%= render 'good_job/shared/filter', filter: @filter %>
 
 <% if @filter.records.present? %>
-  <%= render 'good_job/shared/executions_table', executions: @filter.records %>
+  <%= render 'good_job/executions/table', executions: @filter.records %>
 
   <nav aria-label="Job pagination" class="mt-3">
     <ul class="pagination">

data/engine/app/views/good_job/{shared/_jobs_table.erb → jobs/_table.erb}

@@ -43,11 +43,23 @@
               %>
               <%= tag.pre JSON.pretty_generate(job.serialized_params), id: dom_id(job, "params"), class: "collapse job-params" %>
             </td>
-<!--            <td>-->
-              <%#= button_to execution_path(execution.id), method: :delete, class: "btn btn-sm btn-outline-danger", title: "Delete execution" do %>
-                <%#= render "good_job/shared/icons/trash" %>
-              <%# end %>
-<!--            </td>-->
+            <td>
+              <div class="text-nowrap">
+                <% job_reschedulable = job.status.in? [:scheduled, :retried, :queued] %>
+                <%= button_to reschedule_job_path(job.id), method: :put, class: "btn btn-sm #{job_reschedulable ? 'btn-outline-primary' : 'btn-outline-secondary'}", form_class: "d-inline-block", disabled: !job_reschedulable, aria: { label: "Reschedule job" }, title: "Reschedule job", data: { confirm: "Confirm reschedule" } do %>
+                  <%= render "good_job/shared/icons/skip_forward" %>
+                <% end %>
+
+                <% job_discardable = job.status.in? [:scheduled, :retried, :queued] %>
+                <%= button_to discard_job_path(job.id), method: :put, class: "btn btn-sm #{job_discardable ? 'btn-outline-primary' : 'btn-outline-secondary'}", form_class: "d-inline-block", disabled: !job_discardable, aria: { label: "Discard job" }, title: "Discard job", data: { confirm: "Confirm discard" } do %>
+                  <%= render "good_job/shared/icons/stop" %>
+                <% end %>
+
+                <%= button_to retry_job_path(job.id), method: :put, class: "btn btn-sm #{job.status == :discarded ? 'btn-outline-primary' : 'btn-outline-secondary'}", form_class: "d-inline-block", disabled: job.status != :discarded, aria: { label: "Retry job" }, title: "Retry job", data: { confirm: "Confirm retry" } do %>
+                  <%= render "good_job/shared/icons/arrow_clockwise" %>
+                <% end %>
+              </div>
+            </td>
           </tr>
         <% end %>
       </tbody>

data/engine/app/views/good_job/jobs/index.html.erb

@@ -4,4 +4,17 @@
 
 <%= render 'good_job/shared/filter', filter: @filter %>
 
-<%= render 'good_job/shared/jobs_table', jobs: @filter.records %>
+<% if @filter.records.present? %>
+  <%= render 'good_job/jobs/table', jobs: @filter.records %>
+  <nav aria-label="Job pagination" class="mt-3">
+    <ul class="pagination">
+      <li class="page-item">
+        <%= link_to(@filter.to_params(after_scheduled_at: (@filter.last.scheduled_at || @filter.last.created_at), after_id: @filter.last.id), class: "page-link") do %>
+          Older jobs <span aria-hidden="true">&raquo;</span>
+        <% end %>
+      </li>
+    </ul>
+  </nav>
+<% else %>
+  <em>No jobs present.</em>
+<% end %>

data/engine/app/views/good_job/jobs/show.html.erb

@@ -1,3 +1,3 @@
-<h1>ActiveJob ID: <code><%= @executions.first.id %></code></h1>
+<h1 class="mb-3">ActiveJob ID: <code><%= @executions.first.id %></code></h1>
 
-<%= render 'good_job/shared/executions_table', executions: @executions %>
+<%= render 'good_job/executions/table', executions: @executions %>

data/engine/app/views/good_job/shared/_filter.erb

@@ -1,16 +1,15 @@
 <div class='card mb-2'>
   <div class='card-body d-flex flex-wrap'>
-
     <div class='me-4'>
       <small>Filter by job class</small>
       <br>
-      <% @filter.job_classes.each do |name, count| %>
+      <% filter.job_classes.each do |name, count| %>
         <% if params[:job_class] == name %>
-          <%= link_to(@filter.to_params(job_class: nil), class: 'btn btn-sm btn-outline-secondary active', role: "button", "aria-pressed": true)  do %>
+          <%= link_to(filter.to_params(job_class: nil), class: 'btn btn-sm btn-outline-secondary active', role: "button", "aria-pressed": true)  do %>
             <%= name %> (<%= count %>)
           <% end %>
         <% else %>
-          <%= link_to(@filter.to_params(job_class: name), class: 'btn btn-sm btn-outline-secondary', role: "button") do %>
+          <%= link_to(filter.to_params(job_class: name), class: 'btn btn-sm btn-outline-secondary', role: "button") do %>
             <%= name %> (<%= count %>)
           <% end %>
         <% end %>
@@ -20,13 +19,13 @@
     <div class='me-4'>
       <small>Filter by state</small>
       <br>
-      <% @filter.states.each do |name, count| %>
+      <% filter.states.each do |name, count| %>
         <% if params[:state] == name %>
-          <%= link_to(@filter.to_params(state: nil), class: 'btn btn-sm btn-outline-secondary active', role: "button", "aria-pressed": true)  do %>
+          <%= link_to(filter.to_params(state: nil), class: 'btn btn-sm btn-outline-secondary active', role: "button", "aria-pressed": true)  do %>
             <%= name %> (<%= count %>)
           <% end %>
         <% else %>
-          <%= link_to(@filter.to_params(state: name), class: 'btn btn-sm btn-outline-secondary', role: "button") do %>
+          <%= link_to(filter.to_params(state: name), class: 'btn btn-sm btn-outline-secondary', role: "button") do %>
             <%= name %> (<%= count %>)
           <% end %>
         <% end %>
@@ -36,13 +35,13 @@
     <div>
       <small>Filter by queue</small>
       <br>
-      <% @filter.queues.each do |name, count| %>
+      <% filter.queues.each do |name, count| %>
         <% if params[:queue_name] == name %>
-          <%= link_to(@filter.to_params(queue_name: nil), class: 'btn btn-sm btn-outline-secondary active', role: "button", "aria-pressed": true)  do %>
+          <%= link_to(filter.to_params(queue_name: nil), class: 'btn btn-sm btn-outline-secondary active', role: "button", "aria-pressed": true)  do %>
             <%= name %> (<%= count %>)
           <% end %>
         <% else %>
-          <%= link_to(@filter.to_params(queue_name: name), class: 'btn btn-sm btn-outline-secondary', role: "button") do %>
+          <%= link_to(filter.to_params(queue_name: name), class: 'btn btn-sm btn-outline-secondary', role: "button") do %>
             <%= name %> (<%= count %>)
           <% end %>
         <% end %>

data/engine/app/views/good_job/shared/icons/_arrow_clockwise.html.erb

@@ -0,0 +1,5 @@
+<!-- https://icons.getbootstrap.com/icons/arrow-clockwise/ -->
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-arrow-clockwise" viewBox="0 0 16 16">
+  <path fill-rule="evenodd" d="M8 3a5 5 0 1 0 4.546 2.914.5.5 0 0 1 .908-.417A6 6 0 1 1 8 2v1z" />
+  <path d="M8 4.466V.534a.25.25 0 0 1 .41-.192l2.36 1.966c.12.1.12.284 0 .384L8.41 4.658A.25.25 0 0 1 8 4.466z" />
+</svg>

data/engine/app/views/good_job/shared/icons/_play.html.erb

@@ -0,0 +1,4 @@
+<!-- https://icons.getbootstrap.com/icons/play/ -->
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-play" viewBox="0 0 16 16">
+  <path d="M10.804 8 5 4.633v6.734L10.804 8zm.792-.696a.802.802 0 0 1 0 1.392l-6.363 3.692C4.713 12.69 4 12.345 4 11.692V4.308c0-.653.713-.998 1.233-.696l6.363 3.692z" />
+</svg>

data/engine/app/views/good_job/shared/icons/_skip_forward.html.erb

@@ -0,0 +1,4 @@
+<!-- https://icons.getbootstrap.com/icons/skip-forward/ -->
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-skip-forward" viewBox="0 0 16 16">
+  <path d="M15.5 3.5a.5.5 0 0 1 .5.5v8a.5.5 0 0 1-1 0V8.752l-6.267 3.636c-.52.302-1.233-.043-1.233-.696v-2.94l-6.267 3.636C.713 12.69 0 12.345 0 11.692V4.308c0-.653.713-.998 1.233-.696L7.5 7.248v-2.94c0-.653.713-.998 1.233-.696L15 7.248V4a.5.5 0 0 1 .5-.5zM1 4.633v6.734L6.804 8 1 4.633zm7.5 0v6.734L14.304 8 8.5 4.633z" />
+</svg>

data/engine/app/views/good_job/shared/icons/_stop.html.erb

@@ -0,0 +1,4 @@
+<!-- https://icons.getbootstrap.com/icons/stop/ -->
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-stop" viewBox="0 0 16 16">
+  <path d="M3.5 5A1.5 1.5 0 0 1 5 3.5h6A1.5 1.5 0 0 1 12.5 5v6a1.5 1.5 0 0 1-1.5 1.5H5A1.5 1.5 0 0 1 3.5 11V5zM5 4.5a.5.5 0 0 0-.5.5v6a.5.5 0 0 0 .5.5h6a.5.5 0 0 0 .5-.5V5a.5.5 0 0 0-.5-.5H5z" />
+</svg>

data/engine/app/views/layouts/good_job/base.html.erb

@@ -11,6 +11,7 @@
 
   <%= javascript_include_tag bootstrap_path(format: :js, v: GoodJob::VERSION) %>
   <%= javascript_include_tag chartist_path(format: :js, v: GoodJob::VERSION) %>
+  <%= javascript_include_tag rails_ujs_path(format: :js, v: GoodJob::VERSION) %>
 </head>
 <body>
   <nav class="navbar navbar-expand-lg navbar-light bg-light">
@@ -29,7 +30,7 @@
             <%= link_to "All Jobs", jobs_path, class: ["nav-link", ("active" if current_page?(jobs_path))] %>
           </li>
           <li class="nav-item">
-            <%= link_to "Cron Schedules", cron_schedules_path, class: ["nav-link", ("active" if current_page?(cron_schedules_path))] %>
+            <%= link_to "Cron Schedules", cron_entries_path, class: ["nav-link", ("active" if current_page?(cron_entries_path))] %>
           </li>
           <li class="nav-item">
             <div class="nav-link">
@@ -49,6 +50,7 @@
             </li>
           -->
         </ul>
+        <div class="text-muted" title="Now is <%= Time.current %>">Times are displayed in <%= Time.current.zone %> timezone</div>
       </div>
     </div>
   </nav>

data/engine/config/routes.rb

@@ -1,8 +1,20 @@
 # frozen_string_literal: true
 GoodJob::Engine.routes.draw do
   root to: 'executions#index'
-  resources :cron_schedules, only: %i[index]
-  resources :jobs, only: %i[index show]
+
+  resources :cron_entries, only: %i[index show] do
+    member do
+      post :enqueue
+    end
+  end
+
+  resources :jobs, only: %i[index show] do
+    member do
+      put :discard
+      put :reschedule
+      put :retry
+    end
+  end
   resources :executions, only: %i[destroy]
 
   scope controller: :assets do
@@ -14,6 +26,7 @@ GoodJob::Engine.routes.draw do
 
     constraints(format: :js) do
       get :bootstrap, action: :bootstrap_js
+      get :rails_ujs, action: :rails_ujs_js
       get :chartist, action: :chartist_js
     end
   end

data/lib/generators/good_job/install_generator.rb

@@ -19,5 +19,11 @@ module GoodJob
     def create_migration_file
       migration_template 'migrations/create_good_jobs.rb.erb', File.join(db_migrate_path, "create_good_jobs.rb")
     end
+
+    private
+
+    def migration_version
+      "[#{ActiveRecord::VERSION::STRING.to_f}]"
+    end
   end
 end

data/lib/generators/good_job/templates/install/migrations/create_good_jobs.rb.erb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-class CreateGoodJobs < ActiveRecord::Migration[5.2]
+class CreateGoodJobs < ActiveRecord::Migration<%= migration_version %>
   def change
     enable_extension 'pgcrypto'
 
@@ -18,6 +18,7 @@ class CreateGoodJobs < ActiveRecord::Migration[5.2]
       t.text :concurrency_key
       t.text :cron_key
       t.uuid :retried_good_job_id
+      t.timestamp :cron_at
     end
 
     add_index :good_jobs, :scheduled_at, where: "(finished_at IS NULL)", name: "index_good_jobs_on_scheduled_at"
@@ -25,5 +26,6 @@ class CreateGoodJobs < ActiveRecord::Migration[5.2]
     add_index :good_jobs, [:active_job_id, :created_at], name: :index_good_jobs_on_active_job_id_and_created_at
     add_index :good_jobs, :concurrency_key, where: "(finished_at IS NULL)", name: :index_good_jobs_on_concurrency_key_when_unfinished
     add_index :good_jobs, [:cron_key, :created_at], name: :index_good_jobs_on_cron_key_and_created_at
+    add_index :good_jobs, [:cron_key, :cron_at], name: :index_good_jobs_on_cron_key_and_cron_at, unique: true
   end
 end

data/lib/generators/good_job/templates/update/migrations/{01_create_good_jobs.rb → 01_create_good_jobs.rb.erb}

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-class CreateGoodJobs < ActiveRecord::Migration[5.2]
+class CreateGoodJobs < ActiveRecord::Migration<%= migration_version %>
   def change
     enable_extension 'pgcrypto'
 

data/lib/generators/good_job/templates/update/migrations/02_add_cron_at_to_good_jobs.rb.erb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+class AddCronAtToGoodJobs < ActiveRecord::Migration<%= migration_version %>
+  def change
+    reversible do |dir|
+      dir.up do
+        # Ensure this incremental update migration is idempotent
+        # with monolithic install migration.
+        return if connection.column_exists?(:good_jobs, :cron_at)
+      end
+    end
+
+    add_column :good_jobs, :cron_at, :timestamp
+  end
+end

data/lib/generators/good_job/templates/update/migrations/03_add_cron_key_cron_at_index_to_good_jobs.rb.erb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+class AddCronKeyCronAtIndexToGoodJobs < ActiveRecord::Migration<%= migration_version %>
+  disable_ddl_transaction!
+
+  def change
+    reversible do |dir|
+      dir.up do
+        # Ensure this incremental update migration is idempotent
+        # with monolithic install migration.
+        return if connection.index_name_exists?(:good_jobs, :index_good_jobs_on_cron_key_and_cron_at)
+      end
+    end
+
+    add_index :good_jobs,
+              [:cron_key, :cron_at],
+              algorithm: :concurrently,
+              name: :index_good_jobs_on_cron_key_and_cron_at,
+              unique: true
+  end
+end

data/lib/generators/good_job/update_generator.rb

@@ -24,5 +24,11 @@ module GoodJob
         migration_template "migrations/#{template_file}", File.join(db_migrate_path, destination_file), skip: true
       end
     end
+
+    private
+
+    def migration_version
+      "[#{ActiveRecord::VERSION::STRING.to_f}]"
+    end
   end
 end

data/lib/good_job/active_job_extensions/concurrency.rb

@@ -32,10 +32,9 @@ module GoodJob
 
           GoodJob::Execution.new.with_advisory_lock(key: key, function: "pg_advisory_lock") do
             enqueue_concurrency = if enqueue_limit
-                                    # TODO: Why is `unscoped` necessary? Nested scope is bleeding into subsequent query?
-                                    GoodJob::Execution.unscoped.where(concurrency_key: key).unfinished.advisory_unlocked.count
+                                    GoodJob::Execution.where(concurrency_key: key).unfinished.advisory_unlocked.count
                                   else
-                                    GoodJob::Execution.unscoped.where(concurrency_key: key).unfinished.count
+                                    GoodJob::Execution.where(concurrency_key: key).unfinished.count
                                   end
 
             # The job has not yet been enqueued, so check if adding it will go over the limit
@@ -63,7 +62,7 @@ module GoodJob
           next if key.blank?
 
           GoodJob::Execution.new.with_advisory_lock(key: key, function: "pg_advisory_lock") do
-            allowed_active_job_ids = GoodJob::Execution.unscoped.where(concurrency_key: key).advisory_locked.order(Arel.sql("COALESCE(performed_at, scheduled_at, created_at) ASC")).limit(perform_limit).pluck(:active_job_id)
+            allowed_active_job_ids = GoodJob::Execution.where(concurrency_key: key).advisory_locked.order(Arel.sql("COALESCE(performed_at, scheduled_at, created_at) ASC")).limit(perform_limit).pluck(:active_job_id)
             # The current job has already been locked and will appear in the previous query
             raise GoodJob::ActiveJobExtensions::Concurrency::ConcurrencyExceededError unless allowed_active_job_ids.include? job.job_id
           end