Merge branch '391465_rename_project_param_to_container' into 'master'

Refactor initializer arguments for Issuable::DestroyService

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/111813



Merged-by: Jan Provaznik <jprovaznik@gitlab.com>
Approved-by: Mario Celi <mcelicalderon@gitlab.com>
Approved-by: Jan Provaznik <jprovaznik@gitlab.com>
Co-authored-by: Alexandru Croitor <acroitor@gitlab.com>

app/controllers/concerns/issuable_actions.rb

@@ -90,7 +90,7 @@ def realtime_changes
   end
   def destroy
-    Issuable::DestroyService.new(project: issuable.project, current_user: current_user).execute(issuable)
+    Issuable::DestroyService.new(container: issuable.project, current_user: current_user).execute(issuable)
     name = issuable.human_class_name
     flash[:notice] = "The #{name} was successfully deleted."

app/graphql/mutations/work_items/delete.rb

@@ -20,7 +20,7 @@ def resolve(id:)
         work_item = authorized_find!(id: id)
         result = ::WorkItems::DeleteService.new(
-          project: work_item.project,
+          container: work_item.project,
           current_user: current_user
         ).execute(work_item)

app/services/issuable/destroy_service.rb

@@ -2,6 +2,11 @@
 module Issuable
   class DestroyService < IssuableBaseService
+    # TODO: this is to be removed once we get to rename the IssuableBaseService project param to container
+    def initialize(container:, current_user: nil, params: {})
+      super(project: container, current_user: current_user, params: params)
+    end
+
     def execute(issuable)
       after_destroy(issuable) if issuable.destroy
     end

app/services/work_items/delete_task_service.rb

@@ -25,7 +25,7 @@ def execute
         break ::ServiceResponse.error(message: replacement_result.errors, http_status: 422) if replacement_result.error?
         delete_result = ::WorkItems::DeleteService.new(
-          project: @task.project,
+          container: @task.project,
           current_user: @current_user
         ).execute(@task)

doc/user/project/merge_requests/index.md

@@ -378,5 +378,5 @@ with a backup of the instance ready to be restored, just in case.
 u = User.find_by_username('<username>')
 p = Project.find_by_full_path('<namespace/project>')
 m = p.merge_requests.find_by(iid: <iid>)
-Issuable::DestroyService.new(project: m.project, current_user: u).execute(m)
+Issuable::DestroyService.new(container: m.project, current_user: u).execute(m)
 ```

ee/lib/api/epics.rb

@@ -332,7 +332,7 @@ class Epics < ::API::Base
       delete ':id/(-/)epics/:epic_iid' do
         authorize_can_destroy!
-        Issuable::DestroyService.new(project: nil, current_user: current_user).execute(epic)
+        Issuable::DestroyService.new(container: nil, current_user: current_user).execute(epic)
       end
     end
   end

ee/spec/services/ee/issuable/destroy_service_spec.rb

@@ -5,7 +5,7 @@
 RSpec.describe Issuable::DestroyService do
   let_it_be(:user) { create(:user) }
-  subject(:service) { described_class.new(project: nil, current_user: user) }
+  subject(:service) { described_class.new(container: nil, current_user: user) }
   describe '#execute' do
     context 'when destroying an epic' do

lib/api/issues.rb

@@ -424,7 +424,7 @@ class Issues < ::API::Base
         authorize!(:destroy_issue, issue)
         destroy_conditionally!(issue) do |issue|
-          Issuable::DestroyService.new(project: user_project, current_user: current_user).execute(issue)
+          Issuable::DestroyService.new(container: user_project, current_user: current_user).execute(issue)
         end
       end
       # rubocop: enable CodeReuse/ActiveRecord

lib/api/merge_requests.rb

@@ -312,7 +312,7 @@ def recheck_mergeability_of(merge_requests:)
         authorize!(:destroy_merge_request, merge_request)
         destroy_conditionally!(merge_request) do |merge_request|
-          Issuable::DestroyService.new(project: user_project, current_user: current_user).execute(merge_request)
+          Issuable::DestroyService.new(container: user_project, current_user: current_user).execute(merge_request)
         end
       end

spec/services/issuable/destroy_service_spec.rb

@@ -7,7 +7,7 @@
   let(:group) { create(:group, :public) }
   let(:project) { create(:project, :public, group: group) }
-  subject(:service) { described_class.new(project: project, current_user: user) }
+  subject(:service) { described_class.new(container: project, current_user: user) }
   describe '#execute' do
     context 'when issuable is an issue' do

spec/services/work_items/delete_service_spec.rb

@@ -16,7 +16,7 @@
   end
   describe '#execute' do
-    subject(:result) { described_class.new(project: project, current_user: user).execute(work_item) }
+    subject(:result) { described_class.new(container: project, current_user: user).execute(work_item) }
     context 'when user can delete the work item' do
       it { is_expected.to be_success }