From bf59f4ac62da09bb932ce20dcb9575c98aeab4f5 Mon Sep 17 00:00:00 2001 From: Jonathan Kolyer Date: Thu, 17 Mar 2016 12:30:44 +0000 Subject: [PATCH] jtx ios batch purchase loading --- ruby/lib/jam_ruby/models/jam_track.rb | 2 +- web/app/controllers/api_jam_tracks_controller.rb | 2 +- web/app/views/api_jam_tracks/show_for_mobile.rabl | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ruby/lib/jam_ruby/models/jam_track.rb b/ruby/lib/jam_ruby/models/jam_track.rb index 0477d631a..1ad7fb09d 100644 --- a/ruby/lib/jam_ruby/models/jam_track.rb +++ b/ruby/lib/jam_ruby/models/jam_track.rb @@ -255,7 +255,7 @@ module JamRuby {artists: artists, songs:songs} end - def purchases_metadata(user) + def purchase_stubs(user) JamTrack. select(['jam_tracks.id', :name, :original_artist, :year, 'jam_track_rights.created_at AS purchased_at']). joins(:jam_track_rights). diff --git a/web/app/controllers/api_jam_tracks_controller.rb b/web/app/controllers/api_jam_tracks_controller.rb index 8b173a8a6..5bfae3f8c 100644 --- a/web/app/controllers/api_jam_tracks_controller.rb +++ b/web/app/controllers/api_jam_tracks_controller.rb @@ -143,7 +143,7 @@ class ApiJamTracksController < ApiController return end if params[:mobile] - @jam_tracks = JamTrack.purchases_metadata(current_user).to_a + @jam_tracks = JamTrack.purchase_stubs(current_user).to_a response.headers['total-entries'] = @jam_tracks.count.to_s render "api_jam_tracks/purchased_mobile", :layout => nil return diff --git a/web/app/views/api_jam_tracks/show_for_mobile.rabl b/web/app/views/api_jam_tracks/show_for_mobile.rabl index 58a877938..79b5183c7 100644 --- a/web/app/views/api_jam_tracks/show_for_mobile.rabl +++ b/web/app/views/api_jam_tracks/show_for_mobile.rabl @@ -3,5 +3,5 @@ object @jam_track attributes :id, :name, :original_artist, :year, :genre_name node :purchased_at do |jt| - Time.parse(jt.purchased_at).to_i rescue Time.now + Time.parse(jt.purchased_at).to_i rescue Time.now.to_i end