Skip to content

deleted namespace when namespace holder is deleted #1119

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
raphael-goetz merged 4 commits into from
Jul 9, 2026
Merged

deleted namespace when namespace holder is deleted #1119

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2c9b951
fix: deleted namespace when namespace holder is deleted
raphael-goetz Jul 8, 2026
0ffd026
Apply suggestions from code review
raphael-goetz Jul 9, 2026
877e951
ref: made rubocop happy :D
raphael-goetz Jul 9, 2026
6ad9708
fix: correct audit events
raphael-goetz Jul 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion app/services/organizations/delete_service.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ def execute
end

transactional do |t|
namespace = organization.ensure_namespace

organization.delete

if organization.persisted?
Expand All @@ -25,12 +27,14 @@ def execute
details: organization.errors)
end

namespace.delete
Comment thread
raphael-goetz marked this conversation as resolved.

AuditService.audit(
:organization_deleted,
author_id: current_authentication.user.id,
entity: organization,
details: {},
target: organization.ensure_namespace
target: namespace
Comment thread
raphael-goetz marked this conversation as resolved.
Outdated
)

ServiceResponse.success(message: 'Organization deleted', payload: organization)
Expand Down
4 changes: 4 additions & 0 deletions app/services/users/delete_service.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ def execute
end

transactional do |t|
namespace = user.namespace

user.destroy

if user.persisted?
Expand All @@ -27,6 +29,8 @@ def execute
)
end

namespace&.delete
Comment thread
raphael-goetz marked this conversation as resolved.

AuditService.audit(
:user_deleted,
author_id: current_authentication.user.id,
Expand Down
4 changes: 4 additions & 0 deletions spec/services/organizations/delete_service_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,10 @@
it { expect(service_response.payload).to eq(organization) }
it { expect { service_response }.to change { Organization.count }.by(-1) }

it do
expect { service_response }.to change { Namespace.exists?(organization.namespace.id) }.from(true).to(false)
end

it do
expect { service_response }.to create_audit_event(
:organization_deleted,
Expand Down
5 changes: 5 additions & 0 deletions spec/services/users/delete_service_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,12 @@
let(:current_user) { create(:user, :admin) }

it 'deletes the user successfully' do
namespace_id = user.ensure_namespace.id

expect { service_response }.to change { User.exists?(user.id) }.from(true).to(false)
.and change {
Namespace.exists?(namespace_id)
}.from(true).to(false)
expect(service_response).to be_success
expect(service_response.payload).to eq(user)

Expand Down