Merge branch 'allow_change_profile_image' into 'master'

Allow change profile image in profile api endpoint See merge request !996

Merge branch 'allow_change_profile_image' into 'master'
Allow change profile image in profile api endpoint See merge request !996
Victor Costa
2 parents cef35259 172b3c93
Showing 3 changed files with 17 additions and 3 deletions Show diff stats
app/api/helpers.rb
app/api/v1/profiles.rb
test/api/profiles_test.rb
@@ -403,12 +403,12 @@ module Api
     end
  
     def asset_with_image params
-      if params.has_key? :image_builder
+      if !params.nil? && params.has_key?(:image_builder)
         asset_api_params = params
         asset_api_params[:image_builder] = base64_to_uploadedfile(asset_api_params[:image_builder])
         return asset_api_params
       end
-        params
+      params
     end
  
     def base64_to_uploadedfile(base64_image)
@@ -28,7 +28,7 @@ module Api
           authenticate!
           profile = environment.profiles.find_by(id: params[:id])
           return forbidden! unless profile.allow_edit?(current_person)
-          profile.update_attributes!(params[:profile])
+          profile.update_attributes!(asset_with_image(params[:profile]))
           present profile, :with => Entities::Profile, :current_person => current_person
         end
  
@@ -218,4 +218,18 @@ class ProfilesTest &lt; ActiveSupport::TestCase
     json = JSON.parse(last_response.body)
     assert_includes json["permissions"], 'allow_post_content'
   end
+
+  should 'update profile image' do
+    login_api
+    community = fast_create(Community)
+    community.add_member(person)
+    base64_image = create_base64_image
+    params.merge!({profile: {image_builder: base64_image}})
+    assert_nil person.image
+    post "/api/v1/profiles/#{community.id}?#{params.to_query}"
+    community.reload
+    assert_not_nil community.image
+    assert_equal community.image.filename, base64_image[:filename]
+  end
+
 end
...	...	@@ -403,12 +403,12 @@ module Api
403	403	end
404	404
405	405	def asset_with_image params
406		- if params.has_key? :image_builder
	406	+ if !params.nil? && params.has_key?(:image_builder)
407	407	asset_api_params = params
408	408	asset_api_params[:image_builder] = base64_to_uploadedfile(asset_api_params[:image_builder])
409	409	return asset_api_params
410	410	end
411		- params
	411	+ params
412	412	end
413	413
414	414	def base64_to_uploadedfile(base64_image)
...	...
...	...	@@ -28,7 +28,7 @@ module Api
28	28	authenticate!
29	29	profile = environment.profiles.find_by(id: params[:id])
30	30	return forbidden! unless profile.allow_edit?(current_person)
31		- profile.update_attributes!(params[:profile])
	31	+ profile.update_attributes!(asset_with_image(params[:profile]))
32	32	present profile, :with => Entities::Profile, :current_person => current_person
33	33	end
34	34
...	...
...	...	@@ -218,4 +218,18 @@ class ProfilesTest < ActiveSupport::TestCase
218	218	json = JSON.parse(last_response.body)
219	219	assert_includes json["permissions"], 'allow_post_content'
220	220	end
	221	+
	222	+ should 'update profile image' do
	223	+ login_api
	224	+ community = fast_create(Community)
	225	+ community.add_member(person)
	226	+ base64_image = create_base64_image
	227	+ params.merge!({profile: {image_builder: base64_image}})
	228	+ assert_nil person.image
	229	+ post "/api/v1/profiles/#{community.id}?#{params.to_query}"
	230	+ community.reload
	231	+ assert_not_nil community.image
	232	+ assert_equal community.image.filename, base64_image[:filename]
	233	+ end
	234	+
221	235	end
...	...