Revert PR #53 for backfilling scheduled jobs (#57)

* Revert "Backfill scheduled jobs if they are missing within the queue ahead time (#53)"

This reverts commit 1f90f7a.

* Bump version to 1.1.1 for immediate release

* Maintain requirement of :at option in config file for future changes

Author: brianpattison

lib/simple_scheduler/scheduler_job.rb

@@ -29,7 +29,8 @@ def load_config
     def queue_future_jobs
       tasks.each do |task|
         # Schedule the new run times using the future job wrapper.
-        task.future_run_times.each do |time|
+        new_run_times = task.future_run_times - task.existing_run_times
+        new_run_times.each do |time|
           SimpleScheduler::FutureJob.set(queue: @queue_name, wait_until: time)
                                     .perform_later(task.params, time.to_i)
         end

lib/simple_scheduler/task.rb

@@ -65,17 +65,17 @@ def frequency
     # @return [Array<Time>]
     # rubocop:disable Metrics/AbcSize
     def future_run_times
-      last_run_time = at - frequency
+      future_run_times = existing_run_times.dup
+      last_run_time = future_run_times.last || at - frequency
       last_run_time = last_run_time.in_time_zone(time_zone)
-      future_run_times = []
 
       # Ensure there are at least two future jobs scheduled and that the queue ahead time is filled
-      while (future_run_times + existing_run_times).length < 2 || minutes_queued_ahead(last_run_time) < queue_ahead
+      while future_run_times.length < 2 || minutes_queued_ahead(last_run_time) < queue_ahead
         last_run_time = frequency.from_now(last_run_time)
         # The hour may not match because of a shift caused by DST in previous run times,
         # so we need to ensure that the hour matches the specified hour if given.
         last_run_time = last_run_time.change(hour: at.hour, min: at.min) if at.hour?
-        future_run_times << last_run_time unless existing_run_times.include?(last_run_time)
+        future_run_times << last_run_time
       end
 
       future_run_times

lib/simple_scheduler/version.rb

@@ -1,3 +1,3 @@
 module SimpleScheduler
-  VERSION = "1.1.0".freeze
+  VERSION = "1.1.1".freeze
 end

spec/simple_scheduler/task_spec.rb

@@ -342,10 +342,12 @@
 
         it "won't be rescheduled when the time falls back if the job was previously executed" do
           travel_to Time.parse("2016-11-06 01:00:00 CST") do
-            expect(task).to receive(:existing_run_times).at_least(:once).and_return([
-              Time.parse("2016-11-07 01:30:00 CST")
+            tomorrows_run_time = Time.parse("2016-11-07 01:30:00 CST")
+            expect(task).to receive(:existing_jobs).and_return([
+              Sidekiq::SortedEntry.new(nil, tomorrows_run_time.to_i, "wrapped" => "TestJob", "class" => "ActiveJob::QueueAdapters::SidekiqAdapter::JobWrapper")
             ])
             expect(task.future_run_times).to eq([
+              Time.parse("2016-11-07 01:30:00 CST"),
               Time.parse("2016-11-08 01:30:00 CST")
             ])
           end
@@ -438,58 +440,5 @@
         end
       end
     end
-
-    context "when there are existing run times" do
-      let(:task) do
-        described_class.new(
-          class: "TestJob",
-          every: "15.minutes",
-          at: "*:00",
-          queue_ahead: 60, # minutes
-          tz: "America/Chicago"
-        )
-      end
-
-      it "only returns the run times that need to be added to the queue" do
-        travel_to Time.parse("2016-12-01 20:00:00 CST") do
-          expect(task).to receive(:existing_run_times).at_least(:once).and_return([
-            Time.parse("2016-12-01 20:00:00 CST"),
-            Time.parse("2016-12-01 20:15:00 CST"),
-            Time.parse("2016-12-01 20:30:00 CST")
-          ])
-          expect(task.future_run_times).to eq([
-            Time.parse("2016-12-01 20:45:00 CST"),
-            Time.parse("2016-12-01 21:00:00 CST")
-          ])
-        end
-      end
-    end
-
-    context "when an existing run time is deleted" do
-      let(:task) do
-        described_class.new(
-          class: "TestJob",
-          every: "15.minutes",
-          at: "*:00",
-          queue_ahead: 60, # minutes
-          tz: "America/Chicago"
-        )
-      end
-
-      it "includes in the missing run time" do
-        travel_to Time.parse("2016-12-01 20:00:00 CST") do
-          expect(task).to receive(:existing_run_times).at_least(:once).and_return([
-            Time.parse("2016-12-01 20:00:00 CST"),
-            # Time.parse("2016-12-01 20:15:00 CST"), <-- The missing run time
-            Time.parse("2016-12-01 20:30:00 CST")
-          ])
-          expect(task.future_run_times).to eq([
-            Time.parse("2016-12-01 20:15:00 CST"), # <-- The missing run time
-            Time.parse("2016-12-01 20:45:00 CST"),
-            Time.parse("2016-12-01 21:00:00 CST")
-          ])
-        end
-      end
-    end
   end
 end