From 673f977efcfeb65f69123a5a3035edadee54d985 Mon Sep 17 00:00:00 2001 From: Brenda Wallace Date: Wed, 25 Dec 2019 14:27:13 +1300 Subject: [PATCH] Photos controller using elastic search --- app/controllers/photos_controller.rb | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/app/controllers/photos_controller.rb b/app/controllers/photos_controller.rb index 9b7fb7c1b..849bdb11d 100644 --- a/app/controllers/photos_controller.rb +++ b/app/controllers/photos_controller.rb @@ -13,18 +13,20 @@ class PhotosController < ApplicationController end def index + where = {} if params[:crop_slug] @crop = Crop.find params[:crop_slug] - @photos = Photo.by_crop(@crop) + where = { crop_id: @crop.id} elsif params[:planting_id] @planting = Planting.find params[:planting_id] - @photos = @planting.photos - else - @photos = Photo.all + where = { planting_id: @planting.id} end - @photos = @photos.order(created_at: :desc) - .includes(:owner) - .paginate(page: params[:page]) + + @photos = Photo.search(load: false, + boost_by: [:created_at], + where: where, + page: params[:page], + limit: 50) respond_with(@photos) end