Merge branch '300115-more-filters-issue-resolver-boards' into 'master'

Add missing issue filters to board queries

See merge request gitlab-org/gitlab!59703

app/graphql/types/boards/board_issue_input_base_type.rb

@@ -4,6 +4,10 @@ module Types
   module Boards
     # rubocop: disable Graphql/AuthorizeTypes
     class BoardIssueInputBaseType < BoardIssuableInputBaseType
+      argument :iids, [GraphQL::STRING_TYPE],
+               required: false,
+               description: 'List of IIDs of issues. For example ["1", "2"].'
+
       argument :milestone_title, GraphQL::STRING_TYPE,
                required: false,
                description: 'Filter by milestone title.'

changelogs/unreleased/300115-more-filters-issue-resolver-boards.yml

+---
+title: Support board issue filtering by iids in GraphQL
+merge_request: 59703
+author:
+type: added

doc/api/graphql/reference/index.md

@@ -8756,6 +8756,15 @@ The state of the vulnerability.
 | `DISMISSED` |  |
 | `RESOLVED` |  |
 
+### `WeightWildcardId`
+
+Weight ID wildcard values.
+
+| Value | Description |
+| ----- | ----------- |
+| `ANY` | Weight is assigned. |
+| `NONE` | No weight is assigned. |
+
 ## Scalar types
 
 Scalar values are atomic values, and do not have fields of their own.

ee/app/graphql/ee/resolvers/board_issue_filterable.rb

@@ -10,6 +10,7 @@ module EE
       def set_filter_values(filters)
         filter_by_epic(filters)
         filter_by_iteration(filters)
+        filter_by_weight(filters)
 
         super
       end
@@ -38,6 +39,17 @@ module EE
           filters[:iteration_id] = iteration_wildcard_id
         end
       end
+
+      def filter_by_weight(filters)
+        weight = filters[:weight]
+        weight_wildcard = filters.delete(:weight_wildcard_id)
+
+        if weight && weight_wildcard
+          raise ::Gitlab::Graphql::Errors::ArgumentError, 'Incompatible arguments: weight, weightWildcardId.'
+        end
+
+        filters[:weight] = weight_wildcard if weight_wildcard
+      end
     end
   end
 end

ee/app/graphql/ee/types/boards/board_issue_input_base_type.rb

@@ -18,6 +18,10 @@ module EE
           argument :weight, GraphQL::STRING_TYPE,
                    required: false,
                    description: 'Filter by weight.'
+
+          argument :iteration_id, [::Types::GlobalIDType[::Iteration]],
+                   required: false,
+                   description: 'Filter by a list of iteration IDs. Incompatible with iterationWildcardId.'
         end
       end
     end

ee/app/graphql/ee/types/boards/board_issue_input_type.rb

@@ -15,6 +15,10 @@ module EE
           argument :iteration_wildcard_id, ::Types::IterationWildcardIdEnum,
                    required: false,
                    description: 'Filter by iteration ID wildcard.'
+
+          argument :weight_wildcard_id, ::Types::Boards::WeightWildcardIdEnum,
+                   required: false,
+                   description: 'Filter by weight ID wildcard. Incompatible with weight.'
         end
       end
     end

ee/app/graphql/types/boards/weight_wildcard_id_enum.rb

+# frozen_string_literal: true
+
+module Types
+  module Boards
+    class WeightWildcardIdEnum < BaseEnum
+      graphql_name 'WeightWildcardId'
+      description 'Weight ID wildcard values'
+
+      value 'NONE', 'No weight is assigned.'
+      value 'ANY', 'Weight is assigned.'
+    end
+  end
+end

ee/changelogs/unreleased/300115-more-filters-issue-resolver-boards.yml

+---
+title: Support board issue filtering by weight and iteration_id in GraphQL
+merge_request: 59703
+author:
+type: added

ee/spec/graphql/ee/resolvers/board_list_issues_resolver_spec.rb

@@ -12,63 +12,122 @@ RSpec.describe Resolvers::BoardListIssuesResolver do
   let_it_be(:label) { create(:label, project: project) }
   let_it_be(:list) { create(:list, board: board, label: label) }
 
+  let_it_be(:epic) { create(:epic, group: group) }
+  let_it_be(:iteration) { create(:iteration, group: group, start_date: 1.week.ago, due_date: 2.days.ago) }
+  let_it_be(:current_iteration) { create(:iteration, :started, group: group, start_date: Date.today, due_date: 1.day.from_now) }
+
+  let_it_be(:issue1) { create(:issue, project: project, labels: [label], weight: 3) }
+  let_it_be(:issue2) { create(:issue, project: project, labels: [label], iteration: iteration) }
+  let_it_be(:issue3) { create(:issue, project: project, labels: [label]) }
+  let_it_be(:issue4) { create(:issue, project: project, labels: [label], iteration: current_iteration, weight: 1) }
+
+  let_it_be(:epic_issue) { create(:epic_issue, epic: epic, issue: issue1) }
+
   before_all do
     group.add_developer(user)
   end
 
