From e6b4ec6fcf9bae6c60049b1d216766b951bf403c Mon Sep 17 00:00:00 2001
From: DylanGuedes <djmgguedes@gmail.com>
Date: Mon, 27 Jun 2016 14:30:23 +0000
Subject: [PATCH] Indexes models by raw nested in name, remove suggests

---
 plugins/elasticsearch/helpers/elasticsearch_helper.rb    | 18 +++---------------
 plugins/elasticsearch/lib/elasticsearch_indexed_model.rb | 10 +++++++---
 2 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/plugins/elasticsearch/helpers/elasticsearch_helper.rb b/plugins/elasticsearch/helpers/elasticsearch_helper.rb
index 902fa5f..e4ab04f 100644
--- a/plugins/elasticsearch/helpers/elasticsearch_helper.rb
+++ b/plugins/elasticsearch/helpers/elasticsearch_helper.rb
@@ -78,9 +78,9 @@ module ElasticsearchHelper
       query_exp = {
         multi_match: {
           query: expression,
-          type: "phrase",
           fields: fields,
-          zero_terms_query: "none"
+          tie_breaker: 0.4,
+          minimum_should_match: "40%"
         }
       }
     end
@@ -91,21 +91,9 @@ module ElasticsearchHelper
     fields = klass.nil? ? (fields_from_models searchable_models) : (fields_from_models [klass])
     query = {
       query: query_method(text, fields),
-      sort: [
-        {"name.raw" => {"order" => "desc"}}, "_score"
-      ],
-      suggest: {
-        autocomplete: {
-          text: text,
-          term: {
-            field: "name",
-            suggest_mode: "always"
-          }
-        }
-      }
+      sort: "name.raw"
     }
     query
   end
 
-
 end
diff --git a/plugins/elasticsearch/lib/elasticsearch_indexed_model.rb b/plugins/elasticsearch/lib/elasticsearch_indexed_model.rb
index dcecb7b..41b7964 100644
--- a/plugins/elasticsearch/lib/elasticsearch_indexed_model.rb
+++ b/plugins/elasticsearch/lib/elasticsearch_indexed_model.rb
@@ -13,10 +13,14 @@ module ElasticsearchIndexedModel
           base.indexable_fields.each do |field, value|
             value = {} if value.nil?
             if field.to_s == "name"
-              indexes "name.raw", type: "string", index: "not_analyzed"
-              indexes "name", type: "string"
+              indexes "name", type: "string", fields: {
+                raw: {
+                  type: "string",
+                  index: "not_analyzed"
+                }
+              }
             else
-            indexes field, type: value[:type].presence
+              indexes field, type: value[:type].presence
             end
             print '.'
           end
--
libgit2 0.21.2