Merge branch '56492-implement-new-arguments-state-closed_before-and-closed_after-for-issuesresolver-in-graphql' into 'master'

Implement new arguments `state`, `closed_before` and `closed_after` for `IssuesResolver` in GraphQL

Closes #56492

See merge request gitlab-org/gitlab-ce!24910

9 files changed, 79 insertions, 3 deletions

diff --git a/app/finders/issuable_finder.rb b/app/finders/issuable_finder.rb
index 23af2e0521c..5870f158690 100644
--- a/app/finders/issuable_finder.rb
+++ b/app/finders/issuable_finder.rb
@@ -94,6 +94,7 @@ class IssuableFinder
     items = by_scope(items)
     items = by_created_at(items)
     items = by_updated_at(items)
+    items = by_closed_at(items)
     items = by_state(items)
     items = by_group(items)
     items = by_assignee(items)
@@ -353,6 +354,13 @@ class IssuableFinder
     items
   end
 
+  def by_closed_at(items)
+    items = items.closed_after(params[:closed_after]) if params[:closed_after].present?
+    items = items.closed_before(params[:closed_before]) if params[:closed_before].present?
+
+    items
+  end
+
   # rubocop: disable CodeReuse/ActiveRecord
   def by_state(items)
     case params[:state].to_s
diff --git a/app/graphql/resolvers/issues_resolver.rb b/app/graphql/resolvers/issues_resolver.rb
index fd1b46ba860..b98d8bd1fff 100644
--- a/app/graphql/resolvers/issues_resolver.rb
+++ b/app/graphql/resolvers/issues_resolver.rb
@@ -9,7 +9,30 @@ module Resolvers
     argument :iids, [GraphQL::ID_TYPE],
               required: false,
               description: 'The list of IIDs of issues, e.g., [1, 2]'
-
+    argument :state, Types::IssuableStateEnum,
+              required: false,
+              description: "Current state of Issue"
+    argument :label_name, GraphQL::STRING_TYPE.to_list_type,
+              required: false,
+              description: "Labels applied to the Issue"
+    argument :created_before, Types::TimeType,
+              required: false,
+              description: "Issues created before this date"
+    argument :created_after, Types::TimeType,
+              required: false,
+              description: "Issues created after this date"
+    argument :updated_before, Types::TimeType,
+              required: false,
+              description: "Issues updated before this date"
+    argument :updated_after, Types::TimeType,
+              required: false,
+              description: "Issues updated after this date"
+    argument :closed_before, Types::TimeType,
+              required: false,
+              description: "Issues closed before this date"
+    argument :closed_after, Types::TimeType,
+              required: false,
+              description: "Issues closed after this date"
     argument :search, GraphQL::STRING_TYPE,
               required: false
     argument :sort, Types::Sort,
diff --git a/app/graphql/types/issuable_state_enum.rb b/app/graphql/types/issuable_state_enum.rb
new file mode 100644
index 00000000000..f2f6d6c6cab
--- /dev/null
+++ b/app/graphql/types/issuable_state_enum.rb
@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+module Types
+  class IssuableStateEnum < BaseEnum
+    graphql_name 'IssuableState'
+    description 'State of a GitLab issue or merge request'
+
+    value 'opened'
+    value 'closed'
+    value 'locked'
+  end
+end
diff --git a/app/graphql/types/issue_state_enum.rb b/app/graphql/types/issue_state_enum.rb
new file mode 100644
index 00000000000..6521407fc9d
--- /dev/null
+++ b/app/graphql/types/issue_state_enum.rb
@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+module Types
+  class IssueStateEnum < IssuableStateEnum
+    graphql_name 'IssueState'
+    description 'State of a GitLab issue'
+  end
+end
diff --git a/app/graphql/types/issue_type.rb b/app/graphql/types/issue_type.rb
index a8f2f7914a8..87f6b1f8278 100644
--- a/app/graphql/types/issue_type.rb
+++ b/app/graphql/types/issue_type.rb
@@ -11,7 +11,7 @@ module Types
     field :iid, GraphQL::ID_TYPE, null: false
     field :title, GraphQL::STRING_TYPE, null: false
     field :description, GraphQL::STRING_TYPE, null: true
-    field :state, GraphQL::STRING_TYPE, null: false
+    field :state, IssueStateEnum, null: false
 
     field :author, Types::UserType,
           null: false,
diff --git a/app/graphql/types/merge_request_state_enum.rb b/app/graphql/types/merge_request_state_enum.rb
new file mode 100644
index 00000000000..92f52726ab3
--- /dev/null
+++ b/app/graphql/types/merge_request_state_enum.rb
@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+module Types
+  class MergeRequestStateEnum < IssuableStateEnum
+    graphql_name 'MergeRequestState'
+    description 'State of a GitLab merge request'
+
+    value 'merged'
+  end
+end
diff --git a/app/graphql/types/merge_request_type.rb b/app/graphql/types/merge_request_type.rb
index 7e63d4022b1..7827b6e3717 100644
--- a/app/graphql/types/merge_request_type.rb
+++ b/app/graphql/types/merge_request_type.rb
@@ -12,7 +12,7 @@ module Types
     field :iid, GraphQL::ID_TYPE, null: false
     field :title, GraphQL::STRING_TYPE, null: false
     field :description, GraphQL::STRING_TYPE, null: true
-    field :state, GraphQL::STRING_TYPE, null: true
+    field :state, MergeRequestStateEnum, null: false
     field :created_at, Types::TimeType, null: false
     field :updated_at, Types::TimeType, null: false
     field :source_project, Types::ProjectType, null: true
diff --git a/app/models/concerns/closed_at_filterable.rb b/app/models/concerns/closed_at_filterable.rb
new file mode 100644
index 00000000000..239c2e47611
--- /dev/null
+++ b/app/models/concerns/closed_at_filterable.rb
@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module ClosedAtFilterable
+  extend ActiveSupport::Concern
+
+  included do
+    scope :closed_before, ->(date) { where(scoped_table[:closed_at].lteq(date)) }
+    scope :closed_after, ->(date) { where(scoped_table[:closed_at].gteq(date)) }
+
+    def self.scoped_table
+      arel_table.alias(table_name)
+    end
+  end
+end
diff --git a/app/models/concerns/issuable.rb b/app/models/concerns/issuable.rb
index 0a77fbeba08..429a63f83cc 100644
--- a/app/models/concerns/issuable.rb
+++ b/app/models/concerns/issuable.rb
@@ -23,6 +23,7 @@ module Issuable
   include Sortable
   include CreatedAtFilterable
   include UpdatedAtFilterable
+  include ClosedAtFilterable
 
   # This object is used to gather issuable meta data for displaying
   # upvotes, downvotes, notes and closing merge requests count for issues and merge requests