Elasticsearch: refacted sort by

* Changed name from helpers to display sort_types * Adding dynamic sort to text_article * indexed category_ids to be used after Signed-off-by: Macartur Sousa <macartur.sc@gmail.com>

Elasticsearch: refacted sort by
* Changed name from helpers to display sort_types * Adding dynamic sort to text_article * indexed category_ids to be used after Signed-off-by: Macartur Sousa <macartur.sc@gmail.com>
Macartur Sousa
1 parent e4628511
Showing 8 changed files with 44 additions and 25 deletions Show diff stats
plugins/elasticsearch/controllers/elasticsearch_plugin_controller.rb
plugins/elasticsearch/helpers/elasticsearch_helper.rb
plugins/elasticsearch/helpers/searchable_model/elasticsearch_indexed_model.rb
plugins/elasticsearch/lib/elasticsearch_plugin/api.rb
plugins/elasticsearch/lib/ext/community.rb
plugins/elasticsearch/lib/ext/person.rb
plugins/elasticsearch/lib/ext/text_article.rb
plugins/elasticsearch/views/elasticsearch_plugin/search.html.erb
@@ -11,7 +11,7 @@ class ElasticsearchPluginController &lt; ApplicationController
   def search
     define_searchable_types
-    define_search_fields_types
+    define_sort_types
     define_results
   end
@@ -26,9 +26,9 @@ class ElasticsearchPluginController &lt; ApplicationController
     @selected_type = (params[:selected_type]|| :all ).to_sym
   end
-  def define_search_fields_types
-    @filter_types = filters
-    @selected_filter = (params[:filter] || :relevance).to_sym
+  def define_sort_types
+    @sort_types = sort_types
+    @selected_sort = (params[:filter] || :relevance).to_sym
   end
 end
@@ -11,8 +11,8 @@ module ElasticsearchHelper
     }
   end
