Commit f85f63ed authored by Mark Chao's avatar Mark Chao Committed by Lin Jen-Shin

Computed approvers after merge if approved_approvers empty

Past merged MRs do not have approved_approvers for now,
so to keep UI display correctly, compute approved approvers if
association is empty.

Recreate fail case as spec to test creation of `approved_approver`
after merge. Use `inverse_of` to ensure same copy of MR object across
`PostMergeService` and `ApprovalMergeRequestRule`. This means we can
avoid reloading `approval_rules` to solve outdate MR merge state issue.
parent 29ff6294
...@@ -12,7 +12,7 @@ class ApprovalMergeRequestRule < ApplicationRecord ...@@ -12,7 +12,7 @@ class ApprovalMergeRequestRule < ApplicationRecord
validates :name, uniqueness: { scope: [:merge_request, :code_owner] } validates :name, uniqueness: { scope: [:merge_request, :code_owner] }
belongs_to :merge_request belongs_to :merge_request, inverse_of: :approval_rules
# approved_approvers is only populated after MR is merged # approved_approvers is only populated after MR is merged
has_and_belongs_to_many :approved_approvers, class_name: 'User', join_table: :approval_merge_request_rules_approved_approvers has_and_belongs_to_many :approved_approvers, class_name: 'User', join_table: :approval_merge_request_rules_approved_approvers
......
...@@ -25,17 +25,17 @@ class ApprovalWrappedRule ...@@ -25,17 +25,17 @@ class ApprovalWrappedRule
# @return [Array<User>] all approvers related to this rule # @return [Array<User>] all approvers related to this rule
# #
# This is dynamically calculated when MR is open, but is persisted in DB after MR is merged. # This is dynamically calculated unless it is persisted as `approved_approvers`.
# #
# After merge, the approval state should no longer change. # After merge, the approval state should no longer change.
# Persisting instead of recomputing dynamically guarantees this even # We persist this so if project level rule is changed in the future,
# if project level rule ever adds/removes approvers after the merge. # return result won't be affected.
# #
# For open MRs, it is still dynamically calculated instead of persisted because # For open MRs, it is dynamically calculated because:
# - Additional complexity to add update hooks # - Additional complexity to add update hooks
# - DB updating many MRs for one project rule change is inefficient # - DB updating many MRs for one project rule change is inefficient
def approved_approvers def approved_approvers
if merge_request.merged? && merge_request.merge_jid.nil? # merge process completed if merge_request.merged? && approval_rule.is_a?(ApprovalMergeRequestRule) && approval_rule.approved_approvers.present?
return approval_rule.approved_approvers return approval_rule.approved_approvers
end end
......
...@@ -18,7 +18,7 @@ module EE ...@@ -18,7 +18,7 @@ module EE
has_many :approvers, as: :target, dependent: :delete_all # rubocop:disable Cop/ActiveRecordDependent has_many :approvers, as: :target, dependent: :delete_all # rubocop:disable Cop/ActiveRecordDependent
has_many :approver_users, through: :approvers, source: :user has_many :approver_users, through: :approvers, source: :user
has_many :approver_groups, as: :target, dependent: :delete_all # rubocop:disable Cop/ActiveRecordDependent has_many :approver_groups, as: :target, dependent: :delete_all # rubocop:disable Cop/ActiveRecordDependent
has_many :approval_rules, class_name: 'ApprovalMergeRequestRule' has_many :approval_rules, class_name: 'ApprovalMergeRequestRule', inverse_of: :merge_request
has_many :draft_notes has_many :draft_notes
validate :validate_approvals_before_merge, unless: :importing? validate :validate_approvals_before_merge, unless: :importing?
......
...@@ -18,8 +18,7 @@ module ApprovalRules ...@@ -18,8 +18,7 @@ module ApprovalRules
copy_project_approval_rules copy_project_approval_rules
end end
# TODO: https://gitlab.com/gitlab-org/gitlab-ee/issues/9866 merge_request.approval_rules.each(&:sync_approved_approvers)
merge_request.approval_rules.reload.each(&:sync_approved_approvers)
end end
end end
......
---
title: Fix 500 error when visiting merged merge request
merge_request: 9648
author:
type: fixed
...@@ -103,6 +103,37 @@ describe ApprovalWrappedRule do ...@@ -103,6 +103,37 @@ describe ApprovalWrappedRule do
expect(subject.approved_approvers).to contain_exactly(approver3) expect(subject.approved_approvers).to contain_exactly(approver3)
end end
end end
context 'when merged but without materialized approved_approvers' do
let(:merge_request) { create(:merged_merge_request) }
before do
create(:approval, merge_request: merge_request, user: approver1)
create(:approval, merge_request: merge_request, user: approver2)
rule.users = [approver1, approver3]
end
it 'returns computed approved approvers' do
expect(subject.approved_approvers).to contain_exactly(approver1)
end
end
context 'when project rule' do
let(:rule) { create(:approval_project_rule, project: merge_request.project, approvals_required: approvals_required) }
let(:merge_request) { create(:merged_merge_request) }
before do
create(:approval, merge_request: merge_request, user: approver1)
create(:approval, merge_request: merge_request, user: approver2)
rule.users = [approver1, approver3]
end
it 'returns computed approved approvers' do
expect(subject.approved_approvers).to contain_exactly(approver1)
end
end
end end
describe '#unactioned_approvers' do describe '#unactioned_approvers' do
......
...@@ -10,9 +10,9 @@ describe MergeRequests::MergeService do ...@@ -10,9 +10,9 @@ describe MergeRequests::MergeService do
end end
describe '#execute' do describe '#execute' do
context 'project has exceeded size limit' do let(:service) { described_class.new(project, user, commit_message: 'Awesome message') }
let(:service) { described_class.new(project, user, commit_message: 'Awesome message') }
context 'project has exceeded size limit' do
before do before do
allow(project).to receive(:above_size_limit?).and_return(true) allow(project).to receive(:above_size_limit?).and_return(true)
...@@ -25,6 +25,25 @@ describe MergeRequests::MergeService do ...@@ -25,6 +25,25 @@ describe MergeRequests::MergeService do
expect(merge_request.merge_error).to include('This merge request cannot be merged') expect(merge_request.merge_error).to include('This merge request cannot be merged')
end end
end end
context 'when merge request rule exists' do
let(:approver) { create(:user) }
let!(:approval_rule) { create :approval_merge_request_rule, merge_request: merge_request, users: [approver] }
let!(:approval) { create :approval, merge_request: merge_request, user: approver }
it 'creates approved_approvers' do
allow(service).to receive(:execute_hooks)
perform_enqueued_jobs do
service.execute(merge_request)
end
merge_request.reload
rule = merge_request.approval_rules.first
expect(merge_request.merged?).to eq(true)
expect(rule.approved_approvers).to contain_exactly(approver)
end
end
end end
describe '#hooks_validation_pass?' do describe '#hooks_validation_pass?' do
......
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