pgbus 0.14.0 → 0.14.2

data/lib/pgbus/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Pgbus
-  VERSION = "0.14.0"
+  VERSION = "0.14.2"
 end

data/lib/pgbus/web/data_source.rb

@@ -669,7 +669,9 @@ module Pgbus
 
       # Batches
       def batches(limit: 100)
-        BatchEntry.order(created_at: :desc).limit(limit).map { |r| format_batch(r) }
+        records = BatchEntry.order(created_at: :desc).limit(limit).to_a
+        pending = pending_jobs_by_batch(records.map(&:batch_id))
+        records.map { |r| format_batch(r, pending_jobs: pending[r.batch_id]) }
       rescue StandardError => e
         Pgbus.logger.debug { "[Pgbus::Web] Error fetching batches: #{e.message}" }
         []
@@ -679,11 +681,14 @@ module Pgbus
         record = BatchEntry.find_by(batch_id: batch_id)
         return nil unless record
 
-        format_batch(record).merge(
+        pending = pending_jobs_by_batch([batch_id])
+        failure_callback = callback_display_name(record, :on_failure) || failure_callback_class(record)
+        format_batch(record, pending_jobs: pending[batch_id]).merge(
           properties: record.properties,
-          on_finish_class: record.on_finish_class,
-          on_success_class: record.on_success_class,
-          on_discard_class: record.on_discard_class
+          on_finish_class: callback_display_name(record, :on_finish) || record.on_finish_class,
+          on_success_class: callback_display_name(record, :on_success) || record.on_success_class,
+          on_failure_class: failure_callback,
+          on_discard_class: failure_callback
         )
       rescue StandardError => e
         Pgbus.logger.debug { "[Pgbus::Web] Error fetching batch #{batch_id}: #{e.message}" }
@@ -1351,10 +1356,12 @@ module Pgbus
         end
       end
 
-      def format_batch(record)
+      def format_batch(record, pending_jobs: nil)
         total = record.total_jobs
-        done = record.completed_jobs + record.discarded_jobs
+        failed = failure_job_count(record)
+        done = record.completed_jobs + failed
         pct = total.positive? ? ((done * 100) / total) : 100
+        pending = pending_jobs || [total - done, 0].max
 
         {
           batch_id: record.batch_id,
@@ -1362,14 +1369,45 @@ module Pgbus
           status: record.status,
           total_jobs: total,
           completed_jobs: record.completed_jobs,
-          discarded_jobs: record.discarded_jobs,
-          failed_jobs: record.failed_jobs,
+          failed_jobs: failed,
+          discarded_jobs: failed,
+          pending_jobs: pending,
           progress_pct: pct,
           created_at: record.created_at,
           finished_at: record.finished_at
         }
       end
 
+      def failure_job_count(record)
+        record.respond_to?(:discarded_jobs) ? record.discarded_jobs.to_i : record.failed_jobs.to_i
+      end
+
+      # A callback configured as an ActiveJob instance lives in the *_job jsonb
+      # column, not the legacy *_class string — show its job_class either way.
+      def callback_display_name(record, slot)
+        column = "#{slot}_job"
+        return nil unless record.respond_to?(column)
+
+        record.public_send(column).presence&.dig("job_class")
+      end
+
+      def failure_callback_class(record)
+        if record.respond_to?(:on_failure_class) && record.on_failure_class.present?
+          record.on_failure_class
+        elsif record.respond_to?(:on_discard_class)
+          record.on_discard_class
+        end
+      end
+
+      def pending_jobs_by_batch(batch_ids)
+        return {} unless Batch.executions_migrated?
+        return {} if batch_ids.empty?
+
+        BatchExecution.where(batch_id: batch_ids).group(:batch_id).count
+      rescue StandardError
+        {}
+      end
+
       def sanitize_name(name)
         QueueNameValidator.sanitize!(name)
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pgbus
 version: !ruby/object:Gem::Version
-  version: 0.14.0
+  version: 0.14.2
 platform: ruby
 authors:
 - Mikael Henriksson
@@ -150,6 +150,7 @@ files:
 - app/helpers/pgbus/streams_helper.rb
 - app/models/pgbus/application_record.rb
 - app/models/pgbus/batch_entry.rb
+- app/models/pgbus/batch_execution.rb
 - app/models/pgbus/blocked_execution.rb
 - app/models/pgbus/job_stat.rb
 - app/models/pgbus/outbox_entry.rb
@@ -210,6 +211,8 @@ files:
 - exe/pgbus
 - exe/pgbus-health
 - lib/active_job/queue_adapters/pgbus_adapter.rb
+- lib/generators/pgbus/add_batch_callback_jobs_generator.rb
+- lib/generators/pgbus/add_batch_executions_generator.rb
 - lib/generators/pgbus/add_failed_events_index_generator.rb
 - lib/generators/pgbus/add_job_stats_generator.rb
 - lib/generators/pgbus/add_job_stats_latency_generator.rb
@@ -225,6 +228,8 @@ files:
 - lib/generators/pgbus/install_generator.rb
 - lib/generators/pgbus/migrate_job_locks_generator.rb
 - lib/generators/pgbus/migration_path.rb
+- lib/generators/pgbus/templates/add_batch_callback_jobs.rb.erb
+- lib/generators/pgbus/templates/add_batch_executions.rb.erb
 - lib/generators/pgbus/templates/add_failed_events_unique_index.rb.erb
 - lib/generators/pgbus/templates/add_job_stats.rb.erb
 - lib/generators/pgbus/templates/add_job_stats_latency.rb.erb
@@ -251,9 +256,11 @@ files:
 - lib/generators/pgbus/upgrade_pgmq_generator.rb
 - lib/pgbus.rb
 - lib/pgbus/active_job/adapter.rb
+- lib/pgbus/active_job/batch_id.rb
 - lib/pgbus/active_job/executor.rb
 - lib/pgbus/autovacuum_tuning.rb
 - lib/pgbus/batch.rb
+- lib/pgbus/batch/sweep.rb
 - lib/pgbus/bus_record.rb
 - lib/pgbus/circuit_breaker.rb
 - lib/pgbus/cli.rb