diff --git a/ruby/lib/jam_ruby/models/user.rb b/ruby/lib/jam_ruby/models/user.rb index 63b24f471..1c4f49700 100644 --- a/ruby/lib/jam_ruby/models/user.rb +++ b/ruby/lib/jam_ruby/models/user.rb @@ -1091,8 +1091,8 @@ module JamRuby end def top_followings - @topf ||= User.joins("INNER JOIN follows ON follows.user_id = users.id AND follows.followable_type = '#{self.class.to_s}'") - .where(['follows.followable_id = ?',self.id]) + @topf ||= User.joins("INNER JOIN follows ON follows.followable_id = users.id AND follows.followable_type = '#{self.class.to_s}'") + .where(['follows.user_id = ?', self.id]) .order('follows.created_at DESC') .limit(3) end diff --git a/web/spec/requests/musician_search_api_spec.rb b/web/spec/requests/musician_search_api_spec.rb index 7cf8becd3..a6c7a3381 100644 --- a/web/spec/requests/musician_search_api_spec.rb +++ b/web/spec/requests/musician_search_api_spec.rb @@ -82,33 +82,18 @@ describe "Musician Search API", :type => :api do f3.followable = @user4 f3.save - # @user3 - f4 = Follow.new - f4.user = @user3 - f4.followable = @user3 - f4.save - f5 = Follow.new f5.user = @user4 f5.followable = @user3 f5.save - # @user2 - f6 = Follow.new - f6.user = @user1 - f6.followable = @user2 - f6.save - - # @user4.followers.concat([@user2, @user3, @user4]) - # @user3.followers.concat([@user3, @user4]) - # @user2.followers.concat([@user4]) expect(@user4.followers.count).to be 3 get_query good_response musician = json["musicians"][0] expect(musician["id"]).to eq(@user4.id) followings = musician['followings'] - expect(followings.length).to be 3 + expect(followings.length).to be 2 expect(musician['follow_count'].to_i).to be > 0 end