Adding tests and refactored control_fields indexed

Signed-off-by: Macartur Sousa <macartur.sc@gmail.com>

Adding tests and refactored control_fields indexed
Signed-off-by: Macartur Sousa <macartur.sc@gmail.com>
Macartur Sousa
1 parent 123b7823
Showing 11 changed files with 59 additions and 39 deletions Show diff stats
plugins/elasticsearch/Rakefile
plugins/elasticsearch/lib/elasticsearch_indexed_model.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/test_helper.rb
plugins/elasticsearch/test/unit/models/community_test.rb
plugins/elasticsearch/test/unit/models/event_test.rb
plugins/elasticsearch/test/unit/models/person_test.rb
@@ -24,6 +24,7 @@ task :start do
   end
   sh 'sudo systemctl start elasticsearch'
   sh 'sudo systemctl enable elasticsearch'
+  sleep 100 # this sleep gives time to the service to be ready.
 end
 desc "stop elasticsearch"
@@ -7,7 +7,8 @@ module ElasticsearchIndexedModel
       settings index: { number_of_shards: 1 } do
         mappings dynamic: 'false' do
           base.indexable_fields.each do |field, value|
-            indexes field
+            value = {} if value.nil?
+            indexes field, type: value[:type].presence
             print '.'
           end
         end
@@ -26,7 +27,7 @@ module ElasticsearchIndexedModel
   module ClassMethods
     def indexable_fields
-      self::SEARCHABLE_FIELDS.keys + self.control_fields
+      self::SEARCHABLE_FIELDS.update self.control_fields
     end
   end
@@ -3,7 +3,7 @@ require_relative &#39;../elasticsearch_indexed_model&#39;
 class Community
   def self.control_fields
-    []
+    {}
   end
   include ElasticsearchIndexedModel
 end
@@ -3,10 +3,10 @@ require_relative &#39;../elasticsearch_indexed_model&#39;
 class Event
   def self.control_fields
-    [
-      :advertise,
-      :published,
-    ]
+    {
+      :advertise => {},
+      :published => {},
+    }
   end
   include ElasticsearchIndexedModel
 end
@@ -3,10 +3,10 @@ require_relative &#39;../elasticsearch_indexed_model&#39;
 class Person
   def self.control_fields
-    [
-      :visible,
-      :public_profile,
-    ]
+    {
+      :visible => {type: 'boolean'},
+      :public_profile => {type: 'boolean'},
+    }
   end
   include ElasticsearchIndexedModel
 end
@@ -3,10 +3,10 @@ require_relative &#39;../elasticsearch_indexed_model&#39;
 class TextArticle
   def self.control_fields
-    [
-      :advertise,
-      :published,
-    ]
+    {
+      :advertise => nil,
+      :published => nil,
+    }
   end
   include ElasticsearchIndexedModel
 end
@@ -3,10 +3,10 @@ require_relative &#39;../elasticsearch_indexed_model&#39;
 class UploadedFile
   def self.control_fields
-    [
-      :advertise,
-      :published,
-    ]
+    {
+      :advertise => nil,
+      :published => nil,
+    }
   end
   include ElasticsearchIndexedModel
 end
@@ -30,4 +30,8 @@ class ElasticsearchTestHelper &lt; ActionController::TestCase
     []
   end
+  def indexed_fields model
+    model.mappings.to_hash[model.name.downcase.to_sym][:properties]
+  end
+
 end
@@ -3,19 +3,24 @@ require &quot;#{File.dirname(__FILE__)}/../../test_helper&quot;
 class CommunityTest < ElasticsearchTestHelper
   def indexed_models
-    [Community, Person]
+    [Community]
   end
   def setup
-    @profile = create_user('testing').person
     super
   end
