Merge branch 'api-search' into staging

ABNER SILVA DE OLIVEIRA
2 parents 36eec74c 3ca7d77b
Showing 2 changed files with 28 additions and 12 deletions Show diff stats
lib/noosfero/api/v1/search.rb
test/unit/api/search_test.rb
@@ -11,18 +11,23 @@ module Noosfero
               # APIHelpers
               asset = :articles
               context = environment
-              scope = environment.articles.public
+
+              profile = environment.profiles.find(params[:profile_id]) if params[:profile_id]
+
+              scope = profile.nil? ? environment.articles.public : profile.articles.public
               scope = scope.where(:type => params[:type]) if params[:type] && !(params[:type] == 'Article')
               category = params[:category] || ""
+
               query = params[:query] || ""             
               order = "more_recent"
               options = {:filter => order, :template_id => params[:template_id], :category => category}            
               articles = find_by_contents(asset, context, scope, query, paginate_options, options)
-              present articles
+
+              present articles[:results], :with => Entities::Article 
             end            
           end
         end
@@ -12,7 +12,7 @@ class SearchTest &lt; ActiveSupport::TestCase
     assert !article.published?  	
     get "/api/v1/search/article"
     json = JSON.parse(last_response.body)    
-    assert_empty json['results']
+    assert_empty json['articles']
   end
   should 'list articles' do
@@ -20,7 +20,7 @@ class SearchTest &lt; ActiveSupport::TestCase
   	art = create_article_with_optional_category('an article to be found', person)
     get "/api/v1/search/article"
     json = JSON.parse(last_response.body)
-    assert_not_empty json['results']
+    assert_not_empty json['articles']
   end
   should 'invalid search string articles' do
@@ -28,7 +28,7 @@ class SearchTest &lt; ActiveSupport::TestCase
   	art = create_article_with_optional_category('an article to be found', person)
     get "/api/v1/search/article?query=test"
     json = JSON.parse(last_response.body)    
-    assert_empty json['results']
+    assert_empty json['articles']
   end
   should 'do not list articles of wrong type' do
@@ -36,7 +36,7 @@ class SearchTest &lt; ActiveSupport::TestCase
   	art = create_article_with_optional_category('an article to be found', person)
     get "/api/v1/search/article?type=TinyMceArticle"
     json = JSON.parse(last_response.body)
-    assert_empty json['results']
+    assert_empty json['articles']
   end
   should 'list articles of one type' do
@@ -45,7 +45,7 @@ class SearchTest &lt; ActiveSupport::TestCase
   	article = fast_create(TinyMceArticle, :profile_id => person.id, :name => "Some thing", :published => true)
     get "/api/v1/search/article?type=TinyMceArticle"
     json = JSON.parse(last_response.body)
-    assert_equal 1, json['results'].size
+    assert_equal 1, json['articles'].count
   end
   should 'list articles of one type and query string' do
@@ -55,7 +55,7 @@ class SearchTest &lt; ActiveSupport::TestCase
   	article = fast_create(TinyMceArticle, :profile_id => person.id, :name => "Some thing", :published => true)
     get "/api/v1/search/article?type=TinyMceArticle&query=thing"
     json = JSON.parse(last_response.body)
-    assert_equal 1, json['results'].size
+    assert_equal 1, json['articles'].count
   end
   should 'not return more entries than page limit' do
@@ -67,8 +67,7 @@ class SearchTest &lt; ActiveSupport::TestCase
     get "/api/v1/search/article?query=Article&limit=3"
     json = JSON.parse(last_response.body)
-
-    assert_equal 3, json['results'].size
+    assert_equal 3, json['articles'].count
   end
   should 'return entries second page' do
@@ -80,8 +79,20 @@ class SearchTest &lt; ActiveSupport::TestCase
     get "/api/v1/search/article?query=Article&limit=3&page=2"
     json = JSON.parse(last_response.body)
-
-    assert_equal 2, json['results'].size
+    assert_equal 2, json['articles'].count
   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)
+
+    get "/api/v1/search/article?query=Article&profile_id=#{person1.id}"
+    json = JSON.parse(last_response.body)
+    # Only for person1
+    assert_equal 2, json['articles'].count
+  end
 end
 \ No newline at end of file