Use string range notation for backwards compatibility with Good job

Author: mrrooijen

lib/hirefire/macro/delayed_job.rb

@@ -27,20 +27,15 @@ class MapperNotDetectedError < StandardError; end
         #   HireFire::Macro::Delayed::Job.job_queue_latency(:default, :mailer)
         def job_queue_latency(*queues)
           queues = normalize_queues(queues, allow_empty: true)
+          query = ::Delayed::Job.where(failed_at: nil).order(run_at: :asc)
 
-          query =
-            ::Delayed::Job
-              .where("run_at <= ?", Time.now)
-              .where(failed_at: nil)
-              .order(run_at: :asc)
-
-          if queues.any?
-            case mapper
-            when :active_record
-              query = query.where(queue: queues)
-            when :mongoid
-              query = query.in(queue: queues.to_a)
-            end
+          case mapper
+          when :active_record
+            query = query.where("run_at <= ?", Time.now)
+            query = query.where(queue: queues) if queues.any?
+          when :mongoid
+            query = query.where(run_at: {"$lte" => Time.now})
+            query = query.in(queue: queues.to_a) if queues.any?
           end
 
           if (job = query.first)
@@ -65,19 +60,15 @@ def job_queue_latency(*queues)
         #   HireFire::Macro::Delayed::Job.job_queue_size(:default, :mailer)
         def job_queue_size(*queues)
           queues = normalize_queues(queues, allow_empty: true)
+          query = ::Delayed::Job.where(failed_at: nil)
 
-          query =
-            ::Delayed::Job
-              .where("run_at <= ?", Time.now)
-              .where(failed_at: nil)
-
-          if queues.any?
-            case mapper
-            when :active_record
-              query = query.where(queue: queues)
-            when :mongoid
-              query = query.in(queue: queues.to_a)
-            end
+          case mapper
+          when :active_record
+            query = query.where("run_at <= ?", Time.now)
+            query = query.where(queue: queues) if queues.any?
+          when :mongoid
+            query = query.where(run_at: {"$lte" => Time.now})
+            query = query.in(queue: queues.to_a) if queues.any?
           end
 
           query.count

lib/hirefire/macro/good_job.rb

@@ -29,7 +29,7 @@ def job_queue_latency(*queues)
         query = query.where(queue_name: queues) if queues.any?
         query = query.where(performed_at: nil)
         query = query.where.not(error_event: discarded_enum).or(query.where(error_event: nil)) if error_event_supported?
-        query = query.where(scheduled_at: ..Time.now).or(query.where(scheduled_at: nil))
+        query = query.where("scheduled_at <= ?", Time.now).or(query.where(scheduled_at: nil))
         query = query.order(scheduled_at: :asc, created_at: :asc)
 
         if (job = query.first)
@@ -57,7 +57,7 @@ def job_queue_size(*queues)
         query = query.where(queue_name: queues) if queues.any?
         query = query.where(performed_at: nil)
         query = query.where.not(error_event: discarded_enum).or(query.where(error_event: nil)) if error_event_supported?
-        query = query.where(scheduled_at: ..Time.now).or(query.where(scheduled_at: nil))
+        query = query.where("scheduled_at <= ?", Time.now).or(query.where(scheduled_at: nil))
         query.count
       end
     end