Skip to content

Commit 0ed91f6

Browse files
Updates per comments, added add_documents() function to helper
1 parent 5266ece commit 0ed91f6

File tree

2 files changed

+25
-24
lines changed

2 files changed

+25
-24
lines changed

test/integration/skill_controller_search_test.exs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,6 @@ defmodule SkillControllerSearchIntegrationTest do
2929
end
3030

3131
def init do
32-
ElasticSearchHelper.add_document(@test_url, @test_index, @type_value, %{title: "Elixir"}, [refresh: true])
33-
ElasticSearchHelper.add_document(@test_url, @test_index, @type_value, %{title: "Ruby"}, [refresh: true])
34-
ElasticSearchHelper.add_document(@test_url, @test_index, @type_value, %{title: "Rails"}, [refresh: true])
35-
ElasticSearchHelper.add_document(@test_url, @test_index, @type_value, %{title: "CSS"}, [refresh: true])
32+
ElasticSearchHelper.add_documents(@test_url, @test_index, @type_value, ["Elixir", "Ruby", "Rails", "CSS"], [refresh: true])
3633
end
3734
end

web/helpers/elastic_search_helper.ex

Lines changed: 24 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,10 @@ defmodule CodeCorps.ElasticSearchHelper do
1212
Index.settings(url, "#{index}/_mapping/#{type}", field_filter)
1313
end
1414

15+
def add_documents(url, index, type, documents, query) when is_list(documents) do
16+
Enum.each(documents, fn(x) -> add_document(url, index, type, to_map(type, x), query) end)
17+
end
18+
1519
def add_document(url, index, type, data, query) do
1620
Document.index_new(url, index, type, data, query)
1721
end
@@ -35,30 +39,30 @@ defmodule CodeCorps.ElasticSearchHelper do
3539
def to_map(foo, bar), do: %{ String.to_atom(foo) => bar}
3640

3741
defp settings_map do
38-
%{
39-
settings: %{
40-
number_of_shards: 5,
41-
analysis: %{
42-
filter: %{
43-
autocomplete_filter: %{
44-
type: "edge_ngram",
45-
min_gram: 2,
46-
max_gram: 20
47-
}
48-
},
49-
analyzer: %{
50-
autocomplete: %{
51-
type: "custom",
52-
tokenizer: "standard",
53-
filter: [
54-
"lowercase",
55-
"autocomplete_filter"
56-
]
42+
%{
43+
settings: %{
44+
number_of_shards: 5,
45+
analysis: %{
46+
filter: %{
47+
autocomplete_filter: %{
48+
type: "edge_ngram",
49+
min_gram: 2,
50+
max_gram: 20
51+
}
52+
},
53+
analyzer: %{
54+
autocomplete: %{
55+
type: "custom",
56+
tokenizer: "standard",
57+
filter: [
58+
"lowercase",
59+
"autocomplete_filter"
60+
]
61+
}
5762
}
5863
}
5964
}
6065
}
61-
}
6266
end
6367

6468
defp field_filter do

0 commit comments

Comments
 (0)