seth
/
jam-cloud
mirror of https://bitbucket.org/jamkazam/jam-cloud.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop

This commit is contained in:
Seth Call 2014-07-29 22:30:15 -05:00
parent 210510a5a4 93cef4e0cd
commit f3cc256293
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ruby/lib/jam_ruby/resque/scheduled/music_session_scheduler.rb
View File

@ -27,8 +27,8 @@ module JamRuby
end
def run
# get all weekly sessions that have ended in the last 15 minutes
criteria = "recurring_mode = 'weekly' AND session_removed_at is not null AND canceled = false AND next_session_scheduled = false"
# get all weekly sessions that started at least 4 hours ago
criteria = "recurring_mode = 'weekly' AND scheduled_start + interval '4hours' < NOW() AND canceled = false AND next_session_scheduled = false"
MusicSession.find_each(:conditions => criteria) do |music_session|
music_session.copy
end

7
ruby/spec/jam_ruby/resque/music_session_scheduler_spec.rb
View File

@ -18,8 +18,8 @@ describe "MusicSessionScheduler" do
MusicSession.all.count.should == 1
# end the session
ms.session_removed_at = Time.now
# move the session back more than 4 hours
ms.scheduled_start = Time.now - 5.hours
ms.save!
# run the scheduler again
@ -27,7 +27,6 @@ describe "MusicSessionScheduler" do
MusicSession.all.count.should == 2
MusicSession.where(:session_removed_at => nil).count.should == 1
MusicSession.where(:next_session_scheduled => true).count.should == 1
end
@ -40,7 +39,7 @@ describe "MusicSessionScheduler" do
@scheduler.run
MusicSession.all.count.should == 1
ms.session_removed_at = Time.now
ms.scheduled_start = Time.now - 3.hours
ms.save!
@scheduler.run