Merge branch '2360-fix-mr-elasticsearch-by-iid' into 'master'

Fix the reference pattern for merge requests in elasticsearch

Closes #2360

See merge request !1833

app/models/concerns/elastic/application_search.rb

@@ -147,7 +147,7 @@ module Elastic
         query_hash
       end
 
-      def iid_query_hash(query_hash, iid)
+      def iid_query_hash(iid)
         {
           query: {
             bool: {

app/models/concerns/elastic/issues_search.rb

@@ -49,7 +49,7 @@ module Elastic
       def self.elastic_search(query, options: {})
         query_hash =
           if query =~ /#(\d+)\z/
-            iid_query_hash(query_hash, $1)
+            iid_query_hash($1)
           else
             basic_query_hash(%w(title^2 description), query)
           end

app/models/concerns/elastic/merge_requests_search.rb

@@ -61,8 +61,8 @@ module Elastic
 
       def self.elastic_search(query, options: {})
         query_hash =
-          if query =~ /#(\d+)\z/
-            iid_query_hash(query_hash, $1)
+          if query =~ /\!(\d+)\z/
+            iid_query_hash($1)
           else
             basic_query_hash(%w(title^2 description), query)
           end

spec/models/concerns/elastic/issue_spec.rb

@@ -28,6 +28,7 @@ describe Issue, elastic: true do
     options = { project_ids: [project.id] }
 
     expect(described_class.elastic_search('(term1 | term2 | term3) +bla-bla', options: options).total_count).to eq(2)
+    expect(described_class.elastic_search(Issue.last.to_reference, options: options).total_count).to eq(1)
   end
 
   it "returns json with all needed elements" do

spec/models/concerns/elastic/merge_request_spec.rb

@@ -28,6 +28,7 @@ describe MergeRequest, elastic: true do
     options = { project_ids: [project.id] }
 
     expect(described_class.elastic_search('term1 | term2 | term3', options: options).total_count).to eq(2)
+    expect(described_class.elastic_search(MergeRequest.last.to_reference, options: options).total_count).to eq(1)
   end
 
   it "returns json with all needed elements" do