4 files changed, 11 insertions, 18 deletions
diff --git a/app/graphql/mutations/award_emojis/add.rb b/app/graphql/mutations/award_emojis/add.rb
index 856fdd5fb14..e7ee2ec4fad 100644
--- a/app/graphql/mutations/award_emojis/add.rb
+++ b/app/graphql/mutations/award_emojis/add.rb
@@ -8,8 +8,6 @@ module Mutations
       def resolve(args)
         awardable = authorized_find!(id: args[:awardable_id])
 
-        check_object_is_awardable!(awardable)
-
         service = ::AwardEmojis::AddService.new(awardable, args[:name], current_user).execute
 
         {
diff --git a/app/graphql/mutations/award_emojis/base.rb b/app/graphql/mutations/award_emojis/base.rb
index df6b883529e..4bd8304c3fc 100644
--- a/app/graphql/mutations/award_emojis/base.rb
+++ b/app/graphql/mutations/award_emojis/base.rb
@@ -3,12 +3,16 @@
 module Mutations
   module AwardEmojis
     class Base < BaseMutation
+      include ::Mutations::FindsByGid
+
+      NOT_EMOJI_AWARDABLE = 'You cannot award emoji to this resource.'
+
       authorize :award_emoji
 
       argument :awardable_id,
                ::Types::GlobalIDType[::Awardable],
                required: true,
-               description: 'The global id of the awardable resource'
+               description: 'The global ID of the awardable resource'
 
       argument :name,
                GraphQL::STRING_TYPE,
@@ -22,20 +26,15 @@ module Mutations
 
       private
 
+      # TODO: remove this method when the compatibility layer is removed
+      # See: https://gitlab.com/gitlab-org/gitlab/-/issues/257883
       def find_object(id:)
-        # TODO: remove this line when the compatibility layer is removed
-        # See: https://gitlab.com/gitlab-org/gitlab/-/issues/257883
-        id = ::Types::GlobalIDType[::Awardable].coerce_isolated_input(id)
-        GitlabSchema.find_by_gid(id)
+        super(id: ::Types::GlobalIDType[::Awardable].coerce_isolated_input(id))
       end
 
-      # Called by mutations methods after performing an authorization check
-      # of an awardable object.
-      def check_object_is_awardable!(object)
-        unless object.is_a?(Awardable) && object.emoji_awardable?
-          raise Gitlab::Graphql::Errors::ResourceNotAvailable,
-                'Cannot award emoji to this resource'
-        end
+      def authorize!(object)
+        super
+        raise_resource_not_available_error!(NOT_EMOJI_AWARDABLE) unless object.emoji_awardable?
       end
     end
   end
diff --git a/app/graphql/mutations/award_emojis/remove.rb b/app/graphql/mutations/award_emojis/remove.rb
index c654688c6dc..a9655daeea7 100644
--- a/app/graphql/mutations/award_emojis/remove.rb
+++ b/app/graphql/mutations/award_emojis/remove.rb
@@ -8,8 +8,6 @@ module Mutations
       def resolve(args)
         awardable = authorized_find!(id: args[:awardable_id])
 
-        check_object_is_awardable!(awardable)
-
         service = ::AwardEmojis::DestroyService.new(awardable, args[:name], current_user).execute
 
         {
diff --git a/app/graphql/mutations/award_emojis/toggle.rb b/app/graphql/mutations/award_emojis/toggle.rb
index 679ec7a14ff..e741f972b1b 100644
--- a/app/graphql/mutations/award_emojis/toggle.rb
+++ b/app/graphql/mutations/award_emojis/toggle.rb
@@ -12,8 +12,6 @@ module Mutations
       def resolve(args)
         awardable = authorized_find!(id: args[:awardable_id])
 
-        check_object_is_awardable!(awardable)
-
         service = ::AwardEmojis::ToggleService.new(awardable, args[:name], current_user).execute
 
         toggled_on = awardable.awarded_emoji?(args[:name], current_user)