diff options
Diffstat (limited to 'app/services/groups/destroy_service.rb')
| -rw-r--r-- | app/services/groups/destroy_service.rb | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/app/services/groups/destroy_service.rb b/app/services/groups/destroy_service.rb index 45e8972213e..35163efc587 100644 --- a/app/services/groups/destroy_service.rb +++ b/app/services/groups/destroy_service.rb @@ -35,7 +35,7 @@ module Groups user_ids_for_project_authorizations_refresh = obtain_user_ids_for_project_authorizations_refresh - destroy_group_bots + destroy_associated_users group.destroy @@ -82,9 +82,9 @@ module Groups end # rubocop:disable CodeReuse/ActiveRecord - def destroy_group_bots - bot_ids = group.members_and_requesters.joins(:user).merge(User.project_bot).pluck(:user_id) + def destroy_associated_users current_user_id = current_user.id + bot_ids = users_to_destroy group.run_after_commit do bot_ids.each do |user_id| @@ -94,6 +94,12 @@ module Groups end # rubocop:enable CodeReuse/ActiveRecord + # rubocop:disable CodeReuse/ActiveRecord + def users_to_destroy + group.members_and_requesters.joins(:user).merge(User.project_bot).pluck(:user_id) + end + # rubocop:enable CodeReuse/ActiveRecord + def publish_event event = Groups::GroupDeletedEvent.new( data: { |