From c1b8bf9ff791c272182d5d41dd7bd7aa65982976 Mon Sep 17 00:00:00 2001
From: Jonathan Kolyer <jonathan@jamkazam.com>
Date: Sat, 22 Aug 2015 02:04:41 +0000
Subject: [PATCH] VRFS-3391 fixing glitches from mobile tests

---
 ruby/lib/jam_ruby/models/genre_jam_track.rb |  4 ++--
 ruby/lib/jam_ruby/models/jam_track.rb       | 24 +++++++++++++++------
 2 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/ruby/lib/jam_ruby/models/genre_jam_track.rb b/ruby/lib/jam_ruby/models/genre_jam_track.rb
index aa05e4fd8..9b6008a3e 100644
--- a/ruby/lib/jam_ruby/models/genre_jam_track.rb
+++ b/ruby/lib/jam_ruby/models/genre_jam_track.rb
@@ -2,7 +2,7 @@ module JamRuby
   class GenreJamTrack < ActiveRecord::Base
 
     self.table_name = 'genres_jam_tracks'
-    belongs_to :jam_track, class_name: 'JamRuby::JamTrack'
-    belongs_to :genre, class_name: 'JamRuby::Genre'
+    belongs_to :jam_track, class_name: 'JamRuby::JamTrack', inverse_of: :genres_jam_tracks
+    belongs_to :genre, class_name: 'JamRuby::Genre', inverse_of: :genres_jam_tracks
   end
 end
diff --git a/ruby/lib/jam_ruby/models/jam_track.rb b/ruby/lib/jam_ruby/models/jam_track.rb
index 1f826a621..578eaa821 100644
--- a/ruby/lib/jam_ruby/models/jam_track.rb
+++ b/ruby/lib/jam_ruby/models/jam_track.rb
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 module JamRuby
   class JamTrack < ActiveRecord::Base
     include JamRuby::S3ManagerMixin
@@ -52,7 +53,7 @@ module JamRuby
 
     belongs_to :licensor , class_name: 'JamRuby::JamTrackLicensor', foreign_key: 'licensor_id', :inverse_of => :jam_tracks
 
-    has_many :genres_jam_tracks, :class_name => "JamRuby::GenreJamTrack", :foreign_key => "jam_track_id"
+    has_many :genres_jam_tracks, :class_name => "JamRuby::GenreJamTrack", :foreign_key => "jam_track_id", inverse_of: :jam_track
     has_many :genres, :through => :genres_jam_tracks, :class_name => "JamRuby::Genre", :source => :genre
 
     has_many :jam_track_tracks, :class_name => "JamRuby::JamTrackTrack", order: 'track_type ASC, position ASC, part ASC, instrument_id ASC'
@@ -255,12 +256,12 @@ module JamRuby
             limit = options[:limit]
             limit ||= 20
             limit = limit.to_i
+            per_page = limit
           else
             limit = per_page
           end
  
           start = (page -1 )* per_page
-          limit = per_page
         else
           limit = options[:limit]
           limit ||= 20
@@ -340,14 +341,25 @@ module JamRuby
         query = query.where("jam_track_tracks.instrument_id = '#{options[:instrument]}' and jam_track_tracks.track_type != 'Master'") unless options[:instrument].blank?
         query = query.where("jam_tracks.sales_region = '#{options[:availability]}'") unless options[:availability].blank?
 
+        # FIXME:  n+1 queries for rights and genres
+        # query = query.includes([{ jam_track_tracks: :instrument }, 
+        #                         :jam_track_tap_ins,
+        #                         :jam_track_rights,
+        #                         :genres])
+                                # { genres_jam_tracks: :genre }, 
+        query = query.includes([{ jam_track_tracks: :instrument }, 
+                                { genres_jam_tracks: :genre },
+                                :jam_track_tap_ins])
+
+        objs = query.all
         count = query.total_entries
 
         if count == 0
-          [query, nil, count]
-        elsif query.length < limit
-          [query, nil, count]
+          [objs, nil, count]
+        elsif objs.length < limit
+          [objs, nil, count]
         else
-          [query, start + limit, count]
+          [objs, start + limit, count]
         end
       end