[Git][noosfero/noosfero][master] 2 commits: api: accept search params in friends endpoint

[Leandro Nunes]

Leandro Nunes pushed to branch master at Noosfero / noosfero


Commits:
cbd282e3 by Victor Costa at 2017-03-28T12:25:20-03:00
api: accept search params in friends endpoint

- - - - -
73e6a743 by Leandro Nunes at 2017-03-30T14:33:38+00:00
Merge branch 'api-search-friends' into 'master'

api: accept search params in friends endpoint

See merge request !1154
- - - - -


2 changed files:

- app/api/v1/people.rb
- test/api/people_test.rb


Changes:

=====================================
app/api/v1/people.rb
=====================================
--- a/app/api/v1/people.rb
+++ b/app/api/v1/people.rb
@@ -89,7 +89,7 @@ module Api
         get ':id/friends' do
           person = environment.people.visible.find_by(id: params[:id])
           return not_found! if person.blank?
-          friends = person.friends.visible
+          friends = select_filtered_collection_of(person, person.friends.visible, params)
           present_partial friends, :with => Entities::Person, :current_person => current_person
         end
 


=====================================
test/api/people_test.rb
=====================================
--- a/test/api/people_test.rb
+++ b/test/api/people_test.rb
@@ -682,6 +682,18 @@ class PeopleTest < ActiveSupport::TestCase
     assert_equal 5, last_response.headers['Total'].to_i
   end
 
+  should 'search for friends' do
+    login_api
+    friend1 = fast_create(Person, name: 'John Snow')
+    person.add_friend(friend1)
+    friend2 = fast_create(Person, name: 'Other')
+    person.add_friend(friend2)
+    params[:search] = 'john'
+    get "/api/v1/people/#{person.id}/friends?#{params.to_query}"
+    json = JSON.parse(last_response.body)
+    assert_equal [friend1.id], json_response_ids
+  end
+
   #####
   
   ATTRIBUTES = [:email, :country, :state, :city, :nationality, :formation, :schooling]



View it on GitLab: https://gitlab.com/noosfero/noosfero/compare/1ac744dfa7cf2c6d1e874df32590579405144a47...73e6a743a0feb6325cafe44e374de734f2159173
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listas.softwarelivre.org/pipermail/noosfero-dev/attachments/20170330/9fa7a413/attachment-0001.html>