From 7a10e67c76c847f7ebe5f63d5b6672cf093ee7c8 Mon Sep 17 00:00:00 2001 From: Seth Call Date: Mon, 30 Jun 2014 16:14:01 -0500 Subject: [PATCH] * take out restriction for max 12 hours in the future for scheduled sessions --- ruby/lib/jam_ruby/models/music_session.rb | 1 - .../jam_ruby/models/music_session_spec.rb | 30 +++++++++++++++++++ 2 files changed, 30 insertions(+), 1 deletion(-) diff --git a/ruby/lib/jam_ruby/models/music_session.rb b/ruby/lib/jam_ruby/models/music_session.rb index 46c4200b5..341425e15 100644 --- a/ruby/lib/jam_ruby/models/music_session.rb +++ b/ruby/lib/jam_ruby/models/music_session.rb @@ -226,7 +226,6 @@ module JamRuby def self.scheduled user query = MusicSession.where("music_sessions.user_id = '#{user.id}'") - query = query.where("music_sessions.scheduled_start IS NOT NULL AND music_sessions.scheduled_start < NOW() + '12 hour'::INTERVAL") query = query.where("music_sessions.scheduled_start > NOW() - '12 hour'::INTERVAL") query = query.where("music_session_id IS NULL") query = query.order("music_sessions.scheduled_start ASC") diff --git a/ruby/spec/jam_ruby/models/music_session_spec.rb b/ruby/spec/jam_ruby/models/music_session_spec.rb index 9176ed777..e1a494ca6 100644 --- a/ruby/spec/jam_ruby/models/music_session_spec.rb +++ b/ruby/spec/jam_ruby/models/music_session_spec.rb @@ -209,6 +209,36 @@ describe MusicSession do end end + describe "scheduled" do + it "excludes based on time-range" do + session = FactoryGirl.create(:music_session, scheduled_start: Time.now) + + sessions = MusicSession.scheduled(session.creator) + sessions.length.should == 1 + + session.scheduled_start = 11.hours.ago + session.save! + sessions = MusicSession.scheduled(session.creator) + sessions.length.should == 1 + + session.scheduled_start = 13.hours.ago + session.save! + sessions = MusicSession.scheduled(session.creator) + sessions.length.should == 0 + + session.scheduled_start = 13.hours.from_now + session.save! + sessions = MusicSession.scheduled(session.creator) + sessions.length.should == 1 + + session.scheduled_start = 300.days.from_now + session.save! + sessions = MusicSession.scheduled(session.creator) + sessions.length.should == 1 + + end + end + def sms(user, params) ActiveRecord::Base.transaction do return MusicSession.sms_index(user, params)