diff options
Diffstat (limited to 'app/graphql/mutations')
30 files changed, 10 insertions, 153 deletions
diff --git a/app/graphql/mutations/award_emojis/base.rb b/app/graphql/mutations/award_emojis/base.rb index dc2d46269e6..65065de0de4 100644 --- a/app/graphql/mutations/award_emojis/base.rb +++ b/app/graphql/mutations/award_emojis/base.rb @@ -3,8 +3,6 @@ module Mutations module AwardEmojis class Base < BaseMutation - include ::Mutations::FindsByGid - NOT_EMOJI_AWARDABLE = 'You cannot award emoji to this resource.' authorize :award_emoji diff --git a/app/graphql/mutations/boards/update.rb b/app/graphql/mutations/boards/update.rb index 7cfce9d2d91..f611608d1b6 100644 --- a/app/graphql/mutations/boards/update.rb +++ b/app/graphql/mutations/boards/update.rb @@ -29,12 +29,6 @@ module Mutations errors: errors_on_object(board) } end - - private - - def find_object(id:) - GitlabSchema.find_by_gid(id) - end end end end diff --git a/app/graphql/mutations/ci/runner/delete.rb b/app/graphql/mutations/ci/runner/delete.rb index db68914a4eb..ba309ca754d 100644 --- a/app/graphql/mutations/ci/runner/delete.rb +++ b/app/graphql/mutations/ci/runner/delete.rb @@ -15,16 +15,12 @@ module Mutations description: 'ID of the runner to delete.' def resolve(id:, **runner_attrs) - runner = authorized_find!(id) + runner = authorized_find!(id: id) ::Ci::Runners::UnregisterRunnerService.new(runner, current_user).execute { errors: runner.errors.full_messages } end - - def find_object(id) - GitlabSchema.find_by_gid(id) - end end end end diff --git a/app/graphql/mutations/ci/runner/update.rb b/app/graphql/mutations/ci/runner/update.rb index 70f08e03553..00865b177a8 100644 --- a/app/graphql/mutations/ci/runner/update.rb +++ b/app/graphql/mutations/ci/runner/update.rb @@ -27,7 +27,7 @@ module Mutations description: 'Runner after mutation.' def resolve(id:, **runner_attrs) - runner = authorized_find!(id) + runner = authorized_find!(id: id) associated_projects_ids = runner_attrs.delete(:associated_projects) @@ -40,10 +40,6 @@ module Mutations response end - def find_object(id) - GitlabSchema.find_by_gid(id) - end - private def associate_runner_projects(response, runner, associated_project_ids) diff --git a/app/graphql/mutations/clusters/agent_tokens/create.rb b/app/graphql/mutations/clusters/agent_tokens/create.rb index 1b104652bd2..e717ff4d798 100644 --- a/app/graphql/mutations/clusters/agent_tokens/create.rb +++ b/app/graphql/mutations/clusters/agent_tokens/create.rb @@ -54,12 +54,6 @@ module Mutations errors: Array.wrap(result.message) } end - - private - - def find_object(id:) - GitlabSchema.find_by_gid(id) - end end end end diff --git a/app/graphql/mutations/clusters/agent_tokens/revoke.rb b/app/graphql/mutations/clusters/agent_tokens/revoke.rb index 6e988799921..c4187746464 100644 --- a/app/graphql/mutations/clusters/agent_tokens/revoke.rb +++ b/app/graphql/mutations/clusters/agent_tokens/revoke.rb @@ -21,12 +21,6 @@ module Mutations { errors: errors_on_object(token) } end - - private - - def find_object(id:) - GitlabSchema.find_by_gid(id) - end end end end diff --git a/app/graphql/mutations/clusters/agents/delete.rb b/app/graphql/mutations/clusters/agents/delete.rb index fb482e02794..ddb4e36a68e 100644 --- a/app/graphql/mutations/clusters/agents/delete.rb +++ b/app/graphql/mutations/clusters/agents/delete.rb @@ -24,12 +24,6 @@ module Mutations errors: Array.wrap(result.message) } end - - private - - def find_object(id:) - GitlabSchema.find_by_gid(id) - end end end end diff --git a/app/graphql/mutations/concerns/mutations/finds_by_gid.rb b/app/graphql/mutations/concerns/mutations/finds_by_gid.rb deleted file mode 100644 index 157f87a413d..00000000000 --- a/app/graphql/mutations/concerns/mutations/finds_by_gid.rb +++ /dev/null @@ -1,9 +0,0 @@ -# frozen_string_literal: true - -module Mutations - module FindsByGid - def find_object(id:) - GitlabSchema.find_by_gid(id) - end - end -end diff --git a/app/graphql/mutations/container_repositories/destroy_base.rb b/app/graphql/mutations/container_repositories/destroy_base.rb index 1c2c4d87a5f..46851c15702 100644 --- a/app/graphql/mutations/container_repositories/destroy_base.rb +++ b/app/graphql/mutations/container_repositories/destroy_base.rb @@ -4,12 +4,6 @@ module Mutations module ContainerRepositories class DestroyBase < Mutations::BaseMutation include ::Mutations::PackageEventable - - private - - def find_object(id:) - GitlabSchema.find_by_gid(id) - end end end end diff --git a/app/graphql/mutations/design_management/update.rb b/app/graphql/mutations/design_management/update.rb index 5dc20730a90..67732b70f29 100644 --- a/app/graphql/mutations/design_management/update.rb +++ b/app/graphql/mutations/design_management/update.rb @@ -28,12 +28,6 @@ module Mutations errors: errors_on_object(design) } end - - private - - def find_object(id:) - GitlabSchema.find_by_gid(id) - end end end end diff --git a/app/graphql/mutations/discussions/toggle_resolve.rb b/app/graphql/mutations/discussions/toggle_resolve.rb index fce6e4f416f..dc5731add3a 100644 --- a/app/graphql/mutations/discussions/toggle_resolve.rb +++ b/app/graphql/mutations/discussions/toggle_resolve.rb @@ -53,10 +53,6 @@ module Mutations end end - def find_object(id:) - GitlabSchema.find_by_gid(id) - end - def resolve!(discussion) ::Discussions::ResolveService.new( discussion.project, diff --git a/app/graphql/mutations/environments/canary_ingress/update.rb b/app/graphql/mutations/environments/canary_ingress/update.rb index 1cddfdd815b..43e9b6c0881 100644 --- a/app/graphql/mutations/environments/canary_ingress/update.rb +++ b/app/graphql/mutations/environments/canary_ingress/update.rb @@ -35,10 +35,6 @@ module Mutations { errors: Array.wrap(result[:message]) } end - def find_object(id:) - GitlabSchema.find_by_gid(id) - end - private def certificate_based_clusters_enabled? diff --git a/app/graphql/mutations/metrics/dashboard/annotations/create.rb b/app/graphql/mutations/metrics/dashboard/annotations/create.rb index d458bdcf82b..225d313c487 100644 --- a/app/graphql/mutations/metrics/dashboard/annotations/create.rb +++ b/app/graphql/mutations/metrics/dashboard/annotations/create.rb @@ -83,10 +83,6 @@ module Mutations super(**args) end - def find_object(id:) - GitlabSchema.find_by_gid(id) - end - def annotation_create_params(args) annotation_source = AnnotationSource.new(object: annotation_source(args)) diff --git a/app/graphql/mutations/notes/base.rb b/app/graphql/mutations/notes/base.rb index fb74805db17..d656835c335 100644 --- a/app/graphql/mutations/notes/base.rb +++ b/app/graphql/mutations/notes/base.rb @@ -13,12 +13,6 @@ module Mutations Types::Notes::NoteType, null: true, description: 'Note after mutation.' - - private - - def find_object(id:) - GitlabSchema.find_by_gid(id) - end end end end diff --git a/app/graphql/mutations/notes/create/base.rb b/app/graphql/mutations/notes/create/base.rb index f48e62af767..69cd1426218 100644 --- a/app/graphql/mutations/notes/create/base.rb +++ b/app/graphql/mutations/notes/create/base.rb @@ -47,10 +47,6 @@ module Mutations private - def find_object(id:) - GitlabSchema.find_by_gid(id) - end - def create_note_params(noteable, args) { noteable: noteable, diff --git a/app/graphql/mutations/packages/destroy.rb b/app/graphql/mutations/packages/destroy.rb index a398b1ff9dc..95832ec8b85 100644 --- a/app/graphql/mutations/packages/destroy.rb +++ b/app/graphql/mutations/packages/destroy.rb @@ -23,12 +23,6 @@ module Mutations errors: errors } end - - private - - def find_object(id:) - GitlabSchema.find_by_gid(id) - end end end end diff --git a/app/graphql/mutations/packages/destroy_file.rb b/app/graphql/mutations/packages/destroy_file.rb index f2a8f2b853a..c7dd2df704e 100644 --- a/app/graphql/mutations/packages/destroy_file.rb +++ b/app/graphql/mutations/packages/destroy_file.rb @@ -21,12 +21,6 @@ module Mutations { errors: package_file.errors.full_messages } end - - private - - def find_object(id:) - GitlabSchema.find_by_gid(id) - end end end end diff --git a/app/graphql/mutations/release_asset_links/delete.rb b/app/graphql/mutations/release_asset_links/delete.rb index 9a75b472411..891d8e5a4d8 100644 --- a/app/graphql/mutations/release_asset_links/delete.rb +++ b/app/graphql/mutations/release_asset_links/delete.rb @@ -19,7 +19,7 @@ module Mutations description: 'Deleted release asset link.' def resolve(id:) - link = authorized_find!(id) + link = authorized_find!(id: id) result = ::Releases::Links::DestroyService .new(link.release, current_user) @@ -31,10 +31,6 @@ module Mutations { link: nil, errors: result.message } end end - - def find_object(id) - GitlabSchema.find_by_gid(id) - end end end end diff --git a/app/graphql/mutations/release_asset_links/update.rb b/app/graphql/mutations/release_asset_links/update.rb index 2e9054c290d..3df2d28b88c 100644 --- a/app/graphql/mutations/release_asset_links/update.rb +++ b/app/graphql/mutations/release_asset_links/update.rb @@ -44,7 +44,7 @@ module Mutations end def resolve(id:, **link_attrs) - link = authorized_find!(id) + link = authorized_find!(id: id) result = ::Releases::Links::UpdateService .new(link.release, current_user, link_attrs) @@ -56,10 +56,6 @@ module Mutations { link: nil, errors: result.message } end end - - def find_object(id) - GitlabSchema.find_by_gid(id) - end end end end diff --git a/app/graphql/mutations/terraform/state/base.rb b/app/graphql/mutations/terraform/state/base.rb index 01f69934ea3..9a264836ef5 100644 --- a/app/graphql/mutations/terraform/state/base.rb +++ b/app/graphql/mutations/terraform/state/base.rb @@ -10,12 +10,6 @@ module Mutations Types::GlobalIDType[::Terraform::State], required: true, description: 'Global ID of the Terraform state.' - - private - - def find_object(id:) - GitlabSchema.find_by_gid(id) - end end end end diff --git a/app/graphql/mutations/todos/base.rb b/app/graphql/mutations/todos/base.rb deleted file mode 100644 index 9a94c5d1e6d..00000000000 --- a/app/graphql/mutations/todos/base.rb +++ /dev/null @@ -1,13 +0,0 @@ -# frozen_string_literal: true - -module Mutations - module Todos - class Base < ::Mutations::BaseMutation - private - - def find_object(id:) - GitlabSchema.find_by_gid(id) - end - end - end -end diff --git a/app/graphql/mutations/todos/create.rb b/app/graphql/mutations/todos/create.rb index 489d2f490ff..8a0906da724 100644 --- a/app/graphql/mutations/todos/create.rb +++ b/app/graphql/mutations/todos/create.rb @@ -2,7 +2,7 @@ module Mutations module Todos - class Create < ::Mutations::Todos::Base + class Create < ::Mutations::BaseMutation graphql_name 'TodoCreate' authorize :create_todo @@ -17,7 +17,7 @@ module Mutations description: 'To-do item created.' def resolve(target_id:) - target = authorized_find!(target_id) + target = authorized_find!(id: target_id) todo = TodoService.new.mark_todo(target, current_user)&.first errors = errors_on_object(todo) if todo @@ -27,12 +27,6 @@ module Mutations errors: errors } end - - private - - def find_object(id) - GitlabSchema.find_by_gid(id) - end end end end diff --git a/app/graphql/mutations/todos/mark_all_done.rb b/app/graphql/mutations/todos/mark_all_done.rb index fe4023515a4..7f8d15e033a 100644 --- a/app/graphql/mutations/todos/mark_all_done.rb +++ b/app/graphql/mutations/todos/mark_all_done.rb @@ -2,7 +2,7 @@ module Mutations module Todos - class MarkAllDone < ::Mutations::Todos::Base + class MarkAllDone < ::Mutations::BaseMutation graphql_name 'TodosMarkAllDone' authorize :update_user diff --git a/app/graphql/mutations/todos/mark_done.rb b/app/graphql/mutations/todos/mark_done.rb index 4fecba55242..05d69fbc969 100644 --- a/app/graphql/mutations/todos/mark_done.rb +++ b/app/graphql/mutations/todos/mark_done.rb @@ -2,7 +2,7 @@ module Mutations module Todos - class MarkDone < ::Mutations::Todos::Base + class MarkDone < ::Mutations::BaseMutation graphql_name 'TodoMarkDone' authorize :update_todo diff --git a/app/graphql/mutations/todos/restore.rb b/app/graphql/mutations/todos/restore.rb index def24cb71bc..a169ec58a9a 100644 --- a/app/graphql/mutations/todos/restore.rb +++ b/app/graphql/mutations/todos/restore.rb @@ -2,7 +2,7 @@ module Mutations module Todos - class Restore < ::Mutations::Todos::Base + class Restore < ::Mutations::BaseMutation graphql_name 'TodoRestore' authorize :update_todo diff --git a/app/graphql/mutations/todos/restore_many.rb b/app/graphql/mutations/todos/restore_many.rb index f2f944860c2..106ba18b852 100644 --- a/app/graphql/mutations/todos/restore_many.rb +++ b/app/graphql/mutations/todos/restore_many.rb @@ -2,7 +2,7 @@ module Mutations module Todos - class RestoreMany < ::Mutations::Todos::Base + class RestoreMany < ::Mutations::BaseMutation graphql_name 'TodoRestoreMany' MAX_UPDATE_AMOUNT = 50 diff --git a/app/graphql/mutations/work_items/create_from_task.rb b/app/graphql/mutations/work_items/create_from_task.rb index 4ef8269a42f..23ae09b23fd 100644 --- a/app/graphql/mutations/work_items/create_from_task.rb +++ b/app/graphql/mutations/work_items/create_from_task.rb @@ -46,12 +46,6 @@ module Mutations response end - - private - - def find_object(id:) - GitlabSchema.find_by_gid(id) - end end end end diff --git a/app/graphql/mutations/work_items/delete.rb b/app/graphql/mutations/work_items/delete.rb index ec0244fa65e..bce59448412 100644 --- a/app/graphql/mutations/work_items/delete.rb +++ b/app/graphql/mutations/work_items/delete.rb @@ -29,12 +29,6 @@ module Mutations errors: result.errors } end - - private - - def find_object(id:) - GitlabSchema.find_by_gid(id) - end end end end diff --git a/app/graphql/mutations/work_items/delete_task.rb b/app/graphql/mutations/work_items/delete_task.rb index 47ab3748ab4..b13d7e2e3bf 100644 --- a/app/graphql/mutations/work_items/delete_task.rb +++ b/app/graphql/mutations/work_items/delete_task.rb @@ -53,11 +53,6 @@ module Mutations raise_resource_not_available_error! end end - - # method used by `authorized_find!(id: id)` - def find_object(id:) - GitlabSchema.find_by_gid(id) - end end end end diff --git a/app/graphql/mutations/work_items/update.rb b/app/graphql/mutations/work_items/update.rb index 60b5536df56..3bcec7ebb1c 100644 --- a/app/graphql/mutations/work_items/update.rb +++ b/app/graphql/mutations/work_items/update.rb @@ -42,10 +42,6 @@ module Mutations private - def find_object(id:) - GitlabSchema.find_by_gid(id) - end - def interpret_quick_actions!(work_item, current_user, widget_params, attributes = {}) return unless work_item.work_item_type.widgets.include?(::WorkItems::Widgets::Description) |