Merge branch 'staging' of gitlab.com:participa/noosfero into staging

Leandro Santos
2 parents 5fc67fe4 b4f4f4c9
Showing 6 changed files with 121 additions and 50 deletions Show diff stats
lib/noosfero/api/api.rb
lib/noosfero/api/helpers.rb
lib/noosfero/api/v1/contacts.rb
lib/noosfero/api/v1/search.rb
test/unit/api/articles_test.rb
test/unit/api/search_test.rb
@@ -52,6 +52,7 @@ module Noosfero
       mount V1::Tags
       mount V1::Environments
       mount V1::Search
+      mount V1::Contacts
       mount Session
@@ -143,9 +143,6 @@ require &#39;grape&#39;
         else
           articles = articles.published
         end
-        if params[:categories_ids]
-          articles = articles.joins(:categories).where('category_id in (?)', params[:categories_ids])
-        end
         articles
       end
@@ -248,6 +245,15 @@ require &#39;grape&#39;
          end
       end
+      def by_categories(scope, params)
+        category_ids = params[:category_ids]
+        if category_ids.nil?
+          scope
+        else
+          scope.joins(:categories).where(:categories => {:id => category_ids})
+        end
+      end
+
       def select_filtered_collection_of(object, method, params)
         conditions = make_conditions_with_parameter(params)
         order = make_order_with_parameters(object,method,params)
@@ -257,6 +263,7 @@ require &#39;grape&#39;
         objects = object.send(method)
         objects = by_reference(objects, params)
+        objects = by_categories(objects, params)
         objects = objects.where(conditions).where(timestamp).page(page_number).per_page(per_page).reorder(order)
@@ -0,0 +1,28 @@
+module Noosfero
+  module API
+    module V1
+      class Contacts < Grape::API
+  
+        resource :communities do
+
+          resource ':id/contact' do
+            #contaxt => {:name => 'some name', :email => 'test@mail.com', :subject => 'some title', :message => 'some message'}
+            desc "Send a contact message"
+            post do
+              profile = environment.communities.find(params[:id])
+              forbidden! unless profile.present?
+              contact = Contact.new params[:contact].merge(dest: profile)
+              if contact.deliver
+                {:success => true}
+              else
+                {:success => false}
+              end
+            end
+    
+          end
+        end
+  
+      end
+    end
+  end
+end
@@ -20,13 +20,13 @@ module Noosfero
               scope = scope.where(:type => params[:type]) if params[:type] && !(params[:type] == 'Article')
               scope = scope.where(:parent_id => params[:parent_id]) if params[:parent_id].present?
-              
-              category = params[:category] || ""
+              scope = scope.joins(:categories).where(:categories => {:id => params[:category_ids]}) if params[:category_ids].present?
+              
               query = params[:query] || ""             
               order = "more_recent"
-              options = {:filter => order, :template_id => params[:template_id], :category => category}            
+              options = {:filter => order, :template_id => params[:template_id]}
               search_result = find_by_contents(asset, context, scope, query, paginate_options, options)
@@ -546,7 +546,7 @@ class ArticlesTest &lt; ActiveSupport::TestCase
     e2.categories << c2
     e1.save!
     e2.save!
-    params['categories_ids[]']=c1.id
+    params['category_ids[]']=c1.id
     params['content_type']='Event'
     get "api/v1/communities/#{co.id}/articles?#{params.to_query}"
     json = JSON.parse(last_response.body)
@@ -555,6 +555,23 @@ class ArticlesTest &lt; ActiveSupport::TestCase
     assert_equal e1.id, json['articles'][0]['id']
   end
