Merge branch 'api-article-archived' into 'staging'

API - Article archived endpoints verification Was added on Grape API, archived article `Rails Validation Exceptions` and verification `Hits` article counter. News unit tests was created to check this situations. **Obs:** Please, check the merge request !2 before this See merge request !4

Merge branch 'api-article-archived' into 'staging'
API - Article archived endpoints verification Was added on Grape API, archived article `Rails Validation Exceptions` and verification `Hits` article counter. News unit tests was created to check this situations. **Obs:** Please, check the merge request !2 before this See merge request !4
Victor Costa
2 parents c76fbabe f56d5e71
Showing 5 changed files with 50 additions and 11 deletions Show diff stats
lib/noosfero/api/entities.rb
lib/noosfero/api/v1/articles.rb
lib/noosfero/api/v1/comments.rb
test/unit/api/articles_test.rb
test/unit/api/comments_test.rb
@@ -120,6 +120,7 @@ module Noosfero
         expose :followers_count
         expose :votes_count
         expose :comments_count
+        expose :archived, :documentation => {:type => "Boolean", :desc => "Defines if a article is readonly"}
       end
       class Article < ArticleBase
@@ -131,9 +131,8 @@ module Noosfero
             failure [[403, 'Forbidden']]
             named 'ArticleFollowers'
           end
-
-           #FIXME refactor this method
           get 'voted_by_me' do
+            #FIXME refactor this method
             present_articles_paginated(current_person.votes.where(:voteable_type => 'Article').collect(&:voteable))
           end
@@ -150,8 +149,14 @@ module Noosfero
             # FIXME verify allowed values
             render_api_error!('Vote value not allowed', 400) unless [-1, 1].include?(value)
             article = find_article(environment.articles, params[:id])
-            vote = Vote.new(:voteable => article, :voter => current_person, :vote => value)
-            {:vote => vote.save}
+
+            begin
+              vote = Vote.new(:voteable => article, :voter => current_person, :vote => value)
+              saved = vote.save!
+              {:vote => saved}
+            rescue ActiveRecord::RecordInvalid => e
+              render_api_error!(e.message, 400)
+            end
           end
           desc 'Return the children of a article identified by id' do
@@ -31,7 +31,13 @@ module Noosfero
           post ":id/comments" do
             article = find_article(environment.articles, params[:id])
             options = params.select { |key,v| !['id','private_token'].include?(key) }.merge(:author => current_person, :source => article)
-            present Comment.create(options), :with => Entities::Comment
+            begin
+              comment = Comment.create(options)
+              comment.save!
+            rescue ActiveRecord::RecordInvalid => e
+              render_api_error!(e.message, 400)
+            end
+            present comment, :with => Entities::Comment
           end
         end
@@ -138,6 +138,16 @@ class ArticlesTest &lt; ActiveSupport::TestCase
     assert_equal true, json['vote']
   end
+  should 'not perform a vote in a archived article' do
+    article = fast_create(Article, :profile_id => @person.id, :name => "Some thing", :archived => true)
+    @params[:value] = 1
+
+    post "/api/v1/articles/#{article.id}/vote?#{params.to_query}"
+    json = JSON.parse(last_response.body)
+
+    assert_equal 400, last_response.status
+  end
+
   expose_attributes = %w(id body abstract created_at title author profile categories image votes_for votes_against setting position hits start_date end_date tag_list parent children children_count)
   expose_attributes.each do |attr|
@@ -151,7 +161,7 @@ class ArticlesTest &lt; ActiveSupport::TestCase
   should "update body of article created by me" do
     new_value = "Another body"
-    params[:article] = {:body => new_value} 
+    params[:article] = {:body => new_value}
     article = fast_create(Article, :profile_id => person.id)
     post "/api/v1/articles/#{article.id}?#{params.to_query}"
     json = JSON.parse(last_response.body)
@@ -160,7 +170,7 @@ class ArticlesTest &lt; ActiveSupport::TestCase
   should "update title of article created by me" do
     new_value = "Another name"
-    params[:article] = {:name => new_value} 
+    params[:article] = {:name => new_value}
     article = fast_create(Article, :profile_id => person.id)
     post "/api/v1/articles/#{article.id}?#{params.to_query}"
     json = JSON.parse(last_response.body)
