Fix settings.yml, Update rake tasks, Remove client.en.yml.

Author: MMX

config/locales/client.en.yml

@@ -1,3 +1,7 @@
 en:
   site_settings:
-    discourse_elasticsearch_enabled: "Enable discourse-elasticsearch plugin"
+    elasticsearch_enabled: "Enable discourse-elasticsearch plugin test 123"
+    elasticsearch_autocomplete_enabled: "auto complete js"
+    elasticsearch_server_ip: "elasticsearch server ip address"
+    elasticsearch_server_port: "elasticsearch server port"
+    elasticsearch_discourse_username: "discourse username"

config/locales/server.en.yml

@@ -1,16 +1,16 @@
 plugins:
-  discourse_elasticsearch_enabled:
+  elasticsearch_enabled:
     default: true
     client: true
   elasticsearch_autocomplete_enabled:
     default: false
     client: true
   elasticsearch_server_ip:
-    default: ''
+    default: 'localhost'
     client: true
   elasticsearch_server_port:
-    default: ''
+    default: '9200'
     client: true
-  algolia_discourse_username:
+  elasticsearch_discourse_username:
     default: 'system'
     client: false

config/settings.yml

@@ -18,7 +18,7 @@ def self.index_user(user_id, discourse_event)
       return if user.blank? || !guardian.can_see?(user)
 
       user_record = to_user_record(user)
-      add_elasticsearch_single_info(USERS_INDEX, user_record, user_id)
+      add_elasticsearch_users(USERS_INDEX, user_record, user_id)
     end
 
     def self.to_user_record(user)
@@ -166,7 +166,7 @@ def self.index_tags(tag_names, discourse_event)
       tag_names.each do |tag_name|
         tag = Tag.find_by_name(tag_name)
         if tag && should_index_tag?(tag)
-          add_elasticsearch_single_info(TAGS_INDEX, to_tag_record(tag), tag.id)
+          add_elasticsearch_users(TAGS_INDEX, to_tag_record(tag), tag.id)
         end
       end
     end
@@ -175,14 +175,23 @@ def self.should_index_tag?(tag)
       tag.topic_count > 0
     end
 
-    def self.add_elasticsearch_single_info(index_name, record, user_id)
+    def self.add_elasticsearch_users(index_name, record, user_id)
       client = elasticsearch_index(index_name)
-      client.index  index: index_name, id: user_id, body: record
+      client.index index: index_name, id: user_id, body: record
     end
 
     def self.add_elasticsearch_posts(index_name, posts)
       client = elasticsearch_index(index_name)
-      client.index  index: index_name, body: posts
+      posts.each do |post|
+        client.index index: index_name, body: post
+      end
+    end
+
+    def self.add_elasticsearch_tags(index_name, tags)
+      client = elasticsearch_index(index_name)
+      tags.each do |tag|
+        client.index index: index_name, body: tag
+      end
     end
 
     def self.elasticsearch_index(index_name)
@@ -192,6 +201,15 @@ def self.elasticsearch_index(index_name)
       return client
     end
 
+    def self.clean_indices(index_name)
+      client = elasticsearch_index(index_name)
+      if client.indices.exists? index: index_name
+        client.indices.delete index: index_name
+      else
+        puts "Indices #{index_name} doesn't exist..."
+      end
+    end
+
     def self.guardian
       Guardian.new(User.find_by(username: SiteSetting.elasticsearch_discourse_username))
     end

lib/discourse_elasticsearch/elasticsearch_helper.rb

@@ -7,42 +7,90 @@ end
 desc "configure elasticsearch index settings"
 task "elasticsearch:configure" => :environment do
   elasticsearch_configure_users
-  #elasticsearch_configure_posts
-  #elasticsearch_configure_tags
+  elasticsearch_configure_posts
+  elasticsearch_configure_tags
 end
 
 desc "reindex everything to elasticsearch"
 task "elasticsearch:reindex" => :environment do
   elasticsearch_reindex_users
-  # elasticsearch_reindex_posts
-  # elasticsearch_reindex_tags
+  elasticsearch_reindex_posts
+  elasticsearch_reindex_tags
 end
 
+desc "reindex users in elasticsearch"
+task "elasticsearch:reindex_users" => :environment do
+  elasticsearch_reindex_users
+end
+
+desc "reindex posts in elasticsearch"
+task "elasticsearch:reindex_posts" => :environment do
+  elasticsearch_reindex_posts
+end
+
+desc "reindex tags in elasticsearch"
+task "elasticsearch:reindex_tags" => :environment do
+  elasticsearch_reindex_tags
+end
 
 def elasticsearch_configure_users
-  puts "[Starting] Pushing users index settings to Elasticsearch"
-  # DiscourseElasticsearch::ElasticsearchHelper.elasticsearch_index(
-  #   DiscourseElasticsearch::ElasticsearchHelper::USERS_INDEX).set_settings(
-  #   "searchableAttributes" => ["unordered(username)", "unordered(name)"],
-  #   "attributesToHighlight" => [:username, :name],
-  #   "attributesToRetrieve" => [:username, :name, :url, :avatar_template, :likes_received, :days_visited],
-  #   "customRanking" => ["desc(likes_received)", "desc(days_visited)"],
-  #   "removeWordsIfNoResults" => "allOptional"
-  # )
+  puts "[Starting] Cleaning users index to Elasticsearch"
+  DiscourseElasticsearch::ElasticsearchHelper.clean_indices(DiscourseElasticsearch::ElasticsearchHelper::USERS_INDEX)
   puts "[Finished] Successfully configured users index in Elasticsearch"
 end
 
+def elasticsearch_configure_posts
+  puts "[Starting] Cleaning posts index to Elasticsearch"
+  DiscourseElasticsearch::ElasticsearchHelper.clean_indices(DiscourseElasticsearch::ElasticsearchHelper::POSTS_INDEX)
+  puts "[Finished] Successfully configured posts index in Elasticsearch"
+end
+
+def elasticsearch_configure_tags
+  puts "[Starting] Cleaning tags index to Elasticsearch"
+  DiscourseElasticsearch::ElasticsearchHelper.clean_indices(DiscourseElasticsearch::ElasticsearchHelper::TAGS_INDEX)
+  puts "[Finished] Successfully configured tags index in Elasticsearch"
+end
+
 def elasticsearch_reindex_users
 
   puts "[Starting] Pushing users to Elasticsearch"
-  user_records = []
   User.all.each do |user|
     #user_records << DiscourseElasticsearch::ElasticsearchHelper.to_user_record(user)
-    user_record = DiscourseElasticsearch::ElasticsearchHelper.to_user_record(user)
+    puts user.id
+    user_record = DiscourseElasticsearch::ElasticsearchHelper.index_user(user.id, '')
     puts user_record
   end
-  # puts "[Progress] Gathered users from Discourse"
-  # DiscourseElasticsearch::ElasticsearchHelper.elasticsearch_index(
-  #   DiscourseElasticsearch::ElasticsearchHelper::USERS_INDEX).add_objects(user_records)
-  # puts "[Finished] Successfully pushed #{user_records.length} users to Algolia"
+end
+
+def elasticsearch_reindex_posts
+  puts "[Starting] Pushing posts to Elasticsearch"
+  post_records = []
+  Post.all.includes(:user, :topic).each do |post|
+    if DiscourseElasticsearch::ElasticsearchHelper.should_index_post?(post)
+      post_records << DiscourseElasticsearch::ElasticsearchHelper.to_post_records(post)
+    end
+  end
+  post_records.flatten!
+  puts "[Progress] Gathered posts from Discourse"
+  post_records.each_slice(100) do |slice|
+    DiscourseElasticsearch::ElasticsearchHelper.add_elasticsearch_posts(
+      DiscourseElasticsearch::ElasticsearchHelper::POSTS_INDEX, slice.flatten)
+    puts "[Progress] Pushed #{slice.length} post records to Elasticsearch"
+  end
+  puts "[Finished] Successfully pushed #{post_records.length} posts to Elasticsearch"
+end
+
+
+def elasticsearch_reindex_tags
+  puts "[Starting] Pushing tags to Elasticsearch"
+  tag_records = []
+  Tag.all.each do |tag|
+    if DiscourseElasticsearch::ElasticsearchHelper.should_index_tag?(tag)
+      tag_records << DiscourseElasticsearch::ElasticsearchHelper.to_tag_record(tag)
+    end
+  end
+  puts "[Progress] Gathered tags from Discourse"
+  DiscourseElasticsearch::ElasticsearchHelper.add_elasticsearch_tags(
+    DiscourseElasticsearch::ElasticsearchHelper::TAGS_INDEX, tag_records)
+  puts "[Finished] Successfully pushed #{tag_records.length} tags to Elasticsearch"
 end

lib/tasks/discourse_elasticsearch.rake

@@ -1,6 +1,6 @@
 # name: discourse-elasticsearch
 # about:
-# version: 0.1
+# version: 0.2
 # authors: imMMX
 # url: https://github.com/imMMX
 
@@ -15,7 +15,7 @@
 register_asset "stylesheets/common/discourse-elasticsearch.scss"
 
 
-enabled_site_setting :discourse_elasticsearch_enabled
+enabled_site_setting :elasticsearch_enabled
 
 PLUGIN_NAME ||= "discourse-elasticsearch".freeze