Use `Issues::UpdateService` to close/reopen an issue

parent d8fc783b
...@@ -6,36 +6,24 @@ module Boards ...@@ -6,36 +6,24 @@ module Boards
return false unless valid_move? return false unless valid_move?
update_service.execute(issue) update_service.execute(issue)
reopen_service.execute(issue) if moving_from.done?
close_service.execute(issue) if moving_to.done?
true
end end
private private
def valid_move? def valid_move?
moving_from.present? && moving_to.present? moving_from_list.present? && moving_to_list.present?
end end
def issue def issue
@issue ||= project.issues.visible_to_user(user).find_by!(iid: params[:id]) @issue ||= project.issues.visible_to_user(user).find_by!(iid: params[:id])
end end
def moving_from def moving_from_list
@moving_from ||= board.lists.find_by(id: params[:from_list_id]) @moving_from_list ||= board.lists.find_by(id: params[:from_list_id])
end
def moving_to
@moving_to ||= board.lists.find_by(id: params[:to_list_id])
end end
def close_service def moving_to_list
::Issues::CloseService.new(project, user) @moving_to_list ||= board.lists.find_by(id: params[:to_list_id])
end
def reopen_service
::Issues::ReopenService.new(project, user)
end end
def update_service def update_service
...@@ -45,18 +33,24 @@ module Boards ...@@ -45,18 +33,24 @@ module Boards
def issue_params def issue_params
{ {
add_label_ids: add_label_ids, add_label_ids: add_label_ids,
remove_label_ids: remove_label_ids remove_label_ids: remove_label_ids,
state_event: issue_state
} }
end end
def issue_state
return 'reopen' if moving_from_list.done?
return 'close' if moving_to_list.done?
end
def add_label_ids def add_label_ids
[moving_to.label_id].compact [moving_to_list.label_id].compact
end end
def remove_label_ids def remove_label_ids
label_ids = label_ids =
if moving_to.label? if moving_to_list.label?
moving_from.label_id moving_from_list.label_id
else else
board.lists.label.pluck(:label_id) board.lists.label.pluck(:label_id)
end end
......
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