remove dead code and tidy up controller action.

2 files changed, 2 insertions, 10 deletions

diff --git a/app/controllers/api/v1/photos_controller.rb b/app/controllers/api/v1/photos_controller.rb
index 2e4d9709..49c60f04 100644
--- a/app/controllers/api/v1/photos_controller.rb
+++ b/app/controllers/api/v1/photos_controller.rb
@@ -12,16 +12,7 @@ module Api
       end
 
       def create
-        cake_id = params[:cake_id]
-        UploadPhoto.new.run(cake_id, params)
-        @photo = Creation.find(cake_id).photos.last
-        respond_with(@photo)
-      end
-
-      private
-
-      def photo_params
-        params.require(:photo).permit(:image, :watermark)
+        respond_with(@photo = UploadPhoto.new.run(params[:cake_id], params))
       end
     end
   end
diff --git a/app/services/application/upload_photo.rb b/app/services/application/upload_photo.rb
index eb669786..cba399c8 100644
--- a/app/services/application/upload_photo.rb
+++ b/app/services/application/upload_photo.rb
@@ -8,6 +8,7 @@ class UploadPhoto
     photo = @cakes.find(cake_id).photos.create!(image_processing: true, watermark: params[:watermark])
     @message_bus.publish(:upload_photo, create_message_from(cake_id, params, photo))
     map_from(photo.id, params[:image].original_filename)
+    photo
   end
 
   private