+  should 'not list uncategorized event of a community if a category is given' do
+    co = Community.create(identifier: 'my-community', name: 'name-my-community')
+    c1 = Category.create(environment: Environment.default, name: 'my-category')
+    c2 = Category.create(environment: Environment.default, name: 'dont-show-me-this-category')
+    e1 = fast_create(Event, :profile_id => co.id)
+    e2 = fast_create(Event, :profile_id => co.id)
+    e3 = fast_create(Event, :profile_id => co.id)
+    e1.categories << c1
+    e2.categories << c2
+    params['category_ids[]']=c1.id
+    params['content_type']='Event'
+    get "api/v1/communities/#{co.id}/articles?#{params.to_query}"
+    json = JSON.parse(last_response.body)
+    assert_equal 1, json['articles'].count
+    assert_equal e1.id, json['articles'][0]['id']
+  end
+
   should 'list events of a community in a given 2 categories' do
     co = Community.create(identifier: 'my-community', name: 'name-my-community')
     c1 = Category.create(environment: Environment.default, name: 'my-category')
@@ -2,13 +2,14 @@ require File.dirname(__FILE__) + &#39;/test_helper&#39;
 class SearchTest < ActiveSupport::TestCase
-  def create_article_with_optional_category(name, profile, category = nil, parent = nil)
-    fast_create(Article, {:name => name, :profile_id => profile.id }, :search => true, :category => category, :title => name, :parent => parent)
+  def setup
+    @person = create_user('testing').person
   end
+  attr_reader :person
   should 'not list unpublished articles' do
-    person = fast_create(Person)
-    article = fast_create(Article, :profile_id => person.id, :name => "Some thing", :published => false)
+    Article.delete_all
+    article = fast_create(Article, :profile_id => person.id, :published => false)
     assert !article.published?  	
     get "/api/v1/search/article"
     json = JSON.parse(last_response.body)    
@@ -16,52 +17,48 @@ class SearchTest &lt; ActiveSupport::TestCase
   end
   should 'list articles' do
-  	person = fast_create(Person)
-  	art = create_article_with_optional_category('an article to be found', person)
+    fast_create(Article, :profile_id => person.id)
     get "/api/v1/search/article"
     json = JSON.parse(last_response.body)
     assert_not_empty json['articles']
   end
   should 'invalid search string articles' do
-  	person = fast_create(Person)
-  	art = create_article_with_optional_category('an article to be found', person)
+    fast_create(Article, :profile_id => person.id, :name => 'some article')
     get "/api/v1/search/article?query=test"
     json = JSON.parse(last_response.body)    
     assert_empty json['articles']
   end
   should 'do not list articles of wrong type' do
-  	person = fast_create(Person)
-  	art = create_article_with_optional_category('an article to be found', person)
+    fast_create(Article, :profile_id => person.id)
     get "/api/v1/search/article?type=TinyMceArticle"
     json = JSON.parse(last_response.body)
     assert_empty json['articles']
   end
   should 'list articles of one type' do
-  	person = fast_create(Person)
-  	art = create_article_with_optional_category('an article to be found', person)
-  	article = fast_create(TinyMceArticle, :profile_id => person.id, :name => "Some thing", :published => true)
+    fast_create(Article, :profile_id => person.id)
+    article = fast_create(TinyMceArticle, :profile_id => person.id)
+  
     get "/api/v1/search/article?type=TinyMceArticle"
     json = JSON.parse(last_response.body)
-    assert_equal 1, json['articles'].count
+    assert_equal article.id, json['articles'].first['id']
   end
   should 'list articles of one type and query string' do
-  	person = fast_create(Person)
-  	art = create_article_with_optional_category('an article to be found', person)
-  	art1 = create_article_with_optional_category('article for query', person)
-  	article = fast_create(TinyMceArticle, :profile_id => person.id, :name => "Some thing", :published => true)
+    fast_create(Article, :profile_id => person.id, :name => 'some article')
+    fast_create(Article, :profile_id => person.id, :name => 'Some thing')
+    article = fast_create(TinyMceArticle, :profile_id => person.id, :name => 'Some thing')
     get "/api/v1/search/article?type=TinyMceArticle&query=thing"
     json = JSON.parse(last_response.body)
     assert_equal 1, json['articles'].count
+    assert_equal article.id, json['articles'].first['id']
   end
   should 'not return more entries than page limit' do
