Merge branch '213435-optional-approvals-count' into 'master'

Resolve "Number of required approvals is counterintuitive on the merge request list"

See merge request gitlab-org/gitlab!32880

ee/app/models/approval_state.rb

@@ -165,6 +165,11 @@ class ApprovalState
     end
   end
 
+  # This is the required + optional approval count
+  def total_approvals_count
+    approvals.size
+  end
+
   private
 
   attr_reader :target_branch

ee/app/models/approval_wrapped_rule.rb

@@ -36,7 +36,7 @@ class ApprovalWrappedRule
     filter_approvers(@approval_rule.approvers)
   end
 
-  # @return [Array<User>] all approvers related to this rule
+  # @return [Array<User>] of users who have approved the merge request
   #
   # This is dynamically calculated unless it is persisted as `approved_approvers`.
   #

ee/app/models/concerns/approvable.rb

@@ -17,6 +17,7 @@ module Approvable
     authors_can_approve?
     committers_can_approve?
     approvers_overwritten?
+    total_approvals_count
   }.freeze
 
   delegate(*FORWARDABLE_METHODS, to: :approval_state)

ee/spec/models/approval_state_spec.rb

@@ -1607,4 +1607,17 @@ describe ApprovalState do
       end
     end
   end
+
+  describe '#total_approvals_count' do
+    let(:rule) { create_rule(approvals_required: 1, rule_type: :any_approver, users: [approver1]) }
+
+    before do
+      create(:approval, merge_request: merge_request, user: rule.users.first)
+      create(:approval, merge_request: merge_request, user: approver2)
+    end
+
+    it 'returns the total number of approvals (required + optional)' do
+      expect(subject.total_approvals_count).to eq(2)
+    end
+  end
 end