From 2088403a16602a691ac061f7f75d9c37c7d2361b Mon Sep 17 00:00:00 2001 From: Harshith Date: Wed, 17 Dec 2025 13:03:22 +0530 Subject: [PATCH] Not archive projects when scheduling for deletion --- app/services/projects/mark_for_deletion_service.rb | 1 - app/services/projects/restore_service.rb | 1 - spec/services/projects/mark_for_deletion_service_spec.rb | 5 +++-- spec/services/projects/restore_service_spec.rb | 5 +++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/services/projects/mark_for_deletion_service.rb b/app/services/projects/mark_for_deletion_service.rb index 19ea4ab664f7a4..47b9057d28ef44 100644 --- a/app/services/projects/mark_for_deletion_service.rb +++ b/app/services/projects/mark_for_deletion_service.rb @@ -28,7 +28,6 @@ def execute_deletion def update_service_params { - archived: true, name: suffixed_identifier(resource.name), path: suffixed_identifier(resource.path), marked_for_deletion_at: Time.current, diff --git a/app/services/projects/restore_service.rb b/app/services/projects/restore_service.rb index fa786e06de90c7..e1b1cea84bc4d3 100644 --- a/app/services/projects/restore_service.rb +++ b/app/services/projects/restore_service.rb @@ -30,7 +30,6 @@ def rename_resource resource, current_user, { - archived: false, hidden: false, name: updated_value(resource.name), path: updated_value(resource.path), diff --git a/spec/services/projects/mark_for_deletion_service_spec.rb b/spec/services/projects/mark_for_deletion_service_spec.rb index 7c5aedfea95b7e..e8451d6eb03866 100644 --- a/spec/services/projects/mark_for_deletion_service_spec.rb +++ b/spec/services/projects/mark_for_deletion_service_spec.rb @@ -21,14 +21,15 @@ allow(notification_service).to receive(:project_scheduled_for_deletion).with(project) end - it 'marks project as archived and marked for deletion', :aggregate_failures do + it 'marks project for deletion without changing archived state', :aggregate_failures do + original_archived_state = project.archived expect(Namespaces::ScheduleAggregationWorker).to receive(:perform_async) .with(project.namespace_id).and_call_original expect(result).to be_success expect(Project.unscoped.all).to include(project) - expect(project.reload.archived).to be(false) + expect(project.reload.archived).to eq(original_archived_state) expect(project.reload).to be_self_deletion_scheduled expect(project.reload.self_deletion_scheduled_deletion_created_on).not_to be_nil expect(project.reload.deleting_user).to eq(user) diff --git a/spec/services/projects/restore_service_spec.rb b/spec/services/projects/restore_service_spec.rb index 6701b9c968a29b..02e135a2510b56 100644 --- a/spec/services/projects/restore_service_spec.rb +++ b/spec/services/projects/restore_service_spec.rb @@ -21,14 +21,15 @@ ) end - it 'marks project as unarchived and not marked for deletion' do + it 'restores project without changing archived state' do + original_archived_state = project.archived expect(Namespaces::ScheduleAggregationWorker).to receive(:perform_async) .with(project.namespace.id).and_call_original execute expect(Project.unscoped.all).to include(project) - expect(project.archived).to be(false) + expect(project.archived).to eq(original_archived_state) expect(project).not_to be_self_deletion_scheduled expect(project.self_deletion_scheduled_deletion_created_on).to be_nil expect(project.deleting_user).to be_nil -- GitLab