From 77528ddc9de2484dc14d99a17a498d88bff1b039 Mon Sep 17 00:00:00 2001
From: Jonathan Kolyer <jonathan@jamkazam.com>
Date: Fri, 7 Mar 2014 09:05:34 +0000
Subject: [PATCH] VRFS-1333 added recordingId

---
 web/app/assets/javascripts/feed_item_recording.js    | 3 ++-
 web/app/assets/javascripts/jquery.listenRecording.js | 4 +++-
 web/app/assets/javascripts/web/recordings.js         | 2 +-
 web/app/controllers/api_users_controller.rb          | 4 ++--
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/web/app/assets/javascripts/feed_item_recording.js b/web/app/assets/javascripts/feed_item_recording.js
index b5ea021b2..0d8793446 100644
--- a/web/app/assets/javascripts/feed_item_recording.js
+++ b/web/app/assets/javascripts/feed_item_recording.js
@@ -6,6 +6,7 @@
   context.JK.FeedItemRecording = function($parentElement, options){
 
     var claimedRecordingId = $parentElement.attr('data-claimed-recording-id');
+    var recordingId = $parentElement.attr('id');
 
     var $feedItem       = $parentElement;
     var $name           = $('.name', $feedItem);
@@ -98,7 +99,7 @@
     function initialize() {
       $('.timeago', $feedItem).timeago();
       $('.dotdotdot', $feedItem).dotdotdot();
-      $controls.listenRecording({claimedRecordingId: claimedRecordingId, sliderSelector:'.recording-slider', sliderBarSelector: '.recording-playback', currentTimeSelector:'.recording-current'});
+        $controls.listenRecording({recordingId: recordingId, claimedRecordingId: claimedRecordingId, sliderSelector:'.recording-slider', sliderBarSelector: '.recording-playback', currentTimeSelector:'.recording-current'});
       context.JK.prettyPrintElements($('time.duration', $feedItem));
       context.JK.setInstrumentAssetPath($('.instrument-icon', $feedItem));
 
diff --git a/web/app/assets/javascripts/jquery.listenRecording.js b/web/app/assets/javascripts/jquery.listenRecording.js
index 87e2519c5..e88f72636 100644
--- a/web/app/assets/javascripts/jquery.listenRecording.js
+++ b/web/app/assets/javascripts/jquery.listenRecording.js
@@ -12,6 +12,7 @@
     var logger                  = context.JK.logger;
     var rest                    = context.JK.Rest();
     var $parent                 = $parentElement;
+    var recordingId             = null;
     var claimedRecordingId      = null;
     var $currentTime            = null;
     var $slider                 = null;
@@ -76,7 +77,7 @@
           if(lastTime > -1) {audioDomElement.currentTime = lastTime;}
           audioDomElement.play();
           isPlaying = true;
-          context.JK.Rest().addPlayablePlay(null, null, null, context.JK.currentUserId);
+          context.JK.Rest().addPlayablePlay(recordingId, 'JamRuby::Recording', claimedRecordingId, context.JK.currentUserId);
       })
 
     }
@@ -390,6 +391,7 @@
       $sliderBar = $(options.sliderBarSelector, $parent);
       $currentTime = $(options.currentTimeSelector, $parent);
       claimedRecordingId = options.claimedRecordingId;
+      recordingId = options.recordingId;
       $audio = $('audio', $parent);
 
       if($audio.length == 0) {
diff --git a/web/app/assets/javascripts/web/recordings.js b/web/app/assets/javascripts/web/recordings.js
index 17702e404..a8a2d2461 100644
--- a/web/app/assets/javascripts/web/recordings.js
+++ b/web/app/assets/javascripts/web/recordings.js
@@ -91,7 +91,7 @@
       $playButton.click(togglePlay);
       $controls.bind('statechange.listenRecording', stateChange);
 
-      $controls.listenRecording({claimedRecordingId: claimedRecordingId, sliderSelector:'.recording-slider', sliderBarSelector: '.recording-playback', currentTimeSelector:'.recording-current'});
+        $controls.listenRecording({recordingId: recordingId, claimedRecordingId: claimedRecordingId, sliderSelector:'.recording-slider', sliderBarSelector: '.recording-playback', currentTimeSelector:'.recording-current'});
 
       if (JK.currentUserId) {
         var shareDialog = new JK.ShareDialog(JK.app, claimedRecordingId, "recording");
diff --git a/web/app/controllers/api_users_controller.rb b/web/app/controllers/api_users_controller.rb
index 31b5e4c93..0a3bec6ec 100644
--- a/web/app/controllers/api_users_controller.rb
+++ b/web/app/controllers/api_users_controller.rb
@@ -1,6 +1,6 @@
 class ApiUsersController < ApiController
 
-  before_filter :api_signed_in_user, :except => [:create, :show, :signup_confirm, :auth_session_create, :complete, :finalize_update_email, :isp_scoring]
+  before_filter :api_signed_in_user, :except => [:create, :show, :signup_confirm, :auth_session_create, :complete, :finalize_update_email, :isp_scoring, :add_play]
   before_filter :auth_user, :only => [:session_settings_show, :session_history_index, :session_user_history_index, :update, :delete,
                 :liking_create, :liking_destroy, # likes
                 :following_create, :following_show, :following_destroy, # followings
@@ -580,7 +580,7 @@ class ApiUsersController < ApiController
 
     play = PlayablePlay.new
     play.playable_id = params[:id]
-    play.playable_type = params[:claimed_recording_id].present? ? 'JamRuby::Recording' : 'JamRuby::MusicSession'
+    play.playable_type = params[:playable_type]
     play.player_id = params[:user_id]
     play.claimed_recording_id = params[:claimed_recording_id]
     play.ip_address = request.remote_ip