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

* VRFS-2981 - check for create_type = nil in scheduled_rsvp

This commit is contained in:
Seth Call 2015-03-25 11:26:32 -05:00
parent 53ef0f1b4f
commit f0c4647ef5
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ruby/lib/jam_ruby/models/music_session.rb
View File

@ -307,7 +307,7 @@ module JamRuby
filter_approved = only_approved ? 'AND rrrs.chosen = true' : ''
MusicSession.where(%Q{music_sessions.canceled = FALSE AND
music_sessions.create_type != '#{CREATE_TYPE_QUICK_START}' AND
(music_sessions.create_type is NULL OR music_sessions.create_type != '#{CREATE_TYPE_QUICK_START}') AND
(music_sessions.scheduled_start is NULL OR music_sessions.scheduled_start > NOW() - '4 hour'::INTERVAL) AND
music_sessions.id in (
select distinct(rs.music_session_id)

7
ruby/spec/jam_ruby/models/music_session_spec.rb
View File

@ -854,6 +854,13 @@ describe MusicSession do
music_session_1.rsvp_slots[0].rsvp_requests_rsvp_slots[0].save!
MusicSession.scheduled_rsvp(creator_1, true).should == []
end
it "create_type = nil will still return RSVPs" do
music_session_1.create_type = nil
music_session_1.save!
MusicSession.scheduled_rsvp(creator_1, true).should == [music_session_1]
end
end
end