Merge branch '273234-update-mapping-config' into 'master'

Update Elasticsearch document for issues

See merge request gitlab-org/gitlab!46916

ee/lib/elastic/latest/issue_instance_proxy.rb

@@ -14,6 +14,15 @@ module Elastic
 
         data['assignee_id'] = safely_read_attribute_for_elasticsearch(:assignee_ids)
 
+        # protect against missing project_feature and set visibility to PRIVATE
+        # if the project_feature is missing on a project
+        begin
+          data['issues_access_level'] = target.project.project_feature.issues_access_level
+        rescue NoMethodError => e
+          Gitlab::ErrorTracking.track_exception(e, project_id: target.project_id, issue_id: target.id)
+          data['issues_access_level'] = ProjectFeature::PRIVATE
+        end
+
         data.merge(generic_attributes)
       end
     end

ee/spec/models/concerns/elastic/issue_spec.rb

@@ -56,7 +56,7 @@ RSpec.describe Issue, :elastic do
     end
   end
 
-  it "searches issues" do
+  it "searches issues", :aggregate_failures do
     Sidekiq::Testing.inline! do
       create :issue, title: 'bla-bla term1', project: project
       create :issue, description: 'bla-bla term2', project: project
@@ -129,10 +129,20 @@ RSpec.describe Issue, :elastic do
     })
 
     expected_hash['assignee_id'] = [assignee.id]
+    expected_hash['issues_access_level'] = issue.project.project_feature.issues_access_level
 
     expect(issue.__elasticsearch__.as_indexed_json).to eq(expected_hash)
   end
 
+  it 'handles a project missing project_feature' do
+    issue = create :issue, project: project
+    allow(issue.project).to receive(:project_feature).and_return(nil)
+
+    expect(Gitlab::ErrorTracking).to receive(:track_exception)
+
+    expect(issue.__elasticsearch__.as_indexed_json['issues_access_level']).to eq(ProjectFeature::PRIVATE)
+  end
+
   context 'field length limits' do
     context 'when there is an elasticsearch_indexed_field_length limit' do
       it 'truncates to the default plan limit' do