Merge branch '431546-use-500-batch-size-for-ca' into 'master'

Increase the page size for the contributions GraphQL query

See merge request gitlab-org/gitlab!136724



Merged-by: Adam Hegyi <ahegyi@gitlab.com>
Approved-by: Ezekiel Kigbo <3397881-ekigbo@users.noreply.gitlab.com>
Approved-by: Felipe Artur <fcardozo@gitlab.com>
Reviewed-by: Ezekiel Kigbo <3397881-ekigbo@users.noreply.gitlab.com>

config/feature_flags/development/use_500_page_size_for_contribution_analytics.yml

+---
+name: use_500_page_size_for_contribution_analytics
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/136724
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/431595
+milestone: '16.7'
+type: development
+group: group::optimize
+default_enabled: false

ee/app/assets/javascripts/analytics/contribution_analytics/components/app.vue

@@ -84,10 +84,12 @@ export default {
 
       try {
         const { endDate, nextStartDate } = this.limitPostgresqlRequests(startDate, this.endDate);
+        const pageSize = gon.features?.use500PageSizeForContributionAnalytics ? 500 : null;
 
         const { data } = await this.$apollo.query({
           query: contributionsQuery,
           variables: {
+            first: pageSize,
             fullPath: this.fullPath,
             startDate,
             endDate,

ee/app/assets/javascripts/analytics/contribution_analytics/graphql/contributions.query.graphql

@@ -3,10 +3,11 @@ query getContributionsData(
   $startDate: ISO8601Date!
   $endDate: ISO8601Date!
   $nextPageCursor: String = ""
+  $first: Int
 ) {
   group(fullPath: $fullPath) {
     id
-    contributions(from: $startDate, to: $endDate, after: $nextPageCursor) {
+    contributions(from: $startDate, to: $endDate, first: $first, after: $nextPageCursor) {
       nodes {
         repoPushed
         mergeRequestsCreated

ee/app/controllers/groups/contribution_analytics_controller.rb

@@ -23,6 +23,8 @@ def show
     # https://gitlab.com/gitlab-org/gitlab/-/issues/428585
     @data_source_clickhouse = Feature.enabled?(:clickhouse_data_collection, group)
 
+    push_frontend_feature_flag(:use_500_page_size_for_contribution_analytics, group)
+
     respond_to do |format|
       format.html
       format.json do

ee/app/graphql/resolvers/analytics/contribution_analytics/contributions_resolver.rb

@@ -17,6 +17,9 @@ class ContributionsResolver < BaseResolver
                                                    "The end date must be within #{NUMBER_OF_DAYS} days after the start date."
         # rubocop:enable Layout/LineLength
 
+        max_page_size 500
+        default_page_size GitlabSchema.default_max_page_size # ensure backwards compability
+
         def resolve(from:, to:)
           validate_date_range!(from, to)
 

ee/spec/frontend/analytics/contribution_analytics/components/app_spec.js

@@ -39,6 +39,7 @@ describe('Contribution Analytics App', () => {
     wrapper = shallowMount(App, {
       apolloProvider,
       propsData: {
+        first: null,
         fullPath: 'test',
         startDate: '2000-12-10',
         endDate: '2000-12-31',
@@ -71,6 +72,7 @@ describe('Contribution Analytics App', () => {
     results.forEach((result) =>
       expect(resolver).toHaveBeenCalledWith({
         fullPath: wrapper.props('fullPath'),
+        first: null,
         ...result,
       }),
     );
@@ -95,6 +97,35 @@ describe('Contribution Analytics App', () => {
     expect(findErrorAlert().text()).toEqual(wrapper.vm.$options.i18n.error);
   });
 
+  it('fetches a page size of 500 when use_500_page_size_for_contribution_analytics is enabled', async () => {
+    gon.features = { use500PageSizeForContributionAnalytics: true };
+
+    const contributionsQueryResolver = jest
+      .fn()
+      .mockResolvedValueOnce(mockApiResponse({ endCursor: nextPageCursor }))
+      .mockResolvedValueOnce(mockApiResponse());
+
+    createWrapper({ contributionsQueryResolver, props: { dataSourceClickhouse: true } });
+    await waitForPromises();
+
+    expectGroupMembersTableToHaveData();
+
+    expectContributionsQueryResolverCalls(contributionsQueryResolver, [
+      {
+        first: 500,
+        startDate: '2000-12-10',
+        endDate: '2000-12-31',
+        nextPageCursor: '',
+      },
+      {
+        first: 500,
+        startDate: '2000-12-10',
+        endDate: '2000-12-31',
+        nextPageCursor,
+      },
+    ]);
+  });
+
   it('fetches Clickhouse data, using paginated requests when necessary', async () => {
     const contributionsQueryResolver = jest
       .fn()