good_job 4.8.1 → 4.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ad6949cd77548ff686d2824d654f609567f110b1e778975f72f13aec0eeda672
-  data.tar.gz: bcfa0c1941d237dc5e4a1b8611d1987b1ddef282ac2a4417306f7664032c2c69
+  metadata.gz: dad9150afd9c10b0e0bd9850f5252000456a22f6e7cd9ccfd399ccf5f8e797aa
+  data.tar.gz: a2d3897d12bbd2b4b5860e4306038f71bc0c5f63ed3d03f97b0e06bfc21cfa5b
 SHA512:
-  metadata.gz: 36643826c085b2192a63bc917d9271079e6517762d84f0fbf4310e56be6b10eb5d221e53cd526c88668300a3716b527dcfe94cc7f0cc5ba8163503f65770e4e1
-  data.tar.gz: 8fe8418c883034d7e7e008a37b2617b3965582623fd87c034cdc72bd8798c760df3917a3e5b4e2d0cf9d2caa255cfe3924f0e97b4c110f361c61b00d55fa99db
+  metadata.gz: 2375178420c7a749563bb93c4be342dd594dd170095297e38d71dae31f657be30d75a3220e2e072e731ae91aad7cb51f3ad550e89a7c210da1464ef148e3552f
+  data.tar.gz: 51956eb4fcc4c12a0a4aa832720be3cf1c462f0c55cab637a550ff104a55c7f28edad7e079772b324667bc67bc0003ffe69d12c0446ea289f369ef506a4e6286

data/CHANGELOG.md

@@ -1,5 +1,18 @@
 # Changelog
 
