Adds created at as a type of sort

Signed-off-by: DylanGuedes <djmgguedes@gmail.com> Signed-off-by: Arthur Jahn <stutrzbecher@gmail.com>

Adds created at as a type of sort
Signed-off-by: DylanGuedes <djmgguedes@gmail.com> Signed-off-by: Arthur Jahn <stutrzbecher@gmail.com>
Dylan Guedes · Macartur Sousa
1 parent d8826231
Showing 10 changed files with 36 additions and 19 deletions Show diff stats
plugins/elasticsearch/controllers/elasticsearch_plugin_controller.rb
plugins/elasticsearch/helpers/elasticsearch_helper.rb
plugins/elasticsearch/lib/ext/community.rb
plugins/elasticsearch/lib/ext/event.rb
plugins/elasticsearch/lib/ext/person.rb
plugins/elasticsearch/lib/ext/text_article.rb
plugins/elasticsearch/lib/ext/uploaded_file.rb
plugins/elasticsearch/test/unit/controllers/elasticsearch_plugin_controller_test.rb
plugins/elasticsearch/views/elasticsearch_plugin/_person_display.html.erb
plugins/elasticsearch/views/elasticsearch_plugin/search.html.erb
@@ -27,12 +27,6 @@ class ElasticsearchPluginController &lt; ApplicationController
   def define_search_fields_types
     @search_filter_types = ElasticsearchHelper::search_filters
-    @selected_filter_field = (params[:selected_filter_field] || ElasticsearchHelper::search_filters.keys.first).to_sym
+    @selected_filter_field = (params[:selected_filter_field])
   end
-
-  private
-
-#  def permit_params
-#    params.require(:per_page, :query)
-#  end
 end
@@ -33,6 +33,15 @@ module ElasticsearchHelper
     fields.to_a
   end
+  def get_sort_by sort_by
+    case sort_by
+    when "lexical"
+      "name.raw"
+    when "recent"
+      "created_at"
+    end
+  end
+
   def process_results
     selected_type = (params[:selected_type]|| :all).to_sym
     if  selected_type == :all
@@ -43,7 +52,7 @@ module ElasticsearchHelper
   end
   def search_from_all_models
-    query = get_query params[:query]
+    query = get_query params[:query], sort_by: get_sort_by(params[:selected_filter_field])
     models = searchable_models
     Elasticsearch::Model.search(query, models, size: default_per_page(params[:per_page])).page(params[:page]).records
   end
@@ -51,7 +60,8 @@ module ElasticsearchHelper
   def search_from_model model
     begin
       klass = model.to_s.classify.constantize
-      query = get_query params[:query], klass
+
+      query = get_query params[:query], klass: klass, sort_by: get_sort_by(params[:selected_filter_field])
       klass.search(query, size: default_per_page(params[:per_page])).page(params[:page]).records
     rescue
       []
@@ -63,7 +73,7 @@ module ElasticsearchHelper
   end
   private
-  
+
   def searchable_models
     ElasticsearchHelper::searchable_types.except(:all).keys.map { | model | model.to_s.classify.constantize }
   end
@@ -87,12 +97,17 @@ module ElasticsearchHelper
     query_exp
   end
-  def get_query text="", klass=nil
+  def get_query text="", options={}
+    klass = options[:klass]
+    sort_by = options[:sort_by]
+
     fields = klass.nil? ? (fields_from_models searchable_models) : (fields_from_models [klass])
     query = {
-      query: query_method(text, fields),
-      sort: "name.raw"
+      query: query_method(text, fields)
     }
+    if sort_by
+      query[:sort] = sort_by
+    end
     query
   end
@@ -3,7 +3,9 @@ require_relative &#39;../elasticsearch_indexed_model&#39;
 class Community
   def self.control_fields
-    {}
+    {
+      :created_at => {type: 'date'}
+    }
   end
   include ElasticsearchIndexedModel
 end