@@ -170,7 +180,7 @@ class ArticlesTest &lt; ActiveSupport::TestCase
   should 'not update article of another user' do
     another_person = fast_create(Person, :environment_id => environment.id)
     article = fast_create(Article, :profile_id => another_person.id)
-    params[:article] = {:title => 'Some title'} 
+    params[:article] = {:title => 'Some title'}
     post "/api/v1/articles/#{article.id}?#{params.to_query}"
     assert_equal 403, last_response.status
   end
@@ -178,7 +188,7 @@ class ArticlesTest &lt; ActiveSupport::TestCase
   should 'not update article without permission in community' do
     community = fast_create(Community, :environment_id => environment.id)
     article = fast_create(Article, :profile_id => community.id)
-    params[:article] = {:name => 'New title'} 
+    params[:article] = {:name => 'New title'}
     post "/api/v1/articles/#{article.id}?#{params.to_query}"
     assert_equal 403, last_response.status
   end
@@ -189,11 +199,11 @@ class ArticlesTest &lt; ActiveSupport::TestCase
     give_permission(person, 'post_content', community)
     article = fast_create(Article, :profile_id => community.id)
     new_value = "Another body"
-    params[:article] = {:body => new_value} 
+    params[:article] = {:body => new_value}
     post "/api/v1/articles/#{article.id}?#{params.to_query}"
     json = JSON.parse(last_response.body)
     assert_equal new_value, json["article"]["body"]
-  end 
+  end
   should 'list articles with pagination' do
     Article.destroy_all
@@ -520,6 +530,14 @@ class ArticlesTest &lt; ActiveSupport::TestCase
     assert_equal 1, json['article']['hits']
   end
+  should 'not update hit attribute of a specific child if a article is archived' do
+    folder = fast_create(Folder, :profile_id => user.person.id, :archived => true)
+    article = fast_create(Article, :parent_id => folder.id, :profile_id => user.person.id)
+    get "/api/v1/articles/#{folder.id}/children/#{article.id}?#{params.to_query}"
+    json = JSON.parse(last_response.body)
+    assert_equal 0, json['article']['hits']
+  end
+
   should 'list all events of a community in a given category' do
     co = Community.create(identifier: 'my-community', name: 'name-my-community')
     c1 = Category.create(environment: Environment.default, name: 'my-category')
@@ -66,6 +66,15 @@ class CommentsTest &lt; ActiveSupport::TestCase
     assert_equal body, json['comment']['body']
   end
+  should 'not comment an archived article' do
+    article = fast_create(Article, :profile_id => user.person.id, :name => "Some thing", :archived => true)
+    body = 'My comment'
+    params.merge!({:body => body})
+
+    post "/api/v1/articles/#{article.id}/comments?#{params.to_query}"
+    assert_equal 400, last_response.status
+  end
+
   should 'comment creation define the source' do
     amount = Comment.count
     article = fast_create(Article, :profile_id => user.person.id, :name => "Some thing")
	@@ -120,6 +120,7 @@ module Noosfero		@@ -120,6 +120,7 @@ module Noosfero
120	expose :followers_count	120	expose :followers_count
121	expose :votes_count	121	expose :votes_count
122	expose :comments_count	122	expose :comments_count
		123	+ expose :archived, :documentation => {:type => "Boolean", :desc => "Defines if a article is readonly"}
123	end	124	end
124		125
125	class Article < ArticleBase	126	class Article < ArticleBase
	@@ -66,6 +66,15 @@ class CommentsTest < ActiveSupport::TestCase		@@ -66,6 +66,15 @@ class CommentsTest < ActiveSupport::TestCase
66	assert_equal body, json['comment']['body']	66	assert_equal body, json['comment']['body']
67	end	67	end
68		68
		69	+ should 'not comment an archived article' do
		70	+ article = fast_create(Article, :profile_id => user.person.id, :name => "Some thing", :archived => true)
		71	+ body = 'My comment'
		72	+ params.merge!({:body => body})
		73	+
		74	+ post "/api/v1/articles/#{article.id}/comments?#{params.to_query}"
		75	+ assert_equal 400, last_response.status
		76	+ end
		77	+
69	should 'comment creation define the source' do	78	should 'comment creation define the source' do
70	amount = Comment.count	79	amount = Comment.count
71	article = fast_create(Article, :profile_id => user.person.id, :name => "Some thing")	80	article = fast_create(Article, :profile_id => user.person.id, :name => "Some thing")