Refactor based on PR review

app/policies/admin/group_membership_policy.rb

@@ -19,14 +19,17 @@ def resolve
   end
 
   def create?
-    return false if !@user.site_admin? && !@user.admin?
+    return false unless @user.site_admin? || @user.admin?
     return false unless @group_membership.group.tenant == Current.tenant
     return false unless @group_membership.user.tenant == Current.tenant
 
     true
   end
 
   def destroy?
-    (@user.site_admin? || @user.admin?) && !(@group_membership.user == @user && @group_membership.group.type == 'AdminGroup')
+    return false unless @user.site_admin? || @user.admin?
+    return true unless @group_membership.user == @user && @group_membership.group.type == 'AdminGroup'
+
+    false
   end
 end

app/policies/admin/user_policy.rb

@@ -3,46 +3,49 @@
 class Admin::UserPolicy < ApplicationPolicy
   attr_reader :user
 
-  def initialize(user_logged_in, user_to_authorize)
-    @user = user_logged_in
+  def initialize(actor, user_to_authorize)
+    @actor = actor
     @user_to_authorize = user_to_authorize
   end
 
   class Scope < Scope
     def resolve
-      if @user.site_admin?
+      if @actor.site_admin?
         scope.all
       else
-        scope.where(tenant_id: @user.tenant_id)
+        scope.where(tenant_id: @actor.tenant_id)
       end
     end
   end
 
   def index?
-    @user.site_admin? || @user.admin?
+    @actor.site_admin? || @actor.admin?
   end
 
   def show?
-    @user.site_admin? || @user.admin?
+    @actor.site_admin? || @actor.admin?
   end
 
   def create?
-    @user.site_admin? || @user.admin?
+    @actor.site_admin? || @actor.admin?
   end
 
   def new?
     create?
   end
 
   def update?
-    @user.site_admin? || @user.admin?
+    @actor.site_admin? || @actor.admin?
   end
 
   def edit?
     update?
   end
 
   def destroy?
-    (@user.site_admin? || @user.admin?) && @user_to_authorize != @user
+    return false unless @actor.site_admin? || @actor.admin?
+    return true unless @user_to_authorize != @actor
+
+    false
   end
 end