blog-page: use article comments_count instead of querying the database for it

Was necessary to create a spam_comments_count in order to get the correct count without considering spams. ActionItem3201

blog-page: use article comments_count instead of querying the database for it
Was necessary to create a spam_comments_count in order to get the correct count without considering spams. ActionItem3201
Rodrigo Souto
1 parent 2c6eb234
Showing 6 changed files with 23 additions and 6 deletions Show diff stats
app/helpers/content_viewer_helper.rb
app/models/article.rb
app/models/comment.rb
db/migrate/20140709212646_add_spam_comments_counter_cache_to_articles.rb
db/schema.rb
test/unit/article_test.rb
@@ -10,7 +10,7 @@ module ContentViewerHelper
   end
   def number_of_comments(article)
-    display_number_of_comments(article.comments.without_spam.count)
+    display_number_of_comments(article.comments_count - article.spam_comments_count)
   end
   def article_title(article, args = {})
@@ -450,9 +450,9 @@ class Article &lt; ActiveRecord::Base
   end
   named_scope :published, :conditions => { :published => true }
-  named_scope :folders, lambda {|profile|{:conditions => { :type => profile.folder_types} }}
-  named_scope :no_folders, lambda {|profile|{:conditions => ['type NOT IN (?)', profile.folder_types]}}
-  named_scope :galleries, :conditions => { :type => 'Gallery' }
+  named_scope :folders, lambda {|profile|{:conditions => ['articles.type IN (?)', profile.folder_types] }}
+  named_scope :no_folders, lambda {|profile|{:conditions => ['articles.type NOT IN (?)', profile.folder_types]}}
+  named_scope :galleries, :conditions => [ "articles.type IN ('Gallery')" ]
   named_scope :images, :conditions => { :is_image => true }
   named_scope :text_articles, :conditions => [ 'articles.type IN (?)', text_article_types ]
   named_scope :with_types, lambda { |types| { :conditions => [ 'articles.type IN (?)', types ] } }
@@ -107,14 +107,17 @@ class Comment &lt; ActiveRecord::Base
   include Noosfero::Plugin::HotSpot
   include Spammable
+  include CacheCounterHelper
   def after_spam!
     SpammerLogger.log(ip_address, self)
     Delayed::Job.enqueue(CommentHandler.new(self.id, :marked_as_spam))
+    update_cache_counter(:spam_comments_count, source, 1) if source.kind_of?(Article)
   end
   def after_ham!
     Delayed::Job.enqueue(CommentHandler.new(self.id, :marked_as_ham))
+    update_cache_counter(:spam_comments_count, source, -1) if source.kind_of?(Article)
   end
   def verify_and_notify
@@ -0,0 +1,12 @@
+class AddSpamCommentsCounterCacheToArticles < ActiveRecord::Migration
+  def self.up
+    add_column :articles, :spam_comments_count, :integer, :default => 0
+    add_column :article_versions, :spam_comments_count, :integer, :default => 0
+    execute "update articles set spam_comments_count = (select count(*) from comments where comments.source_id = articles.id and comments.source_type = 'Article' and comments.spam = 't');"
+  end
+
+  def self.down
+    remove_column :articles, :spam_comments_count
+    remove_column :article_versions, :spam_comments_count
+  end
+end
@@ -9,7 +9,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
-ActiveRecord::Schema.define(:version => 20140505131703) do
+ActiveRecord::Schema.define(:version => 20140709212646) do
   create_table "abuse_reports", :force => true do |t|
     t.integer  "reporter_id"
@@ -93,6 +93,7 @@ ActiveRecord::Schema.define(:version =&gt; 20140505131703) do
     t.integer  "license_id"
     t.integer  "image_id"
     t.integer  "position"
+    t.integer  "spam_comments_count",  :default => 0
   end
   add_index "article_versions", ["article_id"], :name => "index_article_versions_on_article_id"
@@ -138,6 +139,7 @@ ActiveRecord::Schema.define(:version =&gt; 20140505131703) do
     t.integer  "license_id"
     t.integer  "image_id"
     t.integer  "position"
+    t.integer  "spam_comments_count",  :default => 0
   end
   add_index "articles", ["comments_count"], :name => "index_articles_on_comments_count"
@@ -1824,7 +1824,7 @@ class ArticleTest &lt; ActiveSupport::TestCase
     end
   end
- should 'return articles with specific types' do
+  should 'return articles with specific types' do
     Article.delete_all
     c1 = fast_create(TinyMceArticle, :name => 'Testing article 1', :body => 'Article body 1', :profile_id => profile.id)
	@@ -10,7 +10,7 @@ module ContentViewerHelper		@@ -10,7 +10,7 @@ module ContentViewerHelper
10	end	10	end
11		11
12	def number_of_comments(article)	12	def number_of_comments(article)
13	- display_number_of_comments(article.comments.without_spam.count)	13	+ display_number_of_comments(article.comments_count - article.spam_comments_count)
14	end	14	end
15		15
16	def article_title(article, args = {})	16	def article_title(article, args = {})
@@ -0,0 +1,12 @@		@@ -0,0 +1,12 @@
	1	+class AddSpamCommentsCounterCacheToArticles < ActiveRecord::Migration
	2	+ def self.up
	3	+ add_column :articles, :spam_comments_count, :integer, :default => 0
	4	+ add_column :article_versions, :spam_comments_count, :integer, :default => 0
	5	+ execute "update articles set spam_comments_count = (select count(*) from comments where comments.source_id = articles.id and comments.source_type = 'Article' and comments.spam = 't');"
	6	+ end
	7	+
	8	+ def self.down
	9	+ remove_column :articles, :spam_comments_count
	10	+ remove_column :article_versions, :spam_comments_count
	11	+ end
	12	+end
	@@ -1824,7 +1824,7 @@ class ArticleTest < ActiveSupport::TestCase		@@ -1824,7 +1824,7 @@ class ArticleTest < ActiveSupport::TestCase
1824	end	1824	end
1825	end	1825	end
1826		1826
1827	- should 'return articles with specific types' do	1827	+ should 'return articles with specific types' do
1828	Article.delete_all	1828	Article.delete_all
1829		1829
1830	c1 = fast_create(TinyMceArticle, :name => 'Testing article 1', :body => 'Article body 1', :profile_id => profile.id)	1830	c1 = fast_create(TinyMceArticle, :name => 'Testing article 1', :body => 'Article body 1', :profile_id => profile.id)