From c07244a4e69be0e448ede7cadf8ef1d283e684f4 Mon Sep 17 00:00:00 2001
From: Vikhyat Korrapati <vikhyatk@gmail.com>
Date: Wed, 14 May 2014 21:01:41 +0530
Subject: [PATCH] Refactor BadgeGranter.update_trust_level_badges! ->
 update_badges.

---
 app/models/user.rb                  |  2 +-
 app/services/badge_granter.rb       | 25 ++++++++++++++-----------
 lib/boost_trust_level.rb            |  2 +-
 spec/services/badge_granter_spec.rb |  4 ++--
 4 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/app/models/user.rb b/app/models/user.rb
index e064afac344..a141fe15830 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -447,7 +447,7 @@ class User < ActiveRecord::Base
     transaction do
       self.save!
       Group.user_trust_level_change!(self.id, self.trust_level)
-      BadgeGranter.update_trust_level_badges!(self)
+      BadgeGranter.update_badges(self, trust_level: trust_level)
     end
   end
 
diff --git a/app/services/badge_granter.rb b/app/services/badge_granter.rb
index fb0e07a7c75..7fc2ff14932 100644
--- a/app/services/badge_granter.rb
+++ b/app/services/badge_granter.rb
@@ -56,17 +56,20 @@ class BadgeGranter
     end
   end
 
-
-  def self.update_trust_level_badges!(user)
-    Badge.trust_level_badge_ids.each do |badge_id|
-      user_badge = UserBadge.where(user_id: user.id, badge_id: badge_id).first
-      if user_badge
-        # Revoke the badge if the user is not supposed to have it.
-        BadgeGranter.revoke(user_badge) if user.trust_level < badge_id
-      else
-        # Grant the badge if the user is supposed to have it.
-        badge = Badge.find(badge_id)
-        BadgeGranter.grant(badge, user) if user.trust_level >= badge_id
+  def self.update_badges(user, opts={})
+    if opts.has_key?(:trust_level)
+      # Update trust level badges.
+      trust_level = opts[:trust_level]
+      Badge.trust_level_badge_ids.each do |badge_id|
+        user_badge = UserBadge.find_by(user_id: user.id, badge_id: badge_id)
+        if user_badge
+          # Revoke the badge if trust level was lowered.
+          BadgeGranter.revoke(user_badge) if trust_level < badge_id
+        else
+          # Grant the badge if trust level was increased.
+          badge = Badge.find(badge_id)
+          BadgeGranter.grant(badge, user) if trust_level >= badge_id
+        end
       end
     end
   end
diff --git a/lib/boost_trust_level.rb b/lib/boost_trust_level.rb
index e36eab8b4ca..87ea55f1355 100644
--- a/lib/boost_trust_level.rb
+++ b/lib/boost_trust_level.rb
@@ -18,7 +18,7 @@ class BoostTrustLevel
                 @user.update_attributes!(trust_level: @level)
               end
     @logger.log_trust_level_change(@user, previous_level, @level)
-    BadgeGranter.update_trust_level_badges!(@user)
+    BadgeGranter.update_badges(@user, trust_level: @level)
     success
   end
 
diff --git a/spec/services/badge_granter_spec.rb b/spec/services/badge_granter_spec.rb
index b441097a8d4..d155eb17530 100644
--- a/spec/services/badge_granter_spec.rb
+++ b/spec/services/badge_granter_spec.rb
@@ -76,12 +76,12 @@ describe BadgeGranter do
     let(:logger) { StaffActionLogger.new(Fabricate(:admin)) }
 
     it "is called by User#change_trust_level!" do
-      BadgeGranter.expects(:update_trust_level_badges!)
+      BadgeGranter.expects(:update_badges)
       user.change_trust_level!(:basic)
     end
 
     it "is called by BoostTrustLevel#save!" do
-      BadgeGranter.expects(:update_trust_level_badges!)
+      BadgeGranter.expects(:update_badges)
       BoostTrustLevel.new(user: user, level: 1, logger: logger).save!
     end