Added search endpoint for elasticsearch, updated to return maps

Author: paulsullivanjr

test/integration/skill_controller_search_test.exs

@@ -6,6 +6,12 @@ defmodule SkillControllerSearchIntegrationTest do
   @test_index  "skills"
   @type_value "title"
 
+  @elixir %{"id" => 1, "description" => "Elixir is an awesome functional language", "title" =>  "Elixir", "original_row" => 1}
+  @ruby %{"id" => 2, "description" => "Ruby is an awesome OO language", "title" => "Ruby", "original_row" => 2}
+  @rails %{"id" => 3, "description" => "Rails is a modern framework", "title" => "Rails", "original_row" => 3}
+  @css %{"id" => 4, "description" => "CSS is pretty cool too", "title" => "CSS", "original_row" => 4}
+  @phoenix %{"id" => 5, "description" => "Phoenix is a super framework", "title" => "Phoenix", "original_row" => 5}
+
   setup do
     ElasticSearchHelper.delete(@test_url, @test_index)
     ElasticSearchHelper.create_index(@test_url, @test_index, @type_value)
@@ -15,7 +21,7 @@ defmodule SkillControllerSearchIntegrationTest do
 
   test "search partial word" do
    results = ElasticSearchHelper.search(@test_url, @test_index, "title", "ru")
-   assert results == ["Ruby"]
+   assert results == [@ruby]
   end
 
   test "fuzzy search partial word" do
@@ -25,12 +31,12 @@ defmodule SkillControllerSearchIntegrationTest do
 
   test "search whole word" do
     results = ElasticSearchHelper.search(@test_url, @test_index, "title", "css")
-    assert results == ["CSS"]
+    assert results == [@css]
   end
 
   test "fuzzy search whole word" do
     results = ElasticSearchHelper.search(@test_url, @test_index, "title", "csw")
-    assert results == ["CSS"]
+    assert results == [@css]
   end
 
   test "search no matches" do
@@ -40,10 +46,11 @@ defmodule SkillControllerSearchIntegrationTest do
 
   test "match all entries" do
     results = ElasticSearchHelper.match_all(@test_url, @test_index, "title")
-    assert results -- ["Elixir", "Ruby", "Rails", "CSS"] == []
+    assert results -- [@elixir, @ruby, @rails, @css] == []
   end
 
   def init do
-    ElasticSearchHelper.add_documents(@test_url, @test_index, @type_value, ["Elixir", "Ruby", "Rails", "CSS"], [refresh: true])
+    ElasticSearchHelper.add_documents(@test_url, @test_index, @type_value,
+      [@elixir, @css, @ruby], [refresh: true])
   end
 end

web/controllers/skill_controller.ex

@@ -9,6 +9,10 @@ defmodule CodeCorps.SkillController do
   plug :load_and_authorize_resource, model: Skill, only: [:create]
   plug JaResource
 
+  @elasticsearch_index "skills"
+  @elasticsearch_type "title"
+  @elasticsearch_url  Application.get_env(:code_corps, :elasticsearch_url)
+
   def filter(_conn, query, "id", id_list) do
     query |> id_filter(id_list)
   end
@@ -18,4 +22,9 @@ defmodule CodeCorps.SkillController do
     |> title_filter(params)
     |> limit_filter(params)
   end
+
+  def search(_conn, params) do
+    CodeCorps.ElasticSearchHelper.search(@elasticsearch_url, @elasticsearch_index, @elasticsearch_type, query)
+  end
+
 end

web/helpers/elastic_search_helper.ex

@@ -17,7 +17,7 @@ defmodule CodeCorps.ElasticSearchHelper do
   end
 
   def add_documents(url, index, type, documents, query) when is_list(documents) do
-    Enum.each(documents, fn(x) -> add_document(url, index, type, %{"#{type}" => x}, query) end)
+    Enum.each(documents, fn(x) -> add_document(url, index, type, x, query) end)
   end
 
   def add_document(url, index, type, data) do
@@ -47,7 +47,7 @@ defmodule CodeCorps.ElasticSearchHelper do
   end
 
   def process_response(%HTTPoison.Response{status_code: 200} = response, type) do
-    response.body["hits"]["hits"] |> Enum.map(fn(x) -> x["_source"][type] end)
+    response.body["hits"]["hits"] |> Enum.map(fn(x) -> x["_source"] end)
   end
 
   def process_response(_), do: []

web/router.ex

@@ -68,6 +68,7 @@ defmodule CodeCorps.Router do
     resources "/roles", RoleController, only: [:create]
     resources "/role-skills", RoleSkillController, only: [:create, :delete]
     resources "/skills", SkillController, only: [:create]
+    resources "/skills/search", SkillController, only: [:show]
     resources "/stripe-connect-accounts", StripeConnectAccountController, only: [:show, :create, :update]
     resources "/stripe-connect-plans", StripeConnectPlanController, only: [:show, :create]
     resources "/stripe-connect-subscriptions", StripeConnectSubscriptionController, only: [:show, :create]