diff --git a/ruby/lib/jam_ruby/lib/musician_filter.rb b/ruby/lib/jam_ruby/lib/musician_filter.rb index d30d16442..12d567927 100644 --- a/ruby/lib/jam_ruby/lib/musician_filter.rb +++ b/ruby/lib/jam_ruby/lib/musician_filter.rb @@ -42,7 +42,7 @@ module JamRuby inst = [] instruments.each do |ii| proficiency_levels.each do |pl| - inst << { instrument_id: ii[:value], proficiency_level: pl} + inst << { id: ii[:value], proficiency: pl} end end filter_params.merge!(instruments: inst) diff --git a/ruby/lib/jam_ruby/models/musician_search.rb b/ruby/lib/jam_ruby/models/musician_search.rb index 0a505a0fd..82f9b13bc 100644 --- a/ruby/lib/jam_ruby/models/musician_search.rb +++ b/ruby/lib/jam_ruby/models/musician_search.rb @@ -163,10 +163,10 @@ module JamRuby def do_filter(user_ids) rel = User.musicians.where('users.id <> ?', self.user.id) - rel = self._genres(rel) - rel = self._instruments(rel) - rel = self._joined_within(rel) - rel = self._active_within(rel) + # rel = self._genres(rel) + # rel = self._instruments(rel) + # rel = self._joined_within(rel) + # rel = self._active_within(rel) #user_ids: users returned from neo4j latency data service. #if this variable is not null, that means we are calling this method with neo4j latency data (currently this call only comes from api_search_controller#filter) #debugger diff --git a/ruby/spec/jam_ruby/lib/musician_filter_spec.rb b/ruby/spec/jam_ruby/lib/musician_filter_spec.rb index 2fd0386bf..5dfdc71b7 100644 --- a/ruby/spec/jam_ruby/lib/musician_filter_spec.rb +++ b/ruby/spec/jam_ruby/lib/musician_filter_spec.rb @@ -139,14 +139,14 @@ describe MusicianFilter do expect(latency_data[0][:ars_total_latency]).not_to eq(nil) expect(latency_data[0][:ars_internet_latency]).not_to eq(nil) - #sort by latency - expect(search.results[0][:id]).to eq(user1.id) - expect(search.results[1][:id]).to eq(user2.id) - expect(search.results[2][:id]).to eq(user3.id) - expect(search.results[3][:id]).to eq(user4.id) - expect(search.results[4][:id]).to eq(user5.id) - expect(search.results[5][:id]).to eq(user6.id) - expect(search.results[6][:id]).to eq(user8.id) + #sort by audio latency + expect(search.results[0][:id]).to eq(user8.id) + expect(search.results[1][:id]).to eq(user1.id) + expect(search.results[2][:id]).to eq(user2.id) + expect(search.results[3][:id]).to eq(user3.id) + expect(search.results[4][:id]).to eq(user4.id) + expect(search.results[5][:id]).to eq(user5.id) + expect(search.results[6][:id]).to eq(user6.id) end diff --git a/web/app/controllers/api_search_controller.rb b/web/app/controllers/api_search_controller.rb index 39fc026db..eb43fafd0 100644 --- a/web/app/controllers/api_search_controller.rb +++ b/web/app/controllers/api_search_controller.rb @@ -183,7 +183,7 @@ class ApiSearchController < ApiController @search, @latency_data, @nextOffset = JamRuby::MusicianFilter.filter(current_user, request.remote_ip, params) respond_with @search, responder: ApiResponder, status: 201, template: 'api_search/filter' rescue => ex - Rails.logger.debug("=====LATENCY EXCEPTION : #{ex.message}") + Rails.logger.debug("EXCEPTION : #{ex.message}") render json: {}, status: 500 end end