Refactor GroupIssuableResolver module

Adds the arguments when included since these are expected to be always
present for group issuables

app/graphql/resolvers/concerns/group_issuable_resolver.rb

@@ -3,19 +3,21 @@
 module GroupIssuableResolver
   extend ActiveSupport::Concern
 
-  class_methods do
-    def include_subgroups(name_of_things)
+  included do
     argument :include_subgroups, GraphQL::Types::Boolean,
               required: false,
               default_value: false,
-               description: "Include #{name_of_things} belonging to subgroups"
-    end
+              description: "Include #{issuable_collection_name} belonging to subgroups"
 
-    def non_archived(name_of_things)
     argument :non_archived, GraphQL::Types::Boolean,
               required: false,
               default_value: true,
-               description: "Return #{name_of_things} from non archived projects"
+              description: "Return #{issuable_collection_name} from non archived projects"
   end
+
+  def resolve(**args)
+    args[:non_archived] = !args.delete(:include_archived)
+
+    super
   end
 end

app/graphql/resolvers/group_issues_resolver.rb

@@ -3,10 +3,11 @@
 
 module Resolvers
   class GroupIssuesResolver < BaseIssuesResolver
-    include GroupIssuableResolver
+    def self.issuable_collection_name
+      'issues'
+    end
 
-    include_subgroups 'issues'
-    non_archived 'issues'
+    include GroupIssuableResolver
 
     def ready?(**args)
       if args.dig(:not, :release_tag).present?

app/graphql/resolvers/group_merge_requests_resolver.rb

@@ -2,14 +2,16 @@
 
 module Resolvers
   class GroupMergeRequestsResolver < MergeRequestsResolver
+    def self.issuable_collection_name
+      'merge requests'
+    end
+
     include GroupIssuableResolver
 
     alias_method :group, :object
 
     type Types::MergeRequestType.connection_type, null: true
 
-    include_subgroups 'merge requests'
-    non_archived 'merge requests'
     accept_assignee
     accept_author