VRFS-3246 : Remove references to current_user, change to target_player.

ruby/lib/jam_ruby/models/online_presence.rb

@@ -21,12 +21,13 @@ module JamRuby
       OnlinePresence.where("player_id = ?", options[:id])
     end
 
-    def self.create(player, options = {}, save = true)
-      auth_player(player, options)
+    # Create with target_player (target_player is either user or band):
+    def self.create(target_player, options = {}, save = true)
+      auth_player(target_player, options)
       raise StateError, "Missing required information" if options[:service_type].blank? || options[:username].blank?
       
       up = OnlinePresence.new({
-        :player_id => player.id, 
+        :player_id => target_player.id, 
         :service_type => options[:service_type], 
         :username => options[:username]
       })
@@ -35,8 +36,8 @@ module JamRuby
       up
     end
 
-    def self.update(player, options = {})
-      auth_player(player, options)
+    def self.update(target_player, options = {})
+      auth_player(target_player, options)
       raise StateError, "Missing required information" if options[:service_type].blank? || options[:username].blank? || options[:id].blank?
 
       up = OnlinePresence.find(options[:id])
@@ -45,12 +46,12 @@ module JamRuby
       up.save!
     end
 
-    def self.delete(player, options = {})
+    def self.delete(target_player, options = {})
       id = options[:id]
       raise StateError, "Missing required information" if id.blank?
       online_presence = OnlinePresence.find(id)
 
-      if online_presence.player_id != player.id
+      if online_presence.player_id != target_player.id
         raise JamPermissionError, PERMISSION_MSG
       end
 
@@ -60,8 +61,8 @@ module JamRuby
     end
 
     private
-    def self.auth_player(player, options={})
-      raise JamPermissionError, PERMISSION_MSG if player.nil? || options[:player_id] != player.id
+    def self.auth_player(target_player, options={})
+      raise JamPermissionError, PERMISSION_MSG if target_player.nil? || options[:player_id] != target_player.id
     end
   end
 end

ruby/lib/jam_ruby/models/performance_sample.rb

@@ -41,12 +41,13 @@ module JamRuby
       PerformanceSample.where("player_id = ?", options[:id])
     end
 
-    def self.create(current_user, options = {}, save = true)
-      auth_user(current_user, options)
+    # Create with target_player (target_player is either user or band):
+    def self.create(target_player, options = {}, save = true)
+      auth_user(target_player, options)
       raise StateError, "Missing required information" if options[:service_type].blank?
       
       ps = PerformanceSample.new({
-        :player_id => current_user.id, 
+        :player_id => target_player.id, 
         :service_type => options[:service_type], 
         :claimed_recording_id => options[:claimed_recording_id],
         :service_id => options[:service_id],
@@ -58,15 +59,15 @@ module JamRuby
       ps
     end
 
-    def self.delete(current_user, options = {})
-      raise JamPermissionError, "You do not have permission to perform this operation" if current_user.nil? || options[:player_id] != current_user.id
+    def self.delete(target_player, options = {})
+      raise JamPermissionError, "You do not have permission to perform this operation" if target_player.nil? || options[:player_id] != target_player.id
       raise StateError, "The performance sample ID is missing." if options[:id].blank?
       PerformanceSample.destroy(options[:id])
     end
 
     private
-    def self.auth_user(current_user, options={})
-      raise JamPermissionError, PERMISSION_MSG if current_user.nil? || options[:player_id] != current_user.id
+    def self.auth_user(target_player, options={})
+      raise JamPermissionError, PERMISSION_MSG if target_player.nil? || options[:player_id] != target_player.id
     end
   end
 end