From 0bf001ccd78fb1f670543b9b34d0db62b9d5ab44 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9gis=20Hanol?= <regis@hanol.fr>
Date: Wed, 30 Mar 2016 23:11:00 +0200
Subject: [PATCH] FIX: badge grant count wasn't filtered to the current user in
the user summary
---
app/controllers/user_badges_controller.rb | 2 +-
app/models/user.rb | 22 ++++++++++++++--------
2 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/app/controllers/user_badges_controller.rb b/app/controllers/user_badges_controller.rb
index c84e5ebe3d9..7c9cfb0bee7 100644
--- a/app/controllers/user_badges_controller.rb
+++ b/app/controllers/user_badges_controller.rb
@@ -33,7 +33,7 @@ class UserBadgesController < ApplicationController
if params[:grouped]
user_badges = user_badges.group(:badge_id)
- .select(UserBadge.attribute_names.map {|x| "MAX(#{x}) as #{x}" }, 'COUNT(*) as count')
+ .select(UserBadge.attribute_names.map {|x| "MAX(#{x}) AS #{x}" }, 'COUNT(*) AS "count"')
end
user_badges = user_badges.includes(badge: [:badge_grouping, :badge_type])
diff --git a/app/models/user.rb b/app/models/user.rb
index 9444fb8396f..8c9dde86180 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -662,19 +662,25 @@ class User < ActiveRecord::Base
def featured_user_badges(limit=3)
user_badges
+ .group(:badge_id)
+ .select(UserBadge.attribute_names.map { |x| "MAX(user_badges.#{x}) AS #{x}" },
+ 'COUNT(*) AS "count"',
+ 'MAX(badges.badge_type_id) AS badges_badge_type_id',
+ 'MAX(badges.grant_count) AS badges_grant_count')
.joins(:badge)
- .order("CASE WHEN badges.id = (SELECT MAX(ub2.badge_id) FROM user_badges ub2
- WHERE ub2.badge_id IN (#{Badge.trust_level_badge_ids.join(",")}) AND
- ub2.user_id = #{self.id}) THEN 1 ELSE 0 END DESC")
- .order('badges.badge_type_id ASC, badges.grant_count ASC')
- .includes(:user, :granted_by, badge: :badge_type)
- .where("user_badges.id in (select min(u2.id)
- from user_badges u2 where u2.user_id = ? group by u2.badge_id)", id)
+ .order("CASE WHEN user_badges.badge_id = (
+ SELECT MAX(ub2.badge_id)
+ FROM user_badges ub2
+ WHERE ub2.badge_id IN (#{Badge.trust_level_badge_ids.join(",")})
+ AND ub2.user_id = #{self.id}
+ ) THEN 1 ELSE 0 END DESC")
+ .order('badges_badge_type_id ASC, badges_grant_count ASC')
+ .includes(:user, :granted_by, { badge: :badge_type }, { post: :topic })
.limit(limit)
end
def self.count_by_signup_date(start_date, end_date, group_id=nil)
- result = where('users.created_at >= ? and users.created_at <= ?', start_date, end_date)
+ result = where('users.created_at >= ? AND users.created_at <= ?', start_date, end_date)
if group_id
result = result.joins("INNER JOIN group_users ON group_users.user_id = users.id")