Merge branch 'master' of github.com:cakeside/cakeside into active-job

4 files changed, 12 insertions, 5 deletions

diff --git a/app/controllers/api/v2/cakes_controller.rb b/app/controllers/api/v2/cakes_controller.rb
index ec38e753..c310323d 100644
--- a/app/controllers/api/v2/cakes_controller.rb
+++ b/app/controllers/api/v2/cakes_controller.rb
@@ -1,17 +1,20 @@
 module Api
   module V2
     class CakesController < ApplicationController
+      attr_reader :repository
+
       def initialize(repository = Spank::IOC.resolve(:cakes))
         @repository = repository
         super()
       end
 
       def index
-        @cakes = @repository.search_with(params).includes(:category).page(page).per(per_page)
+        @cakes = paginate(repository.search_with(params).includes(:category))
+        @photos = Photo.processed.where(imageable_id: @cakes.pluck(:id))
       end
 
       def show(id = params[:id])
-        @cake = @repository.find(id)
+        @cake = repository.find(id)
       end
     end
   end
diff --git a/app/controllers/api/v2/categories_controller.rb b/app/controllers/api/v2/categories_controller.rb
index 365544b6..0f19b619 100644
--- a/app/controllers/api/v2/categories_controller.rb
+++ b/app/controllers/api/v2/categories_controller.rb
@@ -1,8 +1,8 @@
 module Api
   module V2
     class CategoriesController < ApplicationController
-      def show
-        @category = @categories.find(params[:id])
+      def show(id = params[:id])
+        @category = @categories.find(id)
       end
     end
   end
diff --git a/app/controllers/api/v2/photos_controller.rb b/app/controllers/api/v2/photos_controller.rb
index c4240327..380f610c 100644
--- a/app/controllers/api/v2/photos_controller.rb
+++ b/app/controllers/api/v2/photos_controller.rb
@@ -2,7 +2,7 @@ module Api
   module V2
     class PhotosController < ApplicationController
       def index
-        @photos = Photo.page(page).per(per_page)
+        @photos = paginate(Photo.processed)
       end
 
       def show(id = params[:id])
diff --git a/app/controllers/concerns/pageable.rb b/app/controllers/concerns/pageable.rb
index 606d7612..3b2c5bdd 100644
--- a/app/controllers/concerns/pageable.rb
+++ b/app/controllers/concerns/pageable.rb
@@ -9,4 +9,8 @@ module Pageable
   def per_page
     params[:per_page] || DEFAULT_PER_PAGE
   end
+
+  def paginate(items)
+    items.page(page).per(per_page)
+  end
 end