-  	person = fast_create(Person)
-    ('1'..'5').each do |n|
-      art = create_article_with_optional_category("Article #{n}", person)
+    1.upto(5).each do |n|
+      fast_create(Article, :profile_id => person.id, :name => "Article #{n}")
     end
     get "/api/v1/search/article?query=Article&per_page=3"
@@ -71,9 +68,8 @@ class SearchTest &lt; ActiveSupport::TestCase
   end
   should 'return entries second page' do
-  	person = fast_create(Person)
-    ('1'..'5').each do |n|
-      art = create_article_with_optional_category("Article #{n}", person)
+    1.upto(5).each do |n|
+      fast_create(Article, :profile_id => person.id, :name => "Article #{n}")
     end
     get "/api/v1/search/article?query=Article&per_page=3&page=2"
@@ -83,38 +79,60 @@ class SearchTest &lt; ActiveSupport::TestCase
   end
   should 'search articles in profile' do
-  	person1 = fast_create(Person)
-  	person2 = fast_create(Person)
-
-  	art1 = create_article_with_optional_category("Article 1 for profile #{person1.id}", person1)
-  	art2 = create_article_with_optional_category("Article for profile #{person2.id}", person2)
-  	art3 = create_article_with_optional_category("Article 2 for profile #{person1.id}", person1)
+    person2 = fast_create(Person)
+    fast_create(Article, :profile_id => person.id)
+    fast_create(Article, :profile_id => person.id)
+    article = fast_create(Article, :profile_id => person2.id)
-    get "/api/v1/search/article?query=Article&profile_id=#{person1.id}"
+    get "/api/v1/search/article?query=Article&profile_id=#{person2.id}"
     json = JSON.parse(last_response.body)
-    # Only for person1
-    assert_equal 2, json['articles'].count
+    assert_equal article.id, json['articles'].first['id']
   end
-  should 'search with fields' do
-	  person = fast_create(Person)
-  	art = create_article_with_optional_category('an article to be found', person)
+  should 'search and return values specified in fields parameter' do
+    fast_create(Article, :profile_id => person.id)
     get "/api/v1/search/article?fields=title"
     json = JSON.parse(last_response.body)
     assert_not_empty json['articles']
-	assert_equal ['title'], json['articles'].first.keys
+    assert_equal ['title'], json['articles'].first.keys
   end
   should 'search with parent' do
-    person = fast_create(Person)
-    parent = fast_create(Folder, :profile_id => person.id, :name => "parent", :published => true)
-    art = fast_create(Article, :profile_id => person.id, :name => "child", :parent_id => parent.id)
-    art2 = fast_create(Article, :profile_id => person.id, :name => "child2")
+    parent = fast_create(Folder, :profile_id => person.id)
+    fast_create(Article, :profile_id => person.id)
+    article = fast_create(Article, :profile_id => person.id, :parent_id => parent.id)
     get "/api/v1/search/article?parent_id=#{parent.id}"
     json = JSON.parse(last_response.body)
-    assert_not_empty json['articles']
-    assert_equal art.id, json['articles'].first["id"]
     assert_equal 1, json['articles'].count
+    assert_equal article.id, json['articles'].first["id"]
+  end  
+
+  should 'search filter by category' do
+    Article.delete_all
+    fast_create(Article, :profile_id => person.id)
+    article = fast_create(Article, :profile_id => person.id)
+    category = fast_create(Category)
+    article.categories<< category
+    get "/api/v1/search/article?category_ids=#{category.id}"
+    json = JSON.parse(last_response.body)
+    assert_equal 1, json['articles'].count
+    assert_equal article.id, json['articles'].first["id"]
+  end  
+
+  should 'search filter by more than one category' do
+    Article.delete_all
+    fast_create(Article, :profile_id => person.id)
+    article1 = fast_create(Article, :profile_id => person.id)
+    article2 = fast_create(Article, :profile_id => person.id)
+    category1 = fast_create(Category)
+    category2 = fast_create(Category)
+    article1.categories<< category1
+    article2.categories<< category2
+    get "/api/v1/search/article?category_ids[]=#{category1.id}&category_ids[]=#{category2.id}"
+    json = JSON.parse(last_response.body)
+    assert_equal 2, json['articles'].count
+    assert_equal article1.id, json['articles'].first["id"]
+    assert_equal article2.id, json['articles'].last["id"]
   end  
 end
	@@ -52,6 +52,7 @@ module Noosfero		@@ -52,6 +52,7 @@ module Noosfero
