diff options
Diffstat (limited to 'app/serializers/merge_request_user_entity.rb')
| -rw-r--r-- | app/serializers/merge_request_user_entity.rb | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/app/serializers/merge_request_user_entity.rb b/app/serializers/merge_request_user_entity.rb index 66672494bd9..97912656bbb 100644 --- a/app/serializers/merge_request_user_entity.rb +++ b/app/serializers/merge_request_user_entity.rb @@ -16,10 +16,12 @@ class MergeRequestUserEntity < ::API::Entities::UserBasic request.current_user&.can?(:update_merge_request, options[:merge_request]) end - expose :reviewed, if: satisfies(:present?, :allows_reviewers?) do |reviewer, options| - reviewer = options[:merge_request].find_reviewer(reviewer) + expose :reviewed, if: satisfies(:present?, :allows_reviewers?) do |user, options| + find_reviewer_or_assignee(user, options)&.reviewed? + end - reviewer&.reviewed? + expose :attention_requested, if: satisfies(:present?, :allows_reviewers?, :attention_requested_enabled?) do |user, options| + find_reviewer_or_assignee(user, options)&.attention_requested? end expose :approved, if: satisfies(:present?) do |user, options| @@ -27,6 +29,16 @@ class MergeRequestUserEntity < ::API::Entities::UserBasic # makes one query per merge request, whereas #approved_by? makes one per user options[:merge_request].approvals.any? { |app| app.user_id == user.id } end + + private + + def find_reviewer_or_assignee(user, options) + if options[:type] == :reviewers + options[:merge_request].find_reviewer(user) + else + options[:merge_request].find_assignee(user) + end + end end MergeRequestUserEntity.prepend_mod_with('MergeRequestUserEntity') |