-  def filters
-    filters = {
+  def sort_types
+    sorts = {
      :relevance      => { label: _("Relevance")},
      :lexical        => { label: _("Alphabetical")},
      :more_recent    => { label: _("More Recent")},
@@ -20,11 +20,11 @@ module ElasticsearchHelper
     selected_type = params[:selected_type] ||  nil
-    if selected_type
+    if selected_type and selected_type.to_sym != :all
       klass = selected_type.to_s.classify.constantize
-      filters.update klass.especific_filter if klass.respond_to? :especific_filter
+      sorts.update klass.especific_sort if klass.respond_to? :especific_sort
     end
-    filters
+    sorts
   end
   def process_results
@@ -66,8 +66,9 @@ module ElasticsearchIndexedModel
     def indexed_fields
       fields = {
-                :environment    => {type: :nested, hash: NestedEnvironment::environment_hash },
-                :created_at     => {type: :date }
+                :environment  => {type: :nested, hash: NestedEnvironment::environment_hash },
+                :category_ids => {type: :integer },
+                :created_at   => {type: :date }
       }
       fields.update(self::SEARCHABLE_FIELDS)
       fields.update(self.control_fields)
@@ -18,8 +18,8 @@ class ElasticsearchPlugin::API &lt; Grape::API
       present types, with: Grape::Presenters::Presenter
     end
-    get 'filters' do
-      present filters, with: Grape::Presenters::Presenter
+    get 'sort_types' do
+      present sort_types, with: Grape::Presenters::Presenter
     end
   end
@@ -23,7 +23,7 @@ class Community
     ]
   end
-  def self.especific_filter
+  def self.especific_sort
     {
       :more_active  => { label: _("More Active") },
       :more_popular => { label: _("More Popular") }
@@ -24,7 +24,7 @@ class Person
     ]
   end
-  def self.especific_filter
+  def self.especific_sort
     {
       :more_active  => { label: _("More Active") },
       :more_popular => { label: _("More Popular") }
@@ -10,9 +10,11 @@ class TextArticle
   def self.control_fields
     {
-      :advertise => { type: :boolean },
-      :published => { type: 'boolean'},
-      :profile   => { type: :nested , hash: NestedProfile.hash }
+      :advertise      => { type: :boolean },
+      :published      => { type: 'boolean'},
+      :comments_count => { type: :integer },
+      :hits           => { type: :integer },
+      :profile        => { type: :nested , hash: NestedProfile.hash }
     }
   end
@@ -32,5 +34,21 @@ class TextArticle
     ]
   end
+  def self.especific_sort
+    {
+      :more_popular   => { label: _("More Viewed") },
+      :more_comments  => { label: _("More Commented") }
+    }
+  end
+
+  def self.get_sort_by  sort_by
+    case sort_by
+      when "more_popular"
+        { :hits => {order: :desc} }
+      when "more_comments"
+        { :comments_count => {order: :desc}}
+    end
+  end
+
   include SearchableModelHelper
 end
@@ -26,18 +26,18 @@
     <div class="sidebar">
       <ul class="search-options">
         <% for type,value in @searchable_types %>
-        <li class="select-search-type <%= "active" if type == @selected_type %>">
-          <%= link_to  value[:label], "?selected_type=#{type}&query=#{@query}&filter=#{@selected_filter}"%>
-        </li>
+          <li class="select-search-type <%= "active" if type == @selected_type %>">
+            <%= link_to  value[:label], "?selected_type=#{type}&query=#{@query}&filter=#{@selected_sort}"%>
+          </li>
         <% end %>
       </ul>
       <div class="search-filter">
         <h3 class="box-title"><%= _("Sort by") %></h3>
         <ul>
-          <% for type, value in @filter_types %>
-          <li class="select-search-type <%= "active" if type == @selected_filter %>">
-            <%= link_to value[:label], "?selected_type=#{@selected_type}&query=#{@query}&filter=#{type}" %>
-          </li>
+          <% for type, value in @sort_types %>
+            <li class="select-search-type <%= "active" if type == @selected_sort %>">
+              <%= link_to value[:label], "?selected_type=#{@selected_type}&query=#{@query}&filter=#{type}" %>
+            </li>
           <% end %>
         </ul>
       </div>
	@@ -23,7 +23,7 @@ class Community		@@ -23,7 +23,7 @@ class Community
23	]	23	]
24	end	24	end
25		25
26	- def self.especific_filter	26	+ def self.especific_sort
27	{	27	{
28	:more_active => { label: _("More Active") },	28	:more_active => { label: _("More Active") },
29	:more_popular => { label: _("More Popular") }	29	:more_popular => { label: _("More Popular") }
	@@ -24,7 +24,7 @@ class Person		@@ -24,7 +24,7 @@ class Person
24	]	24	]
25	end	25	end
26		26
27	- def self.especific_filter	27	+ def self.especific_sort
28	{	28	{
29	:more_active => { label: _("More Active") },	29	:more_active => { label: _("More Active") },
30	:more_popular => { label: _("More Popular") }	30	:more_popular => { label: _("More Popular") }
	@@ -10,9 +10,11 @@ class TextArticle		@@ -10,9 +10,11 @@ class TextArticle
10		10
11	def self.control_fields	11	def self.control_fields
12	{	12	{
13	- :advertise => { type: :boolean },
14	- :published => { type: 'boolean'},
15	- :profile => { type: :nested , hash: NestedProfile.hash }	13	+ :advertise => { type: :boolean },
		14	+ :published => { type: 'boolean'},
		15	+ :comments_count => { type: :integer },
		16	+ :hits => { type: :integer },
		17	+ :profile => { type: :nested , hash: NestedProfile.hash }
16	}	18	}
17	end	19	end
18		20
	@@ -32,5 +34,21 @@ class TextArticle		@@ -32,5 +34,21 @@ class TextArticle
32	]	34	]
33	end	35	end
34		36
		37	+ def self.especific_sort
		38	+ {
		39	+ :more_popular => { label: _("More Viewed") },
		40	+ :more_comments => { label: _("More Commented") }
		41	+ }
		42	+ end
		43	+
		44	+ def self.get_sort_by sort_by
		45	+ case sort_by
		46	+ when "more_popular"
		47	+ { :hits => {order: :desc} }
		48	+ when "more_comments"
		49	+ { :comments_count => {order: :desc}}
		50	+ end
		51	+ end
		52	+
35	include SearchableModelHelper	53	include SearchableModelHelper
36	end	54	end