VRFS-3936 merging develop

web/app/controllers/api_search_controller.rb

@@ -78,10 +78,11 @@ class ApiSearchController < ApiController
           SampleApp::Application.load_tasks
           Rake::Task["mobile:jam_tracks_json"].invoke
         end
-        render(file: fname)
+        json = JSON.parse(File.read(fname))
+        render(json: json, status: 200)
         
       else
-        render(json: {}, status: 200)
+        render(json: {})
       end
       
     elsif request.post?

web/lib/tasks/mobile.rake

@@ -114,6 +114,7 @@ namespace :mobile do
       jtname = row[1]
       jt = JamTrack.
            where(name: jtname, original_artist: jtartist).
+           includes([:genres, { jam_track_tracks: :instrument }]).
            limit(1).
            first
       next if jt.blank?
@@ -121,6 +122,10 @@ namespace :mobile do
       jtdata = {
         artist: jtartist,
         genre: jt.genres.map(&:description).join(', '),
+        instruments: jt.jam_track_tracks.map(&:instrument).compact.uniq.map(&:description).join(', '),
+        language: jt.language,
+        version: jt.version,
+        price: jt.price,
         id: jt.id,
         key: jt.id,
         name: jtname,