-  should 'index custom fields for Event model' do
-    community_cluster = Community.__elasticsearch__.client.cluster
+  should 'index searchable fields for Community model' do
+    Community::SEARCHABLE_FIELDS.each do |key, value|
+      assert_includes indexed_fields(Community), key
+    end
+  end
-    assert_not_nil Community.mappings.to_hash[:community][:properties][:name]
-    assert_not_nil Community.mappings.to_hash[:community][:properties][:identifier]
-    assert_not_nil Community.mappings.to_hash[:community][:properties][:nickname]
+  should 'index control fields for Community model' do
+    Community::control_fields.each do |key, value|
+      assert_includes indexed_fields(Community), key
+      assert_includes indexed_fields(Community)[key][:type], value[:type] || 'string'
+    end
   end
+
 end
@@ -7,14 +7,20 @@ class EventTest &lt; ElasticsearchTestHelper
   end
   def setup
-    @profile = create_user('testing').person
     super
   end
-  should 'index custom fields for Event model' do
-    event_cluster = Event.__elasticsearch__.client.cluster
+  should 'index searchable fields for Event model' do
+    Event::SEARCHABLE_FIELDS.each do |key, value|
+      assert_includes indexed_fields(Event), key
+    end
+  end
-    assert_not_nil Event.mappings.to_hash[:event][:properties][:advertise]
-    assert_not_nil Event.mappings.to_hash[:event][:properties][:published]
+  should 'index control fields for Event model' do
+    Event::control_fields.each do |key, value|
+      assert_includes indexed_fields(Event), key
+      assert_includes indexed_fields(Event)[key][:type], value[:type] || 'string'
+    end
   end
+
 end
@@ -3,21 +3,24 @@ require &quot;#{File.dirname(__FILE__)}/../../test_helper&quot;
 class PersonTest < ElasticsearchTestHelper
   def indexed_models
-    [Event]
+    [Person]
   end
   def setup
-    @profile = create_user('testing').person
     super
   end
-  should 'index custom fields for Event model' do
-    person_cluster = Person.__elasticsearch__.client.cluster
+  should 'index searchable fields for Person model' do
+    Person::SEARCHABLE_FIELDS.each do |key, value|
+      assert_includes indexed_fields(Person), key
+    end
+  end
-    assert_not_nil Person.mappings.to_hash[:person][:properties][:name]
-    assert_not_nil Person.mappings.to_hash[:person][:properties][:identifier]
-    assert_not_nil Person.mappings.to_hash[:person][:properties][:nickname]
-    assert_not_nil Person.mappings.to_hash[:person][:properties][:visible]
+  should 'index control fields for Person model' do
+    Person::control_fields.each do |key, value|
+      assert_includes indexed_fields(Person), key
+      assert_includes indexed_fields(Person)[key][:type], value[:type] || 'string'
+    end
   end
 end
	@@ -24,6 +24,7 @@ task :start do		@@ -24,6 +24,7 @@ task :start do
24	end	24	end
25	sh 'sudo systemctl start elasticsearch'	25	sh 'sudo systemctl start elasticsearch'
26	sh 'sudo systemctl enable elasticsearch'	26	sh 'sudo systemctl enable elasticsearch'
		27	+ sleep 100 # this sleep gives time to the service to be ready.
27	end	28	end
28		29
29	desc "stop elasticsearch"	30	desc "stop elasticsearch"
	@@ -3,7 +3,7 @@ require_relative '../elasticsearch_indexed_model'		@@ -3,7 +3,7 @@ require_relative '../elasticsearch_indexed_model'
3		3
4	class Community	4	class Community
5	def self.control_fields	5	def self.control_fields
6	- []	6	+ {}
7	end	7	end
8	include ElasticsearchIndexedModel	8	include ElasticsearchIndexedModel
9	end	9	end
	@@ -30,4 +30,8 @@ class ElasticsearchTestHelper < ActionController::TestCase		@@ -30,4 +30,8 @@ class ElasticsearchTestHelper < ActionController::TestCase
30	[]	30	[]
31	end	31	end
32		32
		33	+ def indexed_fields model
		34	+ model.mappings.to_hash[model.name.downcase.to_sym][:properties]
		35	+ end
		36	+
33	end	37	end