52	mount V1::Tags	52	mount V1::Tags
53	mount V1::Environments	53	mount V1::Environments
54	mount V1::Search	54	mount V1::Search
		55	+ mount V1::Contacts
55		56
56	mount Session	57	mount Session
57		58
@@ -0,0 +1,28 @@		@@ -0,0 +1,28 @@
	1	+module Noosfero
	2	+ module API
	3	+ module V1
	4	+ class Contacts < Grape::API
	5	+
	6	+ resource :communities do
	7	+
	8	+ resource ':id/contact' do
	9	+ #contaxt => {:name => 'some name', :email => 'test@mail.com', :subject => 'some title', :message => 'some message'}
	10	+ desc "Send a contact message"
	11	+ post do
	12	+ profile = environment.communities.find(params[:id])
	13	+ forbidden! unless profile.present?
	14	+ contact = Contact.new params[:contact].merge(dest: profile)
	15	+ if contact.deliver
	16	+ {:success => true}
	17	+ else
	18	+ {:success => false}
	19	+ end
	20	+ end
	21	+
	22	+ end
	23	+ end
	24	+
	25	+ end
	26	+ end
	27	+ end
	28	+end
	@@ -546,7 +546,7 @@ class ArticlesTest < ActiveSupport::TestCase		@@ -546,7 +546,7 @@ class ArticlesTest < ActiveSupport::TestCase
546	e2.categories << c2	546	e2.categories << c2
547	e1.save!	547	e1.save!
548	e2.save!	548	e2.save!
549	- params['categories_ids[]']=c1.id	549	+ params['category_ids[]']=c1.id
550	params['content_type']='Event'	550	params['content_type']='Event'
551	get "api/v1/communities/#{co.id}/articles?#{params.to_query}"	551	get "api/v1/communities/#{co.id}/articles?#{params.to_query}"
552	json = JSON.parse(last_response.body)	552	json = JSON.parse(last_response.body)
	@@ -555,6 +555,23 @@ class ArticlesTest < ActiveSupport::TestCase		@@ -555,6 +555,23 @@ class ArticlesTest < ActiveSupport::TestCase
555	assert_equal e1.id, json['articles'][0]['id']	555	assert_equal e1.id, json['articles'][0]['id']
556	end	556	end
557		557
		558	+ should 'not list uncategorized event of a community if a category is given' do
		559	+ co = Community.create(identifier: 'my-community', name: 'name-my-community')
		560	+ c1 = Category.create(environment: Environment.default, name: 'my-category')
		561	+ c2 = Category.create(environment: Environment.default, name: 'dont-show-me-this-category')
		562	+ e1 = fast_create(Event, :profile_id => co.id)
		563	+ e2 = fast_create(Event, :profile_id => co.id)
		564	+ e3 = fast_create(Event, :profile_id => co.id)
		565	+ e1.categories << c1
		566	+ e2.categories << c2
		567	+ params['category_ids[]']=c1.id
		568	+ params['content_type']='Event'
		569	+ get "api/v1/communities/#{co.id}/articles?#{params.to_query}"
		570	+ json = JSON.parse(last_response.body)
		571	+ assert_equal 1, json['articles'].count
		572	+ assert_equal e1.id, json['articles'][0]['id']
		573	+ end
		574	+
558	should 'list events of a community in a given 2 categories' do	575	should 'list events of a community in a given 2 categories' do
559	co = Community.create(identifier: 'my-community', name: 'name-my-community')	576	co = Community.create(identifier: 'my-community', name: 'name-my-community')
560	c1 = Category.create(environment: Environment.default, name: 'my-category')	577	c1 = Category.create(environment: Environment.default, name: 'my-category')