Merge branch 'staging' into production

Leandro Santos
2 parents a456b70c 5d9fcb3b
Showing 5 changed files with 52 additions and 2 deletions Show diff stats
app/models/article_follower.rb
db/migrate/20150909091347_add_followers_count_to_article.rb
lib/noosfero/api/entities.rb
test/fixtures/article_followers.yml
test/unit/api/articles_test.rb
 class ArticleFollower < ActiveRecord::Base
+
+  extend CacheCounterHelper
+
   attr_accessible :article_id, :person_id, :since
-  belongs_to :article
+  belongs_to :article, :counter_cache => :followers_count
   belongs_to :person
+
+  after_create do |article_follower|
+    ArticleFollower.update_cache_counter(:followers_count, article_follower.article, 1)
+  end
+
+  after_destroy do |article_follower|
+    ArticleFollower.update_cache_counter(:followers_count, article_follower.article, -1)
+  end
 end
@@ -0,0 +1,15 @@
+class AddFollowersCountToArticle < ActiveRecord::Migration
+
+  def self.up
+    add_column :articles, :followers_count, :integer, :default => 0
+    add_column :article_versions, :followers_count, :integer
+
+    execute "update articles set followers_count = (select count(*) from article_followers where article_followers.article_id = articles.id)"
+  end
+
+  def self.down
+    remove_column :article_versions, :followers_count
+    remove_column :articles, :followers_count
+  end
+
+end
@@ -99,6 +99,8 @@ module Noosfero
         expose :end_date, :documentation => {type: 'DateTime', desc: 'The date of finish of the article'}
         expose :tag_list
         expose :children_count
+        expose :followers_count
+        expose :slug, :documentation => {:type => "String", :desc => "Trimmed and parsed name of a article"}
       end
       class Article < ArticleBase
@@ -107,7 +109,6 @@ module Noosfero
         expose :children, using: ArticleBase do |article, options|
           article.children.limit(Noosfero::API::V1::Articles::MAX_PER_PAGE)
         end
-        expose :slug, :documentation => {:type => "String", :desc => "Trimmed and parsed name of a article"}
       end
       class Comment < Entity
@@ -0,0 +1,11 @@
+# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/Fixtures.html
+
+one:
+  person_id: 1
+  article_id: 1
+  since: 2015-06-16 17:02:01
+
+two:
+  person_id: 1
+  article_id: 1
+  since: 2015-06-16 17:02:01
@@ -100,6 +100,18 @@ class ArticlesTest &lt; ActiveSupport::TestCase
     assert_equal true, json['success']
   end
+  should 'return the followers count of an article' do
+    article = fast_create(Article, :profile_id => @person.id, :name => "Some thing")
+
+    article.person_followers << @person
+
+    get "/api/v1/articles/#{article.id}"
+    json = JSON.parse(last_response.body)
+
+    assert_equal 200, last_response.status
+    assert_equal 1, json['article']['followers_count']
+  end
+
   should 'return the followers of a article identified by id' do
     article = fast_create(Article, :profile_id => @person.id, :name => "Some thing")
1	class ArticleFollower < ActiveRecord::Base	1	class ArticleFollower < ActiveRecord::Base
		2	+
		3	+ extend CacheCounterHelper
		4	+
2	attr_accessible :article_id, :person_id, :since	5	attr_accessible :article_id, :person_id, :since
3	- belongs_to :article	6	+ belongs_to :article, :counter_cache => :followers_count
4	belongs_to :person	7	belongs_to :person
		8	+
		9	+ after_create do \|article_follower\|
		10	+ ArticleFollower.update_cache_counter(:followers_count, article_follower.article, 1)
		11	+ end
		12	+
		13	+ after_destroy do \|article_follower\|
		14	+ ArticleFollower.update_cache_counter(:followers_count, article_follower.article, -1)
		15	+ end
5	end	16	end
@@ -0,0 +1,15 @@		@@ -0,0 +1,15 @@
	1	+class AddFollowersCountToArticle < ActiveRecord::Migration
	2	+
	3	+ def self.up
	4	+ add_column :articles, :followers_count, :integer, :default => 0
	5	+ add_column :article_versions, :followers_count, :integer
	6	+
	7	+ execute "update articles set followers_count = (select count(*) from article_followers where article_followers.article_id = articles.id)"
	8	+ end
	9	+
	10	+ def self.down
	11	+ remove_column :article_versions, :followers_count
	12	+ remove_column :articles, :followers_count
	13	+ end
	14	+
	15	+end
@@ -0,0 +1,11 @@		@@ -0,0 +1,11 @@
	1	+# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/Fixtures.html
	2	+
	3	+one:
	4	+ person_id: 1
	5	+ article_id: 1
	6	+ since: 2015-06-16 17:02:01
	7	+
	8	+two:
	9	+ person_id: 1
	10	+ article_id: 1
	11	+ since: 2015-06-16 17:02:01
	@@ -100,6 +100,18 @@ class ArticlesTest < ActiveSupport::TestCase		@@ -100,6 +100,18 @@ class ArticlesTest < ActiveSupport::TestCase
100	assert_equal true, json['success']	100	assert_equal true, json['success']
101	end	101	end
102		102
		103	+ should 'return the followers count of an article' do
		104	+ article = fast_create(Article, :profile_id => @person.id, :name => "Some thing")
		105	+
		106	+ article.person_followers << @person
		107	+
		108	+ get "/api/v1/articles/#{article.id}"
		109	+ json = JSON.parse(last_response.body)
		110	+
		111	+ assert_equal 200, last_response.status
		112	+ assert_equal 1, json['article']['followers_count']
		113	+ end
		114	+
103	should 'return the followers of a article identified by id' do	115	should 'return the followers of a article identified by id' do
104	article = fast_create(Article, :profile_id => @person.id, :name => "Some thing")	116	article = fast_create(Article, :profile_id => @person.id, :name => "Some thing")
105		117