Merge branch 'master' of github.com:cakeside/cakeside into session-store

2 files changed, 9 insertions, 15 deletions

diff --git a/app/controllers/api/v1/cakes_controller.rb b/app/controllers/api/v1/cakes_controller.rb
index 195dcfc7..8888d286 100644
--- a/app/controllers/api/v1/cakes_controller.rb
+++ b/app/controllers/api/v1/cakes_controller.rb
@@ -10,25 +10,19 @@ module Api
       end
 
       def create
-        CreateCakeCommand.new(self).run(cake_params, params[:cake][:tags])
-      end
-
-      def create_cake_succeeded(cake)
-        @cake = cake
-      end
-
-      def create_cake_failed(cake)
-        @cake = cake
+        name = cake_params[:name]
+        category = Category.find(cake_params[:category_id])
+        @cake = current_user.create_cake(name: name, category: category)
+        if @cake.save
+          one_hour = 1.hour.from_now
+          PublishToTwitterJob.set(wait_until: one_hour).perform_later(@cake)
+        end
       end
 
       def update
         @cake = current_user.creations.find(params[:id])
         current_user.tag(@cake, with: params[:cake][:tags], on: :tags)
-        if @cake.update(cake_params.reject { |key, value| key == "tags" })
-          @cake
-        else
-          @cake
-        end
+        @cake.update!(cake_params.reject { |key, _| key == "tags" })
       end
 
       def destroy
diff --git a/app/controllers/cakes_controller.rb b/app/controllers/cakes_controller.rb
index e5396163..2cc418f4 100644
--- a/app/controllers/cakes_controller.rb
+++ b/app/controllers/cakes_controller.rb
@@ -5,7 +5,7 @@ class CakesController < ApplicationController
   end
 
   def index
-    @creations = @repository.search_with(params).page(page).per(per_page)
+    @cakes = @repository.search_with(params).distinct.page(page).per(per_page)
   end
 
   def show