Create a pending task when an MR is assigned to someone

parent 9da03c45
...@@ -18,6 +18,7 @@ module MergeRequests ...@@ -18,6 +18,7 @@ module MergeRequests
merge_request.update_attributes(label_ids: label_params) merge_request.update_attributes(label_ids: label_params)
event_service.open_mr(merge_request, current_user) event_service.open_mr(merge_request, current_user)
notification_service.new_merge_request(merge_request, current_user) notification_service.new_merge_request(merge_request, current_user)
task_service.new_merge_request(merge_request, current_user)
merge_request.create_cross_references!(current_user) merge_request.create_cross_references!(current_user)
execute_hooks(merge_request) execute_hooks(merge_request)
end end
......
...@@ -28,6 +28,7 @@ module MergeRequests ...@@ -28,6 +28,7 @@ module MergeRequests
if merge_request.previous_changes.include?('assignee_id') if merge_request.previous_changes.include?('assignee_id')
create_assignee_note(merge_request) create_assignee_note(merge_request)
notification_service.reassigned_merge_request(merge_request, current_user) notification_service.reassigned_merge_request(merge_request, current_user)
task_service.reassigned_merge_request(merge_request, current_user)
end end
if merge_request.previous_changes.include?('target_branch') || if merge_request.previous_changes.include?('target_branch') ||
......
...@@ -11,9 +11,7 @@ class TaskService ...@@ -11,9 +11,7 @@ class TaskService
# * creates a pending task for assignee if issue is assigned # * creates a pending task for assignee if issue is assigned
# #
def new_issue(issue, current_user) def new_issue(issue, current_user)
if issue.is_assigned? && issue.assignee != current_user new_issuable(issue, current_user)
create_task(issue.project, issue, current_user, issue.assignee, Task::ASSIGNED)
end
end end
# When close an issue we should: # When close an issue we should:
...@@ -29,9 +27,23 @@ class TaskService ...@@ -29,9 +27,23 @@ class TaskService
# * creates a pending task for new assignee if issue is assigned # * creates a pending task for new assignee if issue is assigned
# #
def reassigned_issue(issue, current_user) def reassigned_issue(issue, current_user)
if issue.is_assigned? reassigned_issuable(issue, current_user)
create_task(issue.project, issue, current_user, issue.assignee, Task::ASSIGNED)
end end
# When create a merge request we should:
#
# * creates a pending task for assignee if merge request is assigned
#
def new_merge_request(merge_request, current_user)
new_issuable(merge_request, current_user)
end
# When we reassign an merge request we should:
#
# * creates a pending task for new assignee if merge request is assigned
#
def reassigned_merge_request(merge_request, current_user)
reassigned_issuable(merge_request, current_user)
end end
# When we mark a task as done we should: # When we mark a task as done we should:
...@@ -83,4 +95,16 @@ class TaskService ...@@ -83,4 +95,16 @@ class TaskService
def pending_tasks_for(user, project, target) def pending_tasks_for(user, project, target)
user.tasks.pending.where(project: project, target: target) user.tasks.pending.where(project: project, target: target)
end end
def new_issuable(issuable, user)
if issuable.is_assigned? && issuable.assignee != user
create_task(issuable.project, issuable, user, issuable.assignee, Task::ASSIGNED)
end
end
def reassigned_issuable(issuable, user)
if issuable.is_assigned?
create_task(issuable.project, issuable, user, issuable.assignee, Task::ASSIGNED)
end
end
end end
...@@ -3,6 +3,7 @@ require 'spec_helper' ...@@ -3,6 +3,7 @@ require 'spec_helper'
describe MergeRequests::CreateService, services: true do describe MergeRequests::CreateService, services: true do
let(:project) { create(:project) } let(:project) { create(:project) }
let(:user) { create(:user) } let(:user) { create(:user) }
let(:assignee) { create(:user) }
describe :execute do describe :execute do
context 'valid params' do context 'valid params' do
...@@ -14,10 +15,12 @@ describe MergeRequests::CreateService, services: true do ...@@ -14,10 +15,12 @@ describe MergeRequests::CreateService, services: true do
target_branch: 'master' target_branch: 'master'
} }
end end
let(:service) { MergeRequests::CreateService.new(project, user, opts) } let(:service) { MergeRequests::CreateService.new(project, user, opts) }
before do before do
project.team << [user, :master] project.team << [user, :master]
project.team << [assignee, :developer]
allow(service).to receive(:execute_hooks) allow(service).to receive(:execute_hooks)
@merge_request = service.execute @merge_request = service.execute
...@@ -25,10 +28,47 @@ describe MergeRequests::CreateService, services: true do ...@@ -25,10 +28,47 @@ describe MergeRequests::CreateService, services: true do
it { expect(@merge_request).to be_valid } it { expect(@merge_request).to be_valid }
it { expect(@merge_request.title).to eq('Awesome merge_request') } it { expect(@merge_request.title).to eq('Awesome merge_request') }
it { expect(@merge_request.assignee).to be_nil }
it 'should execute hooks with default action' do it 'should execute hooks with default action' do
expect(service).to have_received(:execute_hooks).with(@merge_request) expect(service).to have_received(:execute_hooks).with(@merge_request)
end end
it 'does not creates a pending task' do
attributes = {
project: project,
target: @merge_request
}
expect(Task.where(attributes).count).to be_zero
end
context 'when merge request is assigned to someone' do
let(:opts) do
{
title: 'Awesome merge_request',
description: 'please fix',
source_branch: 'feature',
target_branch: 'master',
assignee: assignee
}
end
it { expect(@merge_request.assignee).to eq assignee }
it 'creates a pending task for new assignee' do
attributes = {
project: project,
author: user,
user: assignee,
target: @merge_request,
action: Task::ASSIGNED,
state: :pending
}
expect(Task.where(attributes).count).to eq 1
end
end
end end
end end
end end
...@@ -98,6 +98,31 @@ describe MergeRequests::UpdateService, services: true do ...@@ -98,6 +98,31 @@ describe MergeRequests::UpdateService, services: true do
end end
end end
context 'task queue' do
let!(:pending_task) do
create(:pending_assigned_task, user: user, project: project, target: merge_request, author: user2)
end
context 'when is reassigned' do
before do
update_merge_request({ assignee: user2 })
end
it 'creates a pending task for new assignee' do
attributes = {
project: project,
author: user,
user: user2,
target: merge_request,
action: Task::ASSIGNED,
state: :pending
}
expect(Task.where(attributes).count).to eq 1
end
end
end
context 'when MergeRequest has tasks' do context 'when MergeRequest has tasks' do
before { update_merge_request({ description: "- [ ] Task 1\n- [ ] Task 2" }) } before { update_merge_request({ description: "- [ ] Task 1\n- [ ] Task 2" }) }
......
require 'spec_helper' require 'spec_helper'
describe TaskService, services: true do describe TaskService, services: true do
let(:service) { described_class.new }
describe 'Issues' do
let(:author) { create(:user) } let(:author) { create(:user) }
let(:john_doe) { create(:user) } let(:john_doe) { create(:user) }
let(:project) { create(:empty_project, :public) } let(:project) { create(:project) }
let(:assigned_issue) { create(:issue, project: project, assignee: john_doe) } let(:service) { described_class.new }
let(:unassigned_issue) { create(:issue, project: project, assignee: nil) }
before do before do
project.team << [author, :developer] project.team << [author, :developer]
project.team << [john_doe, :developer] project.team << [john_doe, :developer]
end end
describe 'Issues' do
let(:assigned_issue) { create(:issue, project: project, assignee: john_doe) }
let(:unassigned_issue) { create(:issue, project: project, assignee: nil) }
describe '#new_issue' do describe '#new_issue' do
it 'creates a pending task if assigned' do it 'creates a pending task if assigned' do
service.new_issue(assigned_issue, author) service.new_issue(assigned_issue, author)
...@@ -116,6 +116,42 @@ describe TaskService, services: true do ...@@ -116,6 +116,42 @@ describe TaskService, services: true do
end end
end end
describe 'Merge Requests' do
let(:mr_assigned) { create(:merge_request, source_project: project, assignee: john_doe) }
let(:mr_unassigned) { create(:merge_request, source_project: project, assignee: nil) }
describe '#new_merge_request' do
it 'creates a pending task if assigned' do
service.new_merge_request(mr_assigned, author)
is_expected_to_create_pending_task(user: john_doe, target: mr_assigned, action: Task::ASSIGNED)
end
it 'does not create a task if unassigned' do
is_expected_to_not_create_task { service.new_merge_request(mr_unassigned, author) }
end
it 'does not create a task if assignee is the current user' do
is_expected_to_not_create_task { service.new_merge_request(mr_unassigned, john_doe) }
end
end
describe '#reassigned_merge_request' do
it 'creates a pending task for new assignee' do
mr_unassigned.update_attribute(:assignee, john_doe)
service.reassigned_merge_request(mr_unassigned, author)
is_expected_to_create_pending_task(user: john_doe, target: mr_unassigned, action: Task::ASSIGNED)
end
it 'does not create a task if unassigned' do
mr_assigned.update_attribute(:assignee, nil)
is_expected_to_not_create_task { service.reassigned_merge_request(mr_assigned, author) }
end
end
end
def is_expected_to_create_pending_task(attributes = {}) def is_expected_to_create_pending_task(attributes = {})
attributes.reverse_merge!( attributes.reverse_merge!(
project: project, project: project,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment