Code style fixes and some code simplified

2 files changed, 12 insertions, 10 deletions

diff --git a/app/controllers/admin/identities_controller.rb b/app/controllers/admin/identities_controller.rb
index 9ba10487512..79a53556f0a 100644
--- a/app/controllers/admin/identities_controller.rb
+++ b/app/controllers/admin/identities_controller.rb
@@ -26,7 +26,7 @@ class Admin::IdentitiesController < Admin::ApplicationController
 
   def update
     if @identity.update_attributes(identity_params)
-      RepairLdapBlockedUserService.new(@user, @identity).execute
+      RepairLdapBlockedUserService.new(@user).execute
       redirect_to admin_user_identities_path(@user), notice: 'User identity was successfully updated.'
     else
       render :edit
@@ -35,7 +35,7 @@ class Admin::IdentitiesController < Admin::ApplicationController
 
   def destroy
     if @identity.destroy
-      RepairLdapBlockedUserService.new(@user, @identity).execute
+      RepairLdapBlockedUserService.new(@user).execute
       redirect_to admin_user_identities_path(@user), notice: 'User identity was successfully removed.'
     else
       redirect_to admin_user_identities_path(@user), alert: 'Failed to remove user identity.'
diff --git a/app/services/repair_ldap_blocked_user_service.rb b/app/services/repair_ldap_blocked_user_service.rb
index ceca15414e0..863cef7ff61 100644
--- a/app/services/repair_ldap_blocked_user_service.rb
+++ b/app/services/repair_ldap_blocked_user_service.rb
@@ -1,15 +1,17 @@
 class RepairLdapBlockedUserService
-  attr_accessor :user, :identity
+  attr_accessor :user
 
-  def initialize(user, identity)
-    @user, @identity = user, identity
+  def initialize(user)
+    @user = user
   end
 
   def execute
-    if identity.destroyed?
-      user.block if identity.is_ldap? && user.ldap_blocked? && !user.ldap_user?
-    else
-      user.block if !identity.is_ldap? && user.ldap_blocked? && !user.ldap_user?
-    end
+    user.block if ldap_hard_blocked?
+  end
+
+  private
+
+  def ldap_hard_blocked?
+    user.ldap_blocked? && !user.ldap_user?
   end
 end