Add reorder action to Project IssuesControllerbw-issue-reorder

to support manual sorting on the frontend

2 files changed, 104 insertions, 0 deletions

diff --git a/spec/services/issues/reorder_service_spec.rb b/spec/services/issues/reorder_service_spec.rb
new file mode 100644
index 00000000000..b147cdf4e64
--- /dev/null
+++ b/spec/services/issues/reorder_service_spec.rb
@@ -0,0 +1,88 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Issues::ReorderService do
+  set(:user)    { create(:user) }
+  set(:project) { create(:project) }
+  set(:group)   { create(:group) }
+
+  shared_examples 'issues reorder service' do
+    context 'when reordering issues' do
+      it 'returns false with no params' do
+        expect(service({}).execute(issue1)).to be_falsey
+      end
+
+      it 'returns false with both invalid params' do
+        params = { move_after_id: nil, move_before_id: 1 }
+
+        expect(service(params).execute(issue1)).to be_falsey
+      end
+
+      it 'sorts issues' do
+        params = { move_after_id: issue2.id, move_before_id: issue3.id }
+
+        service(params).execute(issue1)
+
+        expect(issue1.relative_position)
+          .to be_between(issue2.relative_position, issue3.relative_position)
+      end
+    end
+  end
+
+  describe '#execute' do
+    let(:issue1) { create(:issue, project: project, relative_position: 10) }
+    let(:issue2) { create(:issue, project: project, relative_position: 20) }
+    let(:issue3) { create(:issue, project: project, relative_position: 30) }
+
+    context 'when ordering issues in a project' do
+      let(:parent) { project }
+
+      before do
+        parent.add_developer(user)
+      end
+
+      it_behaves_like 'issues reorder service'
+    end
+
+    context 'when ordering issues in a group' do
+      let(:project) { create(:project, namespace: group) }
+
+      before do
+        group.add_developer(user)
+      end
+
+      it_behaves_like 'issues reorder service'
+
+      context 'when ordering in a group issue list' do
+        let(:params) { { move_after_id: issue2.id, move_before_id: issue3.id, group_full_path: group.full_path } }
+
+        subject { service(params) }
+
+        it 'sends the board_group_id parameter' do
+          match_params = { move_between_ids: [issue2.id, issue3.id], board_group_id: group.id }
+
+          expect(Issues::UpdateService)
+            .to receive(:new).with(project, user, match_params)
+            .and_return(double(execute: build(:issue)))
+
+          subject.execute(issue1)
+        end
+
+        it 'sorts issues' do
+          project2 = create(:project, namespace: group)
+          issue4   = create(:issue, project: project2)
+
+          subject.execute(issue4)
+
+          expect(issue4.relative_position)
+            .to be_between(issue2.relative_position, issue3.relative_position)
+        end
+      end
+    end
+  end
+
+  def service(params)
+    described_class.new(project, user, params)
+  end
+end
diff --git a/spec/services/issues/update_service_spec.rb b/spec/services/issues/update_service_spec.rb
index 22f5607cb9c..28fa5d12d9c 100644
--- a/spec/services/issues/update_service_spec.rb
+++ b/spec/services/issues/update_service_spec.rb
@@ -687,6 +687,22 @@ describe Issues::UpdateService, :mailer do
       end
     end
 
+    context 'when moving an issue ', :nested_groups do
+      it 'raises an error for invalid move ids within a project' do
+        opts = { move_between_ids: [9000, 9999] }
+
+        expect { described_class.new(issue.project, user, opts).execute(issue) }
+            .to raise_error(ActiveRecord::RecordNotFound)
+      end
+
+      it 'raises an error for invalid move ids within a group' do
+        opts = { move_between_ids: [9000, 9999], board_group_id: create(:group).id }
+
+        expect { described_class.new(issue.project, user, opts).execute(issue) }
+            .to raise_error(ActiveRecord::RecordNotFound)
+      end
+    end
+
     include_examples 'issuable update service' do
       let(:open_issuable) { issue }
       let(:closed_issuable) { create(:closed_issue, project: project) }