Add job_class and queue_name as columns because they will be queried …

…in dashboard

app/models/good_job/base_execution.rb

@@ -47,7 +47,7 @@ def discrete_support?
     # The ActiveJob job class, as a string
     # @return [String]
     def job_class
-      serialized_params['job_class']
+      discrete? ? attributes['job_class'] : serialized_params['job_class']
     end
 
     def discrete?

app/models/good_job/execution.rb

@@ -378,7 +378,13 @@ def perform
           if discrete?
             transaction do
               now = Time.current
-              discrete_execution = discrete_executions.create!(serialized_params: serialized_params, scheduled_at: (scheduled_at || created_at), created_at: now)
+              discrete_execution = discrete_executions.create!(
+                job_class: job_class,
+                queue_name: queue_name,
+                serialized_params: serialized_params,
+                scheduled_at: (scheduled_at || created_at),
+                created_at: now
+              )
               update!(performed_at: now, executions_count: ((executions_count || 0) + 1))
             end
           else
@@ -460,6 +466,7 @@ def executable?
     def make_discrete
       self.is_discrete = true
       self.id = active_job_id
+      self.job_class = serialized_params['job_class']
       self.executions_count ||= 0
 
       current_time = Time.current

app/models/good_job/job.rb

@@ -61,6 +61,8 @@ def table_name=(_value)
     # Errored but will not be retried
     scope :discarded, -> { finished.where.not(error: nil) }
 
+    scope :unfinished_undiscrete, -> { where(finished_at: nil, retried_good_job_id: nil, is_discrete: [nil, false]) }
+
     # The job's ActiveJob UUID
     # @return [String]
     def id

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

@@ -25,6 +25,7 @@ class CreateGoodJobs < ActiveRecord::Migration<%= migration_version %>
 
       t.boolean :is_discrete
       t.integer :executions_count
+      t.text :job_class
     end
 
     create_table :good_job_batches, id: :uuid do |t|
@@ -49,6 +50,8 @@ class CreateGoodJobs < ActiveRecord::Migration<%= migration_version %>
       t.datetime :scheduled_at
       t.datetime :finished_at
       t.text :error
+      t.text :job_class
+      t.text :queue_name
     end
 
     create_table :good_job_processes, id: :uuid do |t|

lib/generators/good_job/templates/update/migrations/05_create_good_job_executions.rb.erb

@@ -13,6 +13,8 @@ class CreateGoodJobExecutions < ActiveRecord::Migration<%= migration_version %>
       t.timestamps
 
       t.uuid :active_job_id, null: false
+      t.text :job_class
+      t.text :queue_name
       t.jsonb :serialized_params
       t.datetime :scheduled_at
       t.datetime :finished_at
@@ -24,6 +26,7 @@ class CreateGoodJobExecutions < ActiveRecord::Migration<%= migration_version %>
     change_table :good_jobs do |t|
       t.boolean :is_discrete
       t.integer :executions_count
+      t.text :job_class
     end
   end
 end

spec/app/models/good_job/execution_spec.rb

@@ -678,6 +678,8 @@ def job_params
         expect(dexecution).to be_present
         expect(dexecution).to have_attributes(
           active_job_id: good_job.active_job_id,
+          job_class: good_job.job_class,
+          queue_name: good_job.queue_name,
           created_at: within(0.001).of(good_job.performed_at),
           scheduled_at: within(0.001).of(good_job.created_at),
           finished_at: within(1.second).of(Time.current),

spec/test_app/db/migrate/20230412144442_create_good_job_executions.rb

@@ -13,6 +13,8 @@ def change
       t.timestamps
 
       t.uuid :active_job_id, null: false
+      t.text :job_class
+      t.text :queue_name
       t.jsonb :serialized_params
       t.datetime :scheduled_at
       t.datetime :finished_at
@@ -24,6 +26,7 @@ def change
     change_table :good_jobs do |t|
       t.boolean :is_discrete
       t.integer :executions_count
+      t.text :job_class
     end
   end
 end

spec/test_app/db/schema.rb

@@ -34,6 +34,8 @@
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
     t.uuid "active_job_id", null: false
+    t.text "job_class"
+    t.text "queue_name"
     t.jsonb "serialized_params"
     t.datetime "scheduled_at"
     t.datetime "finished_at"
@@ -74,6 +76,7 @@
     t.uuid "batch_callback_id"
     t.boolean "is_discrete"
     t.integer "executions_count"
+    t.text "job_class"
     t.index ["active_job_id", "created_at"], name: "index_good_jobs_on_active_job_id_and_created_at"
     t.index ["active_job_id"], name: "index_good_jobs_on_active_job_id"
     t.index ["batch_callback_id"], name: "index_good_jobs_on_batch_callback_id", where: "(batch_callback_id IS NOT NULL)"