+  shared_examples 'raises error on mutually exclusive arguments' do
+    it 'raises an exception if mutually exclusive arguments are present' do
+      expect do
+        resolve_board_list_issues({ filters: filters })
+      end.to raise_error(Gitlab::Graphql::Errors::ArgumentError)
+    end
+  end
+
   describe '#resolve' do
     context 'filtering by epic' do
-      let_it_be(:issue) { create(:issue, project: project, labels: [label]) }
-      let_it_be(:epic) { create(:epic, group: group) }
-      let_it_be(:epic_issue) { create(:epic_issue, epic: epic, issue: issue) }
-
       before do
         stub_licensed_features(epics: true)
       end
 
-      it 'raises an exception if both epic_id and epic_wildcard_id are present' do
-        expect do
-          resolve_board_list_issues({ filters: { epic_id: epic.to_global_id, epic_wildcard_id: 'NONE' } })
-        end.to raise_error(Gitlab::Graphql::Errors::ArgumentError)
+      context 'when providing mutually exclusive filters' do
+        let(:filters) { { epic_id: epic.to_global_id, epic_wildcard_id: 'NONE' } }
+
+        it_behaves_like 'raises error on mutually exclusive arguments'
       end
 
       it 'accepts epic global id' do
         result = resolve_board_list_issues({ filters: { epic_id: epic.to_global_id } })
 
-        expect(result).to match_array([issue])
+        expect(result).to contain_exactly(issue1)
       end
 
       it 'accepts epic wildcard id' do
         result = resolve_board_list_issues({ filters: { epic_wildcard_id: 'NONE' } })
 
-        expect(result).to match_array([])
+        expect(result).to contain_exactly(issue2, issue3, issue4)
       end
     end
 
-    context 'filtering by iteration' do
-      let_it_be(:iteration) { create(:iteration, group: group, start_date: 1.week.ago, due_date: 2.days.ago) }
-      let_it_be(:current_iteration) { create(:iteration, :started, group: group, start_date: Date.today, due_date: 1.day.from_now) }
-      let_it_be(:issue_with_iteration) { create(:issue, project: project, labels: [label], iteration: iteration) }
-      let_it_be(:issue_without_iteration) { create(:issue, project: project, labels: [label]) }
-      let_it_be(:issue_with_current_iteration) { create(:issue, project: project, labels: [label], iteration: current_iteration) }
+    context 'filtering by weight' do
+      it 'accepts weight wildcard id none' do
+        result = resolve_board_list_issues({ filters: { weight_wildcard_id: 'NONE' } })
+
+        expect(result).to contain_exactly(issue2, issue3)
+      end
+
+      it 'accepts weight wildcard id any' do
+        result = resolve_board_list_issues({ filters: { weight_wildcard_id: 'ANY' } })
+
+        expect(result).to contain_exactly(issue1, issue4)
+      end
+
+      it 'filters by weight' do
+        result = resolve_board_list_issues({ filters: { weight: '3' } })
+
+        expect(result).to contain_exactly(issue1)
+      end
 
+      context 'when providing mutually exclusive filters' do
+        let(:filters) { { weight: 5, weight_wildcard_id: 'ANY' } }
+
+        it_behaves_like 'raises error on mutually exclusive arguments'
+      end
+
+      context 'filtering by negated weight' do
+        it 'filters by negated weight' do
+          result = resolve_board_list_issues({ filters: { not: { weight: '3' } } })
+
+          expect(result).to contain_exactly(issue2, issue3, issue4)
+        end
+      end
+    end
+
+    context 'filtering by iteration' do
       it 'accepts iteration title' do
         result = resolve_board_list_issues({ filters: { iteration_title: iteration.title } })
 
-        expect(result).to contain_exactly(issue_with_iteration)
+        expect(result).to contain_exactly(issue2)
       end
 
       it 'accepts iteration wildcard id' do
         result = resolve_board_list_issues({ filters: { iteration_wildcard_id: 'NONE' } })
 
-        expect(result).to contain_exactly(issue_without_iteration)
+        expect(result).to contain_exactly(issue1, issue3)
       end
 
       context 'filterning by negated iteration' do
         it 'accepts iteration wildcard id' do
           result = resolve_board_list_issues({ filters: { not: { iteration_wildcard_id: 'CURRENT' } } })
 
-          expect(result).to contain_exactly(issue_without_iteration, issue_with_iteration)
+          expect(result).to contain_exactly(issue1, issue3, issue2)
+        end
+      end
+    end
+
+    context 'filtering by iids' do
+      it 'filters by iids' do
+        result = resolve_board_list_issues({ filters: { iids: [issue1.iid, issue3.iid] } })
+
+        expect(result).to contain_exactly(issue1, issue3)
+      end
+
+      context 'filtering by negated iids' do
+        it 'filters by negated iid' do
+          result = resolve_board_list_issues({ filters: { not: { iids: [issue1.iid, issue3.iid] } } })
+
+          expect(result).to contain_exactly(issue2, issue4)
         end
       end
     end