Open Source Platform for DTC, B2B Commerce, Marketplaces & Omnichannel. REST APIs, TypeScript SDKs, and production-ready Next.js storefront. Self-host it. Own your data. No vendor lock-in. Zero platform fees.
Ruby b2b-commercee-commerceecommerceecommerce-apiecommerce-frameworkecommerce-platformheadlessheadless-commerceheadless-ecommercemarketplacemulti-tenantmulti-vendormulti-vendor-ecommerceopen-sourcespree-commerce
Move the `before_destroy` callback logic to the `can_be_deleted?` for admin users (#13152)
Łukasz Adamczyk063e7405a10d
diff --git a/admin/spec/controllers/spree/admin/admin_users_controller_spec.rb b/admin/spec/controllers/spree/admin/admin_users_controller_spec.rbindex 58984fbfbb..dae3426ffe 100644--- a/admin/spec/controllers/spree/admin/admin_users_controller_spec.rb+++ b/admin/spec/controllers/spree/admin/admin_users_controller_spec.rb@@ -279,7 +279,6 @@ RSpec.describe Spree::Admin::AdminUsersController, type: :controller doit 'does not delete the admin user' dodelete :destroy, params: { id: admin_user.id }expect(response).to redirect_to(spree.admin_admin_users_path)- expect(flash[:error]).to include ('Cannot delete the last admin user')expect(admin_user).not_to be_destroyedendenddiff --git a/core/app/models/concerns/spree/admin_user_methods.rb b/core/app/models/concerns/spree/admin_user_methods.rbindex 1aad07c978..c73ca5ea4f 100644--- a/core/app/models/concerns/spree/admin_user_methods.rb+++ b/core/app/models/concerns/spree/admin_user_methods.rb@@ -17,7 +17,6 @@ module Spreehas_many :exports, class_name: 'Spree::Export', foreign_key: :user_id# Callbacks- before_destroy :check_if_there_are_other_admin_usersafter_destroy :nullify_approver_id_in_approved_ordersafter_destroy :cleanup_admin_user_resourcesend@@ -49,15 +48,5 @@ module Spreereports.destroy_allexports.destroy_allend-- def check_if_there_are_other_admin_users- return if self.class != Spree.admin_user_class- return unless has_spree_role?(Spree::Role::ADMIN_ROLE)-- if Spree::Store.current.users.where.not(id: id).none?- errors.add(:base, I18n.t('activerecord.errors.models.spree/admin_user.attributes.base.cannot_destroy_last_admin_user'))- throw(:abort)- end- endendenddiff --git a/core/app/models/concerns/spree/user_methods.rb b/core/app/models/concerns/spree/user_methods.rbindex e14d406d0f..8485118665 100644--- a/core/app/models/concerns/spree/user_methods.rb+++ b/core/app/models/concerns/spree/user_methods.rb@@ -137,7 +137,11 @@ module Spree# Returns true if the user can be deleted# @return [Boolean]def can_be_deleted?- orders.complete.none?+ if has_spree_role?(Spree::Role::ADMIN_ROLE)+ Spree::Store.current.users.where.not(id: id).exists?+ else+ orders.complete.none?+ endend# Returns the CSV row representation of the user@@ -156,7 +160,7 @@ module Spreeprivatedef check_completed_orders- raise Spree::Core::DestroyWithOrdersError if orders.complete.present?+ raise Spree::Core::DestroyWithOrdersError if !has_spree_role?(Spree::Role::ADMIN_ROLE) && orders.complete.present?enddef clone_billing_addressdiff --git a/core/config/locales/en.yml b/core/config/locales/en.ymlindex 155d610ef6..f663971ae6 100644--- a/core/config/locales/en.yml+++ b/core/config/locales/en.yml@@ -218,10 +218,6 @@ en:messages:blank: can't be blankmodels:- spree/admin_user:- attributes:- base:- cannot_destroy_last_admin_user: Cannot delete the last admin userspree/calculator/tiered_flat_rate:attributes:base:diff --git a/core/spec/models/spree/admin_user_spec.rb b/core/spec/models/spree/admin_user_spec.rbindex 860ab0eb37..e0c0b266fd 100644--- a/core/spec/models/spree/admin_user_spec.rb+++ b/core/spec/models/spree/admin_user_spec.rb@@ -3,14 +3,29 @@ require 'spec_helper'describe Spree::LegacyUser, type: :model dolet(:admin_user) { create(:admin_user) }- context 'Callbacks' do- describe 'do not allow to delete last admin user' do- it 'raises an error' do- admin_user- expect { admin_user.destroy! }.to raise_error(ActiveRecord::RecordNotDestroyed)+ describe '#can_be_deleted?' do+ subject { admin_user.can_be_deleted? }++ context 'when store has other admin users' do+ before do+ create(:admin_user)end++ it { is_expected.to be(true) }+ end++ context 'when store has no other admin users' do+ it { is_expected.to be(false) }end+ context 'when the user does not have admin role' do+ let(:admin_user) { create(:admin_user, without_admin_role: true) }++ it { is_expected.to be(true) }+ end+ end++ context 'Callbacks' dodescribe 'cleans up admin user resources' dolet!(:other_admin_user) { create(:admin_user) }let!(:cancelled_orders) { create_list(:order, 2, canceler: admin_user, state: 'canceled') }diff --git a/core/spec/models/spree/user_spec.rb b/core/spec/models/spree/user_spec.rbindex 670309855b..668f62cd13 100644--- a/core/spec/models/spree/user_spec.rb+++ b/core/spec/models/spree/user_spec.rb@@ -1,6 +1,22 @@require 'spec_helper'describe Spree::LegacyUser, type: :model do # rubocop:disable RSpec/MultipleDescribes+ describe '#can_be_deleted?' do+ subject { user.can_be_deleted? }++ context 'when user has completed orders' do+ let(:user) { create(:user, orders: [create(:order, completed_at: Time.current)]) }++ it { is_expected.to be(false) }+ end++ context 'when user has no completed orders' do+ let(:user) { create(:user, orders: [create(:order)]) }++ it { is_expected.to be(true) }+ end+ end+describe '#full_name' dolet(:user) { create(:user, first_name: 'John', last_name: 'Doe') }