Merge branch '229198-add-total-closed-mrs-to-contribution-analytics' into 'master'

Fix missing amount in Contribution Analytics

See merge request gitlab-org/gitlab!66385

doc/user/group/contribution_analytics/index.md

@@ -55,6 +55,7 @@ Contributions per group member are also presented in tabular format. Click a col
 - Number of closed issues
 - Number of opened MRs
 - Number of merged MRs
+- Number of closed MRs
 - Number of total contributions
 
 ![Contribution analytics contributions table](img/group_stats_table.png)

ee/app/assets/javascripts/group_member_contributions/components/table_body.vue

@@ -23,6 +23,7 @@ export default {
       <td>{{ row.mergeRequestsCreated }}</td>
       <td>{{ row.mergeRequestsApproved }}</td>
       <td>{{ row.mergeRequestsMerged }}</td>
+      <td>{{ row.mergeRequestsClosed }}</td>
       <td>{{ row.totalEvents }}</td>
     </tr>
   </tbody>

ee/app/assets/javascripts/group_member_contributions/constants.js

@@ -8,6 +8,7 @@ const COLUMNS = [
   { name: 'mergeRequestsCreated', text: __('Opened MRs') },
   { name: 'mergeRequestsApproved', text: __('Approved MRs') },
   { name: 'mergeRequestsMerged', text: __('Merged MRs') },
+  { name: 'mergeRequestsClosed', text: __('Closed MRs') },
   { name: 'totalEvents', text: __('Total Contributions') },
 ];
 

ee/app/views/groups/contribution_analytics/show.html.haml

@@ -42,10 +42,11 @@
 
   %div{ data: { qa_selector: 'merge_request_content' } }
     %h3= s_('ContributionAnalytics|Merge requests')
+    - mr_closed_count = @data_collector.total_merge_requests_closed_count
     - mr_created_count = @data_collector.total_merge_requests_created_count
     - mr_merged_count = @data_collector.total_merge_requests_merged_count
-    - if mr_created_count > 0 || mr_merged_count > 0
-      = html_escape(s_('ContributionAnalytics|%{created_count} created, %{merged_count} merged.')) % { created_count: tag.strong(mr_created_count), merged_count: tag.strong(mr_merged_count) }
+    - if mr_closed_count > 0 || mr_created_count > 0 || mr_merged_count > 0
+      = html_escape(s_('ContributionAnalytics|%{created_count} created, %{merged_count} merged, %{closed_count} closed.')) % { mr_closed_count: tag.strong(mr_closed_count), created_count: tag.strong(mr_created_count), merged_count: tag.strong(mr_merged_count) }
     - else
       = s_('ContributionAnalytics|No merge requests for the selected time period.')
 

ee/lib/gitlab/contribution_analytics/data_collector.rb

@@ -5,7 +5,7 @@
 module Gitlab
   module ContributionAnalytics
     class DataCollector
-      EVENT_TYPES = %i[push issues_created issues_closed merge_requests_created merge_requests_merged merge_requests_approved total_events].freeze
+      EVENT_TYPES = %i[push issues_created issues_closed merge_requests_closed merge_requests_created merge_requests_merged merge_requests_approved total_events].freeze
 
       attr_reader :group, :from
 
@@ -32,6 +32,12 @@ module Gitlab
         end
       end
 
+      def merge_requests_closed_by_author_count
+        all_counts.each_with_object({}) do |(event, count), hash|
+          hash[event.author_id] = count if event.merge_request? && event.closed_action?
+        end
+      end
+
       def merge_requests_created_by_author_count
         all_counts.each_with_object({}) do |(event, count), hash|
           hash[event.author_id] = count if event.merge_request? && event.created_action?
@@ -69,6 +75,10 @@ module Gitlab
         PushEventPayload.commit_count_for(base_query.pushed_action)
       end
 
+      def total_merge_requests_closed_count
+        all_counts.sum { |event, count| event.merge_request? && event.closed_action? ? count : 0 }
+      end
+
       def total_merge_requests_created_count
         all_counts.sum { |event, count| event.merge_request? && event.created_action? ? count : 0 }
       end
@@ -111,6 +121,7 @@ module Gitlab
           push: push_by_author_count,
           issues_created: issues_created_by_author_count,
           issues_closed: issues_closed_by_author_count,
+          merge_requests_closed: merge_requests_closed_by_author_count,
           merge_requests_created: merge_requests_created_by_author_count,
           merge_requests_merged: merge_requests_merged_by_author_count,
           merge_requests_approved: merge_requests_approved_by_author_count,

ee/spec/frontend/group_member_contributions/components/table_body_spec.js

@@ -32,7 +32,7 @@ describe('TableBodyComponent', () => {
       const rowEl = vm.$el.querySelector('tr');
 
       expect(rowEl).not.toBeNull();
-      expect(rowEl.querySelectorAll('td')).toHaveLength(8);
+      expect(rowEl.querySelectorAll('td')).toHaveLength(9);
     });
 
     it('renders username row cell element', () => {

ee/spec/frontend/group_member_contributions/mock_data.js

@@ -10,6 +10,7 @@ export const rawMembers = [
     issues_closed: 4,
     merge_requests_created: 2,
     merge_requests_merged: 0,
+    merge_requests_closed: 0,
     total_events: 51,
   },
   {
@@ -21,6 +22,7 @@ export const rawMembers = [
     issues_closed: 1,
     merge_requests_created: 5,
     merge_requests_merged: 0,
+    merge_requests_closed: 0,
     total_events: 49,
   },
   {
@@ -32,7 +34,8 @@ export const rawMembers = [
     issues_closed: 1,
     merge_requests_created: 1,
     merge_requests_merged: 0,
-    total_events: 44,
+    merge_requests_closed: 1,
+    total_events: 45,
   },
 ];
 
@@ -40,6 +43,7 @@ export const mockSortOrders = {
   fullname: 1,
   issuesClosed: 1,
   issuesCreated: 1,
+  mergeRequestsClosed: 1,
   mergeRequestsCreated: 1,
   mergeRequestsApproved: 1,
   mergeRequestsMerged: 1,

ee/spec/lib/gitlab/contribution_analytics/data_collector_spec.rb

@@ -16,6 +16,7 @@ RSpec.describe Gitlab::ContributionAnalytics::DataCollector do
       create(:event, :closed, project: project1, target: issue, author: user)
       create(:event, :created, project: project2, target: mr, author: user)
       create(:event, :approved, project: project2, target: mr, author: user)
+      create(:event, :closed, project: project2, target: mr, author: user)
 
       data_collector = described_class.new(group: group)
       expect(data_collector.totals).to eq({
@@ -24,8 +25,9 @@ RSpec.describe Gitlab::ContributionAnalytics::DataCollector do
         merge_requests_created: { user.id => 1 },
         merge_requests_merged: {},
         merge_requests_approved: { user.id => 1 },
+        merge_requests_closed: { user.id => 1 },
         push: {},
-        total_events: { user.id => 3 }
+        total_events: { user.id => 4 }
       })
     end
   end
@@ -40,6 +42,7 @@ RSpec.describe Gitlab::ContributionAnalytics::DataCollector do
         [5, MergeRequest.name, Event.actions[:created]] => 0,
         [6, MergeRequest.name, Event.actions[:created]] => 1,
         [6, MergeRequest.name, Event.actions[:approved]] => 1,
+        [6, MergeRequest.name, Event.actions[:closed]] => 1,
         [10, Issue.name, Event.actions[:closed]] => 10,
         [11, Issue.name, Event.actions[:closed]] => 11
       }
@@ -64,6 +67,10 @@ RSpec.describe Gitlab::ContributionAnalytics::DataCollector do
         expect(data_collector.total_push_count).to eq(4)
       end
 
+      it 'for #total_merge_requests_closed_count' do
+        expect(data_collector.total_merge_requests_closed_count).to eq(1)
+      end
+
       it 'for #total_merge_requests_created_count' do
         expect(data_collector.total_merge_requests_created_count).to eq(1)
       end

ee/spec/serializers/user_analytics_entity_spec.rb

@@ -9,6 +9,7 @@ RSpec.describe UserAnalyticsEntity do
       push: {},
       issues_created: {},
       issues_closed: {},
+      merge_requests_closed: {},
       merge_requests_created: {},
       merge_requests_merged: {},
       merge_requests_approved: {},

locale/gitlab.pot

@@ -6904,6 +6904,9 @@ msgstr ""
 msgid "Closed %{epicTimeagoDate}"
 msgstr ""
 
+msgid "Closed MRs"
+msgstr ""
+
 msgid "Closed epics"
 msgstr ""
 
@@ -8823,7 +8826,7 @@ msgstr ""
 msgid "ContributionAnalytics|%{created_count} created, %{closed_count} closed."
 msgstr ""
 
-msgid "ContributionAnalytics|%{created_count} created, %{merged_count} merged."
+msgid "ContributionAnalytics|%{created_count} created, %{merged_count} merged, %{closed_count} closed."
 msgstr ""
 
 msgid "ContributionAnalytics|%{pushes} pushes, more than %{commits} commits by %{people} contributors."