+## [v4.8.2](https://github.com/bensheldon/good_job/tree/v4.8.2) (2025-01-26)
+
+[Full Changelog](https://github.com/bensheldon/good_job/compare/v4.8.1...v4.8.2)
+
+**Fixed bugs:**
+
+- Ensure that executions are properly ordered in the dashboard [\#1588](https://github.com/bensheldon/good_job/pull/1588) ([Earlopain](https://github.com/Earlopain))
+
+**Merged pull requests:**
+
+- Fix passing a block to `advisory_lock` in tests [\#1587](https://github.com/bensheldon/good_job/pull/1587) ([Earlopain](https://github.com/Earlopain))
+- Expect `Job#scheduled_at` to always be present; remove nil checks [\#1585](https://github.com/bensheldon/good_job/pull/1585) ([bensheldon](https://github.com/bensheldon))
+
 ## [v4.8.1](https://github.com/bensheldon/good_job/tree/v4.8.1) (2025-01-24)
 
 [Full Changelog](https://github.com/bensheldon/good_job/compare/v4.8.0...v4.8.1)
@@ -11,7 +24,6 @@
 **Closed issues:**
 
 - Losing "Processes" on the dashboard [\#1582](https://github.com/bensheldon/good_job/issues/1582)
-- Notifier errored: TypeError: ActiveSupport::TimeWithZone can't be coerced into Integer [\#1581](https://github.com/bensheldon/good_job/issues/1581)
 - Ability to pause queues [\#1574](https://github.com/bensheldon/good_job/issues/1574)
 
 ## [v4.8.0](https://github.com/bensheldon/good_job/tree/v4.8.0) (2025-01-22)

data/app/models/concerns/good_job/filterable.rb

@@ -15,11 +15,11 @@ module GoodJob
       #   Display records after this ID for keyset pagination
       # @return [ActiveRecord::Relation]
       scope :display_all, (lambda do |after_scheduled_at: nil, after_id: nil|
-        query = order(Arel.sql('COALESCE(scheduled_at, created_at) DESC, id DESC'))
+        query = order(Arel.sql('scheduled_at DESC, id DESC'))
         if after_scheduled_at.present? && after_id.present?
-          query = query.where Arel::Nodes::Grouping.new([coalesce_scheduled_at_created_at, arel_table["id"]]).lt(Arel::Nodes::Grouping.new([bind_value('coalesce', after_scheduled_at, ActiveRecord::Type::DateTime), bind_value('id', after_id, ActiveRecord::ConnectionAdapters::PostgreSQL::OID::Uuid)]))
+          query = query.where Arel::Nodes::Grouping.new([arel_table["scheduled_at"], arel_table["id"]]).lt(Arel::Nodes::Grouping.new([bind_value('scheduled_at', after_scheduled_at, ActiveRecord::Type::DateTime), bind_value('id', after_id, ActiveRecord::ConnectionAdapters::PostgreSQL::OID::Uuid)]))
         elsif after_scheduled_at.present?
-          query = query.where coalesce_scheduled_at_created_at.lt(bind_value('coalesce', after_scheduled_at, ActiveRecord::Type::DateTime))
+          query = query.where arel_table["scheduled_at"].lt(bind_value('scheduled_at', after_scheduled_at, ActiveRecord::Type::DateTime))
         end
         query
       end)

data/app/models/good_job/job.rb

@@ -54,11 +54,11 @@ module GoodJob
     scope :finished_before, ->(timestamp) { where(arel_table['finished_at'].lteq(bind_value('finished_at', timestamp, ActiveRecord::Type::DateTime))) }
 
     # First execution will run in the future
-    scope :scheduled, -> { where(finished_at: nil).where(coalesce_scheduled_at_created_at.gt(bind_value('coalesce', Time.current, ActiveRecord::Type::DateTime))).where(params_execution_count.lt(2)) }
+    scope :scheduled, -> { where(finished_at: nil).where(arel_table['scheduled_at'].gt(bind_value('scheduled_at', Time.current, ActiveRecord::Type::DateTime))).where(params_execution_count.lt(2)) }
     # Execution errored, will run in the future
-    scope :retried, -> { where(finished_at: nil).where(coalesce_scheduled_at_created_at.gt(bind_value('coalesce', Time.current, ActiveRecord::Type::DateTime))).where(params_execution_count.gt(1)) }
+    scope :retried, -> { where(finished_at: nil).where(arel_table['scheduled_at'].gt(bind_value('scheduled_at', Time.current, ActiveRecord::Type::DateTime))).where(params_execution_count.gt(1)) }
     # Immediate/Scheduled time to run has passed, waiting for an available thread run
-    scope :queued, -> { where(performed_at: nil, finished_at: nil).where(coalesce_scheduled_at_created_at.lteq(bind_value('coalesce', Time.current, ActiveRecord::Type::DateTime))) }
+    scope :queued, -> { where(performed_at: nil, finished_at: nil).where(arel_table['scheduled_at'].lteq(bind_value('scheduled_at', Time.current, ActiveRecord::Type::DateTime))) }
     # Advisory locked and executing
     scope :running, -> { where.not(performed_at: nil).where(finished_at: nil) }
     # Finished executing (succeeded or discarded)
@@ -94,7 +94,7 @@ module GoodJob
     # @!method only_scheduled
     # @!scope class
     # @return [ActiveRecord::Relation]
-    scope :only_scheduled, -> { where(arel_table['scheduled_at'].lteq(bind_value('scheduled_at', DateTime.current, ActiveRecord::Type::DateTime))).or(where(scheduled_at: nil)) }
+    scope :only_scheduled, -> { where(arel_table['scheduled_at'].lteq(bind_value('scheduled_at', DateTime.current, ActiveRecord::Type::DateTime))) }
 
     # Exclude jobs that are paused via queue_name or job_class.
     # Only applies when enable_pauses configuration is true.
@@ -166,7 +166,7 @@ module GoodJob
     # @!method schedule_ordered
     # @!scope class
     # @return [ActiveRecord::Relation]
-    scope :schedule_ordered, -> { order(coalesce_scheduled_at_created_at.asc) }
+    scope :schedule_ordered, -> { order(scheduled_at: :asc) }
 
     # Get Jobs on queues that match the given queue string.
     # @!method queue_string(string)
@@ -249,10 +249,6 @@ module GoodJob
           Arel.sql('integer')
         )
       end
-
-      def coalesce_scheduled_at_created_at
-        arel_table.coalesce(arel_table['scheduled_at'], arel_table['created_at'])
-      end
     end
 
     def self.build_for_enqueue(active_job, scheduled_at: nil)
@@ -344,12 +340,13 @@ module GoodJob
 
       after ||= Time.current
       after_bind = bind_value('scheduled_at', after, ActiveRecord::Type::DateTime)
-      after_query = query.where(arel_table['scheduled_at'].gt(after_bind)).or query.where(scheduled_at: nil).where(arel_table['created_at'].gt(after_bind))
-      after_at = after_query.limit(limit).pluck(:scheduled_at, :created_at).map { |timestamps| timestamps.compact.first }
+      after_query = query.where(arel_table['scheduled_at'].gt(after_bind))
+      after_at = after_query.limit(limit).pluck(:scheduled_at)
 
       if now_limit&.positive?
-        now_query = query.where(arel_table['scheduled_at'].lt(bind_value('scheduled_at', Time.current, ActiveRecord::Type::DateTime))).or query.where(scheduled_at: nil)
-        now_at = now_query.limit(now_limit).pluck(:scheduled_at, :created_at).map { |timestamps| timestamps.compact.first }
+        now_bind = bind_value('scheduled_at', Time.current, ActiveRecord::Type::DateTime)
+        now_query = query.where(arel_table['scheduled_at'].lt(now_bind))
+        now_at = now_query.limit(now_limit).pluck(:scheduled_at)
       end
 
       Array(now_at) + after_at

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

@@ -84,4 +84,4 @@
   <%= tag.pre JSON.pretty_generate(@job.display_serialized_params) %>
 <% end %>
 
-<%= render 'executions', executions: @job.executions.reverse %>
+<%= render 'executions', executions: @job.executions.sort_by(&:number).reverse %>

data/lib/good_job/version.rb

@@ -2,7 +2,7 @@
 
 module GoodJob
   # GoodJob gem version.
-  VERSION = '4.8.1'
+  VERSION = '4.8.2'
 
   # GoodJob version as Gem::Version object
   GEM_VERSION = Gem::Version.new(VERSION)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: good_job
 version: !ruby/object:Gem::Version
-  version: 4.8.1
+  version: 4.8.2
 platform: ruby
 authors:
 - Ben Sheldon
 bindir: exe
 cert_chain: []
-date: 2025-01-24 00:00:00.000000000 Z
+date: 2025-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activejob