Cleanup model checks

slovensko-digital · Dec 4, 2023 · 186746e · 186746e
1 parent 4cc123a
commit 186746e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 17 deletions.
diff --git a/app/models/group_membership.rb b/app/models/group_membership.rb
@@ -13,15 +13,4 @@ class GroupMembership < ApplicationRecord
 
   belongs_to :group
   belongs_to :user
-
-  before_destroy :validate_self_admin_removal, prepend: true
-
-  private
-
-  def validate_self_admin_removal
-    return unless group.type == 'AdminGroup' && user == Current.user
-
-    errors.add :base, "Administrátor nemôže odobrať administrátorské práva sám sebe"
-    throw :abort
-  end
 end
diff --git a/app/models/user.rb b/app/models/user.rb
@@ -24,7 +24,7 @@ class User < ApplicationRecord
   validates_presence_of :name, :email
   validates_uniqueness_of :name, :email, scope: :tenant_id, case_sensitive: false
 
-  before_destroy :before_destroy, prepend: true
+  before_destroy :delete_user_group, prepend: true
   after_create :handle_default_groups
 
   def site_admin?
@@ -41,11 +41,7 @@ def user_group
 
   private
 
-  def before_destroy
-    if self == Current.user
-      errors.add :name, "Administrátor nemôže zmazať sám seba"
-      throw :abort
-    end
+  def delete_user_group
     user_group.destroy
   end