Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2274 from vikhyat/badge-system 

Fix user_badges n+1 query
This commit is contained in:
Régis Hanol 2014-04-17 21:05:48 +02:00
parent 890e53cd6e 843023d7c9
commit bda47c2bf8
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/controllers/user_badges_controller.rb
View File

@ -6,8 +6,9 @@ class UserBadgesController < ApplicationController
user_badges = user.user_badges user_badges = user.user_badges
else else
badge = fetch_badge_from_params badge = fetch_badge_from_params
user_badges = badge.user_badges.order('granted_at DESC').limit(200).to_a user_badges = badge.user_badges.order('granted_at DESC').limit(200)
end end
user_badges = user_badges.includes(:user, :granted_by, badge: :badge_type)
render_serialized(user_badges, UserBadgeSerializer, root: "user_badges") render_serialized(user_badges, UserBadgeSerializer, root: "user_badges")
end end

2
app/models/user.rb
View File

@ -497,7 +497,7 @@ class User < ActiveRecord::Base
end end
def featured_user_badges def featured_user_badges
user_badges.joins(:badge).order('badges.badge_type_id ASC, badges.grant_count ASC').includes(:granted_by, badge: :badge_type).limit(3) user_badges.joins(:badge).order('badges.badge_type_id ASC, badges.grant_count ASC').includes(:user, :granted_by, badge: :badge_type).limit(3)
end end
def self.count_by_signup_date(sinceDaysAgo=30) def self.count_by_signup_date(sinceDaysAgo=30)

2
app/serializers/user_badge_serializer.rb
View File

@ -1,7 +1,7 @@
class UserBadgeSerializer < ApplicationSerializer class UserBadgeSerializer < ApplicationSerializer
attributes :id, :granted_at attributes :id, :granted_at
has_one :user
has_one :badge has_one :badge
has_one :user, serializer: BasicUserSerializer, root: :users
has_one :granted_by, serializer: BasicUserSerializer, root: :users has_one :granted_by, serializer: BasicUserSerializer, root: :users
end end