@@ -6,6 +6,7 @@ class Event
     {
       :advertise => {},
       :published => {},
+      :created_at => {type: 'date'}
     }
   end
   include ElasticsearchIndexedModel
@@ -6,6 +6,7 @@ class Person
     {
       :visible => {type: 'boolean'},
       :public_profile => {type: 'boolean'},
+      :created_at => {type: 'date'}
     }
   end
   include ElasticsearchIndexedModel
@@ -5,7 +5,8 @@ class TextArticle
   def self.control_fields
     {
       :advertise => {},
-      :published => {}
+      :published => {},
+      :created_at => {type: 'date'}
     }
   end
   include ElasticsearchIndexedModel
@@ -6,6 +6,7 @@ class UploadedFile
     {
       :advertise => {},
       :published => {},
+      :created_at => {type: 'date'}
     }
   end
   include ElasticsearchIndexedModel
@@ -31,7 +31,6 @@ class ElasticsearchPluginControllerTest &lt; ActionController::TestCase
     assert_not_nil assigns(:searchable_types)
     assert_not_nil assigns(:selected_type)
     assert_not_nil assigns(:search_filter_types)
-    assert_not_nil assigns(:selected_filter_field)
   end
   should 'return 10 results if selected_type is nil and query is nil' do
@@ -7,6 +7,7 @@
     <div class="body">
       <h2><%= link_to person.name, person.url %></h2>
       <p><%= person.description %></p>
+      <%= person.created_at %>
     </div>
   </div>
 </div>
@@ -13,8 +13,8 @@
     <div class="search-filter">
       <h3 class="box-title"><%= _("Sort by") %></h3>
       <ul>
-        <% for type in @search_filter_types.values %>
-          <li><a href="#"><%= type[:label] %></a></li>
+        <% for type, value in @search_filter_types %>
+          <li><%= link_to value[:label], "?selected_type=#{@selected_type}&query=#{@query}&selected_filter_field=#{type}" %></li>
         <% end %>
       </ul>
     </div>
@@ -24,7 +24,9 @@
     <div class="search_field">
       <%= form_tag '/plugin/elasticsearch/search', method: :get  do %>
         <%= hidden_field_tag  "selected_type", @selected_type %>
-        <%= hidden_field_tag  "selected_filter_field", @selected_filter_field  %>
+        <% if @selected_filter_field %>
+          <%= hidden_field_tag  "selected_filter_field", @selected_filter_field  %>
+        <% end %>
         <%= text_field_tag :query, @query %>
         <%= submit_tag _("Send") %>
       <% end %>
	@@ -27,12 +27,6 @@ class ElasticsearchPluginController < ApplicationController		@@ -27,12 +27,6 @@ class ElasticsearchPluginController < ApplicationController
27		27
28	def define_search_fields_types	28	def define_search_fields_types
29	@search_filter_types = ElasticsearchHelper::search_filters	29	@search_filter_types = ElasticsearchHelper::search_filters
30	- @selected_filter_field = (params[:selected_filter_field] \|\| ElasticsearchHelper::search_filters.keys.first).to_sym	30	+ @selected_filter_field = (params[:selected_filter_field])
31	end	31	end
32	-
33	- private
34	-
35	-# def permit_params
36	-# params.require(:per_page, :query)
37	-# end
38	end	32	end
	@@ -31,7 +31,6 @@ class ElasticsearchPluginControllerTest < ActionController::TestCase		@@ -31,7 +31,6 @@ class ElasticsearchPluginControllerTest < ActionController::TestCase
31	assert_not_nil assigns(:searchable_types)	31	assert_not_nil assigns(:searchable_types)
32	assert_not_nil assigns(:selected_type)	32	assert_not_nil assigns(:selected_type)
33	assert_not_nil assigns(:search_filter_types)	33	assert_not_nil assigns(:search_filter_types)
34	- assert_not_nil assigns(:selected_filter_field)
35	end	34	end
36		35
37	should 'return 10 results if selected_type is nil and query is nil' do	36	should 'return 10 results if selected_type is nil and query is nil' do