Merge branch 'sh-fix-protected-environments-nplusone' into 'master'

Fix N+1 SQL queries with protected environments

Closes #55346

See merge request gitlab-org/gitlab!22101

ee/app/models/ee/project.rb

@@ -589,7 +589,11 @@ module EE
     def protected_environment_by_name(environment_name)
       return unless protected_environments_feature_available?
 
-      protected_environments.find_by(name: environment_name)
+      key = "protected_environment_by_name:#{id}:#{environment_name}"
+
+      ::Gitlab::SafeRequestStore.fetch(key) do
+        protected_environments.find_by(name: environment_name)
+      end
     end
 
     override :after_import

ee/changelogs/unreleased/sh-fix-protected-environments-nplusone.yml

+---
+title: Fix N+1 SQL queries with protected environments
+merge_request: 22101
+author:
+type: performance

ee/spec/models/project_spec.rb

@@ -1448,7 +1448,7 @@ describe Project do
   end
 
   describe '#protected_environment_by_name' do
-    let(:project) { create(:project) }
+    let_it_be(:project) { create(:project) }
 
     subject { project.protected_environment_by_name('production') }
 
@@ -1465,19 +1465,27 @@ describe Project do
 
     context 'when Protected Environments feature is available on the project' do
       let(:feature_available) { true }
-      let(:environment) { create(:environment, name: 'production') }
-      let(:protected_environment) { create(:protected_environment, name: environment.name, project: project) }
+
+      context 'when the project environment does not exists' do
+        it { is_expected.to be_nil }
+      end
 
       context 'when the project environment exists' do
-        before do
-          protected_environment
-        end
+        let_it_be(:environment) { create(:environment, name: 'production') }
+        let_it_be(:protected_environment) { create(:protected_environment, name: environment.name, project: project) }
 
         it { is_expected.to eq(protected_environment) }
-      end
 
-      context 'when the project environment does not exists' do
-        it { is_expected.to be_nil }
+        it 'caches environment name', :request_store do
+          control_count = ActiveRecord::QueryRecorder.new { project.protected_environment_by_name(protected_environment.name) }
+
+          expect do
+            2.times { project.protected_environment_by_name(protected_environment.name) }
+          end.not_to exceed_query_limit(control_count)
+
+          expect(project.protected_environment_by_name('non-existent-env')).to be_nil
+          expect(project.protected_environment_by_name(protected_environment.name)).to eq(protected_environment)
+        end
       end
     end
   end