diff --git a/db/manifest b/db/manifest index 968d37f27..f41f30931 100755 --- a/db/manifest +++ b/db/manifest @@ -154,4 +154,5 @@ fix_connection_fields.sql session_ratings.sql scheduled_sessions.sql notification_scheduled_session.sql -music_notation.sql \ No newline at end of file +music_notation.sql +music_session_recurring_mode.sql \ No newline at end of file diff --git a/db/up/music_session_recurring_mode.sql b/db/up/music_session_recurring_mode.sql new file mode 100644 index 000000000..c2c6ba4b7 --- /dev/null +++ b/db/up/music_session_recurring_mode.sql @@ -0,0 +1,2 @@ +ALTER TABLE music_sessions ADD COLUMN recurring_mode VARCHAR(50) NOT NULL DEFAULT 'once'; +UPDATE music_sessions SET recurring_mode = 'once' WHERE recurring_mode IS NULL; \ No newline at end of file diff --git a/ruby/lib/jam_ruby.rb b/ruby/lib/jam_ruby.rb index a282f246d..6e6cf63c4 100755 --- a/ruby/lib/jam_ruby.rb +++ b/ruby/lib/jam_ruby.rb @@ -88,7 +88,6 @@ require "jam_ruby/models/music_session_liker" require "jam_ruby/models/music_session_user_history" require "jam_ruby/models/music_session_perf_data" require "jam_ruby/models/music_notation" -require "jam_ruby/models/recurring_session" require "jam_ruby/models/invitation" require "jam_ruby/models/fan_invitation" require "jam_ruby/models/friend_request" diff --git a/ruby/lib/jam_ruby/models/music_session.rb b/ruby/lib/jam_ruby/models/music_session.rb index a24b951e3..22671b32d 100644 --- a/ruby/lib/jam_ruby/models/music_session.rb +++ b/ruby/lib/jam_ruby/models/music_session.rb @@ -1,7 +1,7 @@ module JamRuby class MusicSession < ActiveRecord::Base - attr_accessor :legal_terms + attr_accessor :legal_terms, :recurring_mode self.table_name = "music_sessions" @@ -34,6 +34,7 @@ module JamRuby validates :musician_access, :inclusion => {:in => [true, false]} validates :legal_terms, :inclusion => {:in => [true]}, :on => :create validates :creator, :presence => true + validates :recurring_mode, :inclusion => {:in => RECURRING_MODES} validate :creator_is_musician before_create :generate_share_token @@ -43,6 +44,11 @@ module JamRuby SEPARATOR = '|' + NO_RECURRING = "once" + RECURRING_WEEKLY = "weekly" + + RECURRING_MODES = [NO_RECURRING, RECURRING_WEEKLY] + def add_to_feed feed = Feed.new feed.music_session = self diff --git a/ruby/lib/jam_ruby/models/recurring_session.rb b/ruby/lib/jam_ruby/models/recurring_session.rb deleted file mode 100644 index 74194c904..000000000 --- a/ruby/lib/jam_ruby/models/recurring_session.rb +++ /dev/null @@ -1,4 +0,0 @@ -module JamRuby - class RecurringSession < ActiveRecord::Base - end -end \ No newline at end of file