diff --git a/app/controllers/api_music_sessions_controller.rb b/app/controllers/api_music_sessions_controller.rb index a177d5056..1d9f8d563 100644 --- a/app/controllers/api_music_sessions_controller.rb +++ b/app/controllers/api_music_sessions_controller.rb @@ -69,7 +69,7 @@ class ApiMusicSessionsController < ApplicationController end def participant_show - @connection = Connection.find(params[:id]) + @connection = Connection.find_by_client_id(params[:id]) end def participant_create @@ -100,7 +100,7 @@ class ApiMusicSessionsController < ApplicationController def participant_delete ConnectionManager.active_record_transaction do |connection_manager| - @connection = Connection.find_by_client_id(params[:client_id]) + @connection = Connection.find_by_client_id(params[:id]) if @connection.nil? raise JamArgumentError, "no client found with specified client_id #{id}" diff --git a/app/views/api_music_sessions/member_show.rabl b/app/views/api_music_sessions/member_show.rabl index 175084104..a6023dd1e 100644 --- a/app/views/api_music_sessions/member_show.rabl +++ b/app/views/api_music_sessions/member_show.rabl @@ -1,3 +1,3 @@ object @connection -attributes :id, :ip_address, :client_id \ No newline at end of file +attributes :ip_address, :client_id => :id diff --git a/app/views/api_music_sessions/participant_show.rabl b/app/views/api_music_sessions/participant_show.rabl new file mode 100644 index 000000000..24412992e --- /dev/null +++ b/app/views/api_music_sessions/participant_show.rabl @@ -0,0 +1,3 @@ +object @connection + +attributes :ip_address, :client_id diff --git a/app/views/api_music_sessions/show.rabl b/app/views/api_music_sessions/show.rabl index e8f52a010..a1d06fddd 100644 --- a/app/views/api_music_sessions/show.rabl +++ b/app/views/api_music_sessions/show.rabl @@ -4,5 +4,5 @@ attributes :id, :description child(:connections => :participants) { collection @music_sessions, :object_root => false - attributes :id, :ip_address, :client_id + attributes :ip_address, :client_id } diff --git a/config/routes.rb b/config/routes.rb index aad155e5e..2b4a66d46 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -26,8 +26,8 @@ SampleApp::Application.routes.draw do scope '/api' do # music sessions match '/sessions/:id/participants' => 'api_music_sessions#participant_create', :via => :post - match '/participants/:client_id' => 'api_music_sessions#participant_show', :via => :get, :as => 'api_session_participant_detail' - match '/participants/:client_id' => 'api_music_sessions#participant_delete', :via => :delete + match '/participants/:id' => 'api_music_sessions#participant_show', :via => :get, :as => 'api_session_participant_detail' + match '/participants/:id' => 'api_music_sessions#participant_delete', :via => :delete match '/sessions/:id' => 'api_music_sessions#show', :via => :get, :as => 'api_session_detail' match '/sessions/:id' => 'api_music_sessions#delete', :via => :delete match '/sessions' => 'api_music_sessions#index', :via => :get