From 41ed4a967485a23615f4722cb41d4574fd26c5be Mon Sep 17 00:00:00 2001
From: Lars Henrik Mai <lars.mai@kontinui.de>
Date: Mon, 22 Jun 2015 20:38:24 +0200
Subject: [PATCH] add filter by paper_type

---
 app/controllers/search_controller.rb |  5 ++++-
 app/models/paper.rb                  | 31 +++++++++++++++++++++-------
 2 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/app/controllers/search_controller.rb b/app/controllers/search_controller.rb
index 47ccdac..a7b7008 100644
--- a/app/controllers/search_controller.rb
+++ b/app/controllers/search_controller.rb
@@ -1,6 +1,9 @@
 class SearchController < ApplicationController
   def index
-    @response = Paper.search(params[:q])
+    @paper_type = params[:paper_type]
+    options = params.slice(:paper_type)
+
+    @response = Paper.search(params[:q], options)
     @papers = @response.page(params[:page]).results
     @paper_type_facets = @response.response['aggregations']['paper_types']['buckets'].map {|h| [ h['key'], h['doc_count']] }
     @originator_facets = @response.response['aggregations']['originators']['buckets'].map {|h| [ h['key'], h['doc_count']] }
diff --git a/app/models/paper.rb b/app/models/paper.rb
index a9cc9fd..4a109af 100644
--- a/app/models/paper.rb
+++ b/app/models/paper.rb
@@ -43,17 +43,32 @@ class Paper < ActiveRecord::Base
     # use DSL to define search queries
     # see https://github.com/elastic/elasticsearch-ruby/tree/master/elasticsearch-dsl
     # and https://github.com/elastic/elasticsearch-rails/tree/master/elasticsearch-rails/lib/rails/templates
-    def search(q)
+    def search(q, options={})
       @search_definition = Elasticsearch::DSL::Search.search do
 
         query do
-          unless q.blank?
-            multi_match do
-              query q
-              fields ["name", "content"]
+          filtered do
+
+            query do
+              # search query
+              unless q.blank?
+                multi_match do
+                  query q
+                  fields ["name", "content"]
+                end
+              else
+                match_all
+              end
             end
-          else
-            match_all
+
+            # filters
+            filter do
+              bool do
+                must { term paper_type: options[:paper_type] } if options[:paper_type]
+                must { match_all } unless options[:paper_type]
+              end
+            end
+
           end
         end
 
@@ -70,7 +85,7 @@ class Paper < ActiveRecord::Base
         end
 
       end
-      puts @search_definition.to_hash
+      Rails.logger.debug "Query: #{@search_definition.to_json}"
       __elasticsearch__.search(@search_definition)
     end