diff --git a/app/controllers/plantings_controller.rb b/app/controllers/plantings_controller.rb index cb2ce133e..768a18b90 100644 --- a/app/controllers/plantings_controller.rb +++ b/app/controllers/plantings_controller.rb @@ -27,10 +27,10 @@ class PlantingsController < ApplicationController @plantings = Planting.search( where: @where, - page: params[:page], - limit: 30, + page: params[:page], + limit: 30, boost_by: [:created_at], - load: false + load: false ) @filename = "Growstuff-#{specifics}Plantings-#{Time.zone.now.to_s(:number)}.csv" diff --git a/app/models/concerns/crop_search.rb b/app/models/concerns/crop_search.rb index 1e336c7c2..65e1499a2 100644 --- a/app/models/concerns/crop_search.rb +++ b/app/models/concerns/crop_search.rb @@ -23,18 +23,18 @@ module CropSearch def search_data { name: name, - description: description, + description: description, slug: slug, alternate_names: alternate_names.pluck(:name), scientific_names: scientific_names.pluck(:name), - photos_count: photo_associations_count, + photos_count: photo_associations_count, # boost the crops that are planted the most plantings_count: plantings_count, - harvests_count: harvests_count, + harvests_count: harvests_count, # boost this crop for these members planters_ids: plantings.pluck(:owner_id), has_photos: photos.size.positive?, - thumbnail_url: default_photo&.thumbnail_url, + thumbnail_url: default_photo&.thumbnail_url, scientific_name: default_scientific_name&.name, created_at: created_at.to_i } diff --git a/app/models/concerns/harvest_search.rb b/app/models/concerns/harvest_search.rb index ddf2a408b..37b3b5496 100644 --- a/app/models/concerns/harvest_search.rb +++ b/app/models/concerns/harvest_search.rb @@ -8,29 +8,29 @@ module HarvestSearch def search_data { - slug: slug, - crop_slug: crop.slug, - crop_name: crop.name, - crop_id: crop_id, - plant_part: plant_part&.name, - owner_id: owner_id, - owner_name: owner.login_name, - planting_id: planting_id, - photos_count: photos.size, - has_photos: photos.size.positive?, + slug: slug, + crop_slug: crop.slug, + crop_name: crop.name, + crop_id: crop_id, + plant_part: plant_part&.name, + owner_id: owner_id, + owner_name: owner.login_name, + planting_id: planting_id, + photos_count: photos.size, + has_photos: photos.size.positive?, thumbnail_url: default_photo&.thumbnail_url, - created_at: created_at.to_i + created_at: created_at.to_i } end def self.homepage_records(limit) search('*', - limit: limit, - where: { + limit: limit, + where: { photos_count: { gt: 0 } }, boost_by: [:created_at], - load: false) + load: false) end end end diff --git a/app/models/concerns/photo_search.rb b/app/models/concerns/photo_search.rb index 548cfa88e..6668a9189 100644 --- a/app/models/concerns/photo_search.rb +++ b/app/models/concerns/photo_search.rb @@ -4,16 +4,16 @@ module PhotoSearch included do searchkick - scope :search_import, -> { includes(:owner, :crop, :plantings, :harvests, :seeds, P:posts) } + scope :search_import, -> { includes(:owner, :crop, :plantings, :harvests, :seeds, P: posts) } def search_data { - slug: slug, - crops: crops.map(&:id), - owner_id: owner_id, - owner_name: owner.login_name, + slug: slug, + crops: crops.map(&:id), + owner_id: owner_id, + owner_name: owner.login_name, thumbnail_url: thumbnail_url, - created_at: created_at.to_i + created_at: created_at.to_i } end end diff --git a/app/models/concerns/planting_search.rb b/app/models/concerns/planting_search.rb index d56c89e08..09d4347f3 100644 --- a/app/models/concerns/planting_search.rb +++ b/app/models/concerns/planting_search.rb @@ -8,32 +8,32 @@ module PlantingSearch def search_data { - slug: slug, - crop_slug: crop.slug, - crop_name: crop.name, - crop_id: crop_id, - owner_id: owner_id, - owner_name: owner.login_name, - owner_slug: owner.slug, - planted_from: planted_from, - photos_count: photos.size, - harvests_count: harvests.size, - has_photos: photos.size.positive?, - active: active?, - thumbnail_url: default_photo&.thumbnail_url, + slug: slug, + crop_slug: crop.slug, + crop_name: crop.name, + crop_id: crop_id, + owner_id: owner_id, + owner_name: owner.login_name, + owner_slug: owner.slug, + planted_from: planted_from, + photos_count: photos.size, + harvests_count: harvests.size, + has_photos: photos.size.positive?, + active: active?, + thumbnail_url: default_photo&.thumbnail_url, percentage_grown: percentage_grown.to_i, - created_at: created_at.to_i + created_at: created_at.to_i } end def self.homepage_records(limit) search('*', - limit: limit, - where: { + limit: limit, + where: { photos_count: { gt: 0 } }, boost_by: [:created_at], - load: false) + load: false) end end end