diff options
Diffstat (limited to 'app/services/merge_requests/remove_attention_requested_service.rb')
| -rw-r--r-- | app/services/merge_requests/remove_attention_requested_service.rb | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/app/services/merge_requests/remove_attention_requested_service.rb b/app/services/merge_requests/remove_attention_requested_service.rb index b727c24415e..a32a8071471 100644 --- a/app/services/merge_requests/remove_attention_requested_service.rb +++ b/app/services/merge_requests/remove_attention_requested_service.rb @@ -2,13 +2,12 @@ module MergeRequests class RemoveAttentionRequestedService < MergeRequests::BaseService - attr_accessor :merge_request, :user + attr_accessor :merge_request - def initialize(project:, current_user:, merge_request:, user:) + def initialize(project:, current_user:, merge_request:) super(project: project, current_user: current_user) @merge_request = merge_request - @user = user end def execute @@ -18,6 +17,8 @@ module MergeRequests update_state(reviewer) update_state(assignee) + current_user.invalidate_attention_requested_count + success else error("User is not a reviewer or assignee of the merge request") @@ -27,11 +28,11 @@ module MergeRequests private def assignee - merge_request.find_assignee(user) + merge_request.find_assignee(current_user) end def reviewer - merge_request.find_reviewer(user) + merge_request.find_reviewer(current_user) end def update_state(reviewer_or_assignee) |