Updated search function

Author: paulsullivanjr

test/integration/skill_controller_search_test.exs

@@ -14,17 +14,17 @@ defmodule SkillControllerSearchIntegrationTest do
   end
 
   test "search partial word" do
-   results = ElasticSearchHelper.search(@test_url, @test_index, "ru")
+   results = ElasticSearchHelper.search(@test_url, @test_index, "title", "ru")
    assert results == ["Ruby"]
   end
 
   test "search whole word" do
-    results = ElasticSearchHelper.search(@test_url, @test_index, "css")
+    results = ElasticSearchHelper.search(@test_url, @test_index, "title", "css")
     assert results == ["CSS"]
   end
 
   test "search no matches" do
-    results = ElasticSearchHelper.search(@test_url, @test_index, "foo")
+    results = ElasticSearchHelper.search(@test_url, @test_index, "title", "foo")
     assert results == []
   end
 

web/helpers/elastic_search_helper.ex

@@ -16,10 +16,10 @@ defmodule CodeCorps.ElasticSearchHelper do
     Document.index_new(url, index, type, data, query)
   end
 
-  def search(url, index, search_query) do
+  def search(url, index, type, search_query) do
     data = %{
       query: %{
-        match: %{ title: search_query }
+        match: to_map(type, search_query)
       }
     }
 
@@ -32,6 +32,8 @@ defmodule CodeCorps.ElasticSearchHelper do
     Enum.map(hits, fn(x) -> x["_source"]["title"] end)
   end
 
+  def to_map(foo, bar), do: %{ String.to_atom(foo) => bar}
+
   defp settings_map do
   %{
       settings: %{
@@ -72,13 +74,3 @@ defmodule CodeCorps.ElasticSearchHelper do
     }
   end
 end
-
-# elastix index.ex gets:
-  # custom method
-  #  @doc false
-  #  def settings(elastic_url, name, data) do
-    #  elastic_url <> make_path(name)
-    # |> HTTP.put(Poison.encode!(data))
-    #    |> process_response
-    #  end
-