return type of content & disable cache for now

Rakefile

@@ -51,9 +51,9 @@ namespace :db do
     Subscription.delete_all
   end
 
-  THREADS_PER_COMMENTABLE = 3
-  TOP_COMMENTS_PER_THREAD = 2
-  ADDITIONAL_COMMENTS_PER_THREAD = 1
+  THREADS_PER_COMMENTABLE = 20
+  TOP_COMMENTS_PER_THREAD = 3
+  ADDITIONAL_COMMENTS_PER_THREAD = 5
 
   COURSE_ID = "MITx/6.002x/2012_Fall"
 

config/application.yml

 level_limit: 3
-cache_enabled: true
+cache_enabled: false
 cache_timeout:
-  threads_search: 60
-  threads_query: 60
+  threads_search: 10
+  threads_query: 10

models/comment.rb

@@ -49,13 +49,14 @@ class Comment < Content
       self.class.hash_tree(subtree(sort: sort_by_parent_and_time)).first
     else
       as_document.slice(*%w[body course_id endorsed anonymous created_at updated_at at_position_list])
-                  .merge("id" => _id)
-                  .merge("user_id" => author.id)
-                  .merge("username" => author.username)
-                  .merge("depth" => depth)
-                  .merge("closed" => comment_thread.closed)
-                  .merge("thread_id" => comment_thread.id)
-                  .merge("votes" => votes.slice(*%w[count up_count down_count point]))
+                 .merge("id" => _id)
+                 .merge("user_id" => author.id)
+                 .merge("username" => author.username)
+                 .merge("depth" => depth)
+                 .merge("closed" => comment_thread.closed)
+                 .merge("thread_id" => comment_thread.id)
+                 .merge("votes" => votes.slice(*%w[count up_count down_count point]))
+                 .merge("type" => "comment")
     end
   end
 

models/comment_thread.rb

@@ -149,11 +149,12 @@ class CommentThread < Content
 
   def to_hash(params={})
     doc = as_document.slice(*%w[title body course_id anonymous commentable_id created_at updated_at at_position_list closed])
-                      .merge("id" => _id)
-                      .merge("user_id" => author.id)
-                      .merge("username" => author.username)
-                      .merge("votes" => votes.slice(*%w[count up_count down_count point]))
-                      .merge("tags" => tags_array)
+                     .merge("id" => _id)
+                     .merge("user_id" => author.id)
+                     .merge("username" => author.username)
+                     .merge("votes" => votes.slice(*%w[count up_count down_count point]))
+                     .merge("tags" => tags_array)
+                     .merge("type" => "thread")
 
     if params[:recursive]
       doc = doc.merge("children" => root_comments.map{|c| c.to_hash(recursive: true)})