1 files changed, 13 insertions, 8 deletions
diff --git a/app/workers/merge_requests/set_reviewer_reviewed_worker.rb b/app/workers/merge_requests/set_reviewer_reviewed_worker.rb
index 2f15bf3b879..7e8bc60f6e1 100644
--- a/app/workers/merge_requests/set_reviewer_reviewed_worker.rb
+++ b/app/workers/merge_requests/set_reviewer_reviewed_worker.rb
@@ -13,18 +13,23 @@ module MergeRequests
       current_user_id = event.data[:current_user_id]
       merge_request_id = event.data[:merge_request_id]
       current_user = User.find_by_id(current_user_id)
-      merge_request = MergeRequest.find_by_id(merge_request_id)
 
-      if !current_user
+      unless current_user
         logger.info(structured_payload(message: 'Current user not found.', current_user_id: current_user_id))
-      elsif !merge_request
-        logger.info(structured_payload(message: 'Merge request not found.', merge_request_id: merge_request_id))
-      else
-        project = merge_request.source_project
+        return
+      end
+
+      merge_request = MergeRequest.find_by_id(merge_request_id)
 
-        ::MergeRequests::MarkReviewerReviewedService.new(project: project, current_user: current_user)
-          .execute(merge_request)
+      unless merge_request
+        logger.info(structured_payload(message: 'Merge request not found.', merge_request_id: merge_request_id))
+        return
       end
+
+      project = merge_request.source_project
+
+      ::MergeRequests::UpdateReviewerStateService.new(project: project, current_user: current_user)
+              .execute(merge_request, "reviewed")
     end
   end
 end