Merge branch 'remove-merge-request-count-with-merged-at-ff' into 'master'

Remove merge request merged at count FF [RUN ALL RSPEC] [RUN AS-IF-FOSS]

See merge request gitlab-org/gitlab!55600

app/graphql/resolvers/project_merge_requests_resolver.rb

@@ -10,7 +10,7 @@ module Resolvers
     def resolve(**args)
       scope = super
 
-      if only_count_is_selected_with_merged_at_filter?(args) && Feature.enabled?(:optimized_merge_request_count_with_merged_at_filter, default_enabled: :yaml)
+      if only_count_is_selected_with_merged_at_filter?(args)
         MergeRequest::MetricsFinder
           .new(current_user, args.merge(target_project: project))
           .execute

changelogs/unreleased/remove-merge-request-count-with-merged-at-ff.yml

+---
+title: Remove the optimized_merge_request_count_with_merged_at_filter feature flag
+merge_request: 55600
+author:
+type: other

config/feature_flags/development/optimized_merge_request_count_with_merged_at_filter.yml

----
-name: optimized_merge_request_count_with_merged_at_filter
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/52113
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/299347
-milestone: '13.9'
-type: development
-group: group::optimize
-default_enabled: true

spec/requests/api/graphql/project/merge_requests_spec.rb

@@ -427,63 +427,37 @@ RSpec.describe 'getting merge request listings nested in a project' do
         QUERY
       end
 
-      shared_examples 'count examples' do
-        it 'returns the correct count' do
-          post_graphql(query, current_user: current_user)
+      it 'does not query the merge requests table for the count' do
+        query_recorder = ActiveRecord::QueryRecorder.new { post_graphql(query, current_user: current_user) }
 
-          count = graphql_data.dig('project', 'mergeRequests', 'count')
-          expect(count).to eq(1)
-        end
+        queries = query_recorder.data.each_value.first[:occurrences]
+        expect(queries).not_to include(match(/SELECT COUNT\(\*\) FROM "merge_requests"/))
+        expect(queries).to include(match(/SELECT COUNT\(\*\) FROM "merge_request_metrics"/))
       end
 
-      context 'when "optimized_merge_request_count_with_merged_at_filter" feature flag is enabled' do
-        before do
-          stub_feature_flags(optimized_merge_request_count_with_merged_at_filter: true)
+      context 'when total_time_to_merge and count is queried' do
+        let(:query) do
+          graphql_query_for(:project, { full_path: project.full_path }, <<~QUERY)
+          mergeRequests(mergedAfter: "2020-01-01", mergedBefore: "2020-01-05", first: 0) {
+            totalTimeToMerge
+            count
+          }
+          QUERY
         end
 
-        it 'does not query the merge requests table for the count' do
+        it 'does not query the merge requests table for the total_time_to_merge' do
           query_recorder = ActiveRecord::QueryRecorder.new { post_graphql(query, current_user: current_user) }
 
           queries = query_recorder.data.each_value.first[:occurrences]
-          expect(queries).not_to include(match(/SELECT COUNT\(\*\) FROM "merge_requests"/))
-          expect(queries).to include(match(/SELECT COUNT\(\*\) FROM "merge_request_metrics"/))
-        end
-
-        context 'when total_time_to_merge and count is queried' do
-          let(:query) do
-            graphql_query_for(:project, { full_path: project.full_path }, <<~QUERY)
-            mergeRequests(mergedAfter: "2020-01-01", mergedBefore: "2020-01-05", first: 0) {
-              totalTimeToMerge
-              count
-            }
-            QUERY
-          end
-
-          it 'does not query the merge requests table for the total_time_to_merge' do
-            query_recorder = ActiveRecord::QueryRecorder.new { post_graphql(query, current_user: current_user) }
-
-            queries = query_recorder.data.each_value.first[:occurrences]
-            expect(queries).to include(match(/SELECT.+SUM.+FROM "merge_request_metrics" WHERE/))
-          end
+          expect(queries).to include(match(/SELECT.+SUM.+FROM "merge_request_metrics" WHERE/))
         end
+      end
 
-        it_behaves_like 'count examples'
-
-        context 'when "optimized_merge_request_count_with_merged_at_filter" feature flag is disabled' do
-          before do
-            stub_feature_flags(optimized_merge_request_count_with_merged_at_filter: false)
-          end
-
-          it 'queries the merge requests table for the count' do
-            query_recorder = ActiveRecord::QueryRecorder.new { post_graphql(query, current_user: current_user) }
-
-            queries = query_recorder.data.each_value.first[:occurrences]
-            expect(queries).to include(match(/SELECT COUNT\(\*\) FROM "merge_requests"/))
-            expect(queries).not_to include(match(/SELECT COUNT\(\*\) FROM "merge_request_metrics"/))
-          end
+      it 'returns the correct count' do
+        post_graphql(query, current_user: current_user)
 
-          it_behaves_like 'count examples'
-        end
+        count = graphql_data.dig('project', 'mergeRequests', 'count')
+        expect(count).to eq(1)
       end
     end
   end