From e3a789c15e436b044da5bedc69473beb14e7ca76 Mon Sep 17 00:00:00 2001
From: Brenda Wallace <brenda@brenda.nz>
Date: Thu, 26 Dec 2019 23:15:38 +1300
Subject: [PATCH] indexed items matching database attributes

---
 app/models/concerns/finishable.rb       | 2 +-
 app/models/concerns/photo_capable.rb    | 4 ++++
 app/models/concerns/search_crops.rb     | 2 +-
 app/models/concerns/search_plantings.rb | 2 +-
 app/views/plantings/_progress.html.haml | 2 +-
 5 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/app/models/concerns/finishable.rb b/app/models/concerns/finishable.rb
index 6ff68e9c5..d4a4488dc 100644
--- a/app/models/concerns/finishable.rb
+++ b/app/models/concerns/finishable.rb
@@ -7,7 +7,7 @@ module Finishable
     scope :finished, -> { where(finished: true) }
     scope :current, -> { where.not(finished: true) }
 
-    def active?
+    def active
       !finished
     end
   end
diff --git a/app/models/concerns/photo_capable.rb b/app/models/concerns/photo_capable.rb
index b585d4b6b..94228047f 100644
--- a/app/models/concerns/photo_capable.rb
+++ b/app/models/concerns/photo_capable.rb
@@ -15,6 +15,10 @@ module PhotoCapable
       end
     end
 
+    def thumbnail_url
+      default_photo ? default_photos.thumbnail_url : nil
+    end
+
     def most_liked_photo
       photos.order(likes_count: :desc, created_at: :desc).first
     end
diff --git a/app/models/concerns/search_crops.rb b/app/models/concerns/search_crops.rb
index aaec73136..347fd02be 100644
--- a/app/models/concerns/search_crops.rb
+++ b/app/models/concerns/search_crops.rb
@@ -39,7 +39,7 @@ module SearchCrops
         # 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: thumbnail_url,
         scientific_name: default_scientific_name&.name,
         created_at: created_at.to_i
       }
diff --git a/app/models/concerns/search_plantings.rb b/app/models/concerns/search_plantings.rb
index bdf8dc788..064c869c1 100644
--- a/app/models/concerns/search_plantings.rb
+++ b/app/models/concerns/search_plantings.rb
@@ -20,7 +20,7 @@ module SearchPlantings
     def search_data
       {
         slug: slug,
-        active: active?,
+        active: active,
         crop_id: crop_id,
         crop_name: crop.name,
         crop_slug: crop.slug,
diff --git a/app/views/plantings/_progress.html.haml b/app/views/plantings/_progress.html.haml
index a61233f3e..692488457 100644
--- a/app/views/plantings/_progress.html.haml
+++ b/app/views/plantings/_progress.html.haml
@@ -1,4 +1,4 @@
-- if planting.active? && planting.annual? && planting.percentage_grown.present?
+- if planting.active && planting.annual? && planting.percentage_grown.present?
   .progress
     .progress-bar.bg-success{"aria-valuemax" => "100", "aria-valuemin" => "0", "aria-valuenow" => planting.percentage_grown, role: "progressbar", style: "width: #{planting.percentage_grown}%"}