Change scheduled rake tasks to execute now instead of later

Fixes #1739, #1740, #1741

Author: ccadden

CHANGELOG.md

@@ -2,6 +2,11 @@
 * This file will be updated whenever a new release is put into production.
 * Any problems should be reported via the "report an issue" link in the footer of the application.
 
+## v6.3.3 - 2018-07-20
+### Fixed
+* Modify daily/hourly Admin buttons to use relative path via helper method ([1742](https://github.com/YaleSTC/reservations/issues/1742))
+* Change rake daily/hourly tasks to execute immediately to fix issue with cron job in production ([#1739](https://github.com/YaleSTC/reservations/issues/1739), [#1740](https://github.com/YaleSTC/reservations/issues/1740), [#1741](https://github.com/YaleSTC/reservations/issues/1741))
+
 ## v6.3.2 - 2018-06-26
 ### Fixed
 * Fixed incorrect evaluation of reservations affected by a blackout ([#1644](https://github.com/YaleSTC/reservations/issues/1644)).

app/jobs/application_job.rb

@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+# Base class for Jobs
+class ApplicationJob < ActiveJob::Base; end

app/jobs/daily_tasks_job.rb

@@ -1,16 +1,17 @@
 # frozen_string_literal: true
-class DailyTasksJob < ActiveJob::Base
+
+class DailyTasksJob < ApplicationJob
   queue_as :default
 
   def perform
-    FlagOverdueJob.perform_later
-    FlagMissedJob.perform_later
-    DenyMissedRequestsJob.perform_later
-    EmailCheckinReminderJob.perform_later
-    EmailCheckoutReminderJob.perform_later
-    EmailMissedReservationsJob.perform_later
-    EmailOverdueReminderJob.perform_later
-    DeleteOldBlackoutsJob.perform_later
-    DeleteMissedReservationsJob.perform_later
+    FlagOverdueJob.perform_now
+    FlagMissedJob.perform_now
+    DenyMissedRequestsJob.perform_now
+    EmailCheckinReminderJob.perform_now
+    EmailCheckoutReminderJob.perform_now
+    EmailMissedReservationsJob.perform_now
+    EmailOverdueReminderJob.perform_now
+    DeleteOldBlackoutsJob.perform_now
+    DeleteMissedReservationsJob.perform_now
   end
 end

app/jobs/hourly_tasks_job.rb

@@ -1,8 +1,9 @@
 # frozen_string_literal: true
-class HourlyTasksJob < ActiveJob::Base
+
+class HourlyTasksJob < ApplicationJob
   queue_as :default
 
   def perform
-    EmailNotesToAdminsJob.perform_later
+    EmailNotesToAdminsJob.perform_now
   end
 end

spec/jobs/daily_tasks_job_spec.rb

@@ -1,10 +1,11 @@
 # frozen_string_literal: true
+
 require 'spec_helper'
 
 describe DailyTasksJob, type: :job do
   shared_examples 'enqueues' do |job|
     it "the #{job}" do
-      expect(job).to receive(:perform_later)
+      expect(job).to receive(:perform_now)
       described_class.perform_now
     end
   end

spec/jobs/hourly_tasks_job_spec.rb

@@ -1,9 +1,10 @@
 # frozen_string_literal: true
+
 require 'spec_helper'
 
 describe HourlyTasksJob, type: :job do
   it 'enqueues the email notes to admins job' do
-    expect(EmailNotesToAdminsJob).to receive(:perform_later)
+    expect(EmailNotesToAdminsJob).to receive(:perform_now)
     described_class.perform_now
   end
 end