From 86a8f95e60393c403421bb51a231e16a033163cc Mon Sep 17 00:00:00 2001
From: Brenda Wallace <brenda@brenda.nz>
Date: Sat, 21 Dec 2019 17:55:34 +1300
Subject: [PATCH] get photo from crop (saved into ES)

---
 app/models/concerns/harvest_search.rb  | 2 +-
 app/models/concerns/planting_search.rb | 2 +-
 app/models/concerns/seed_search.rb     | 6 ++++--
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/models/concerns/harvest_search.rb b/app/models/concerns/harvest_search.rb
index 7850fd8d7..936a7d00d 100644
--- a/app/models/concerns/harvest_search.rb
+++ b/app/models/concerns/harvest_search.rb
@@ -27,7 +27,7 @@ module HarvestSearch
         planting_id: planting_id,
         photos_count: photos.size,
         has_photos: photos.size.positive?,
-        thumbnail_url: default_photo&.thumbnail_url,
+        thumbnail_url: default_photo&.thumbnail_url || crop.default_photo&.thumbnail_url,
         created_at: created_at.to_i
       }
     end
diff --git a/app/models/concerns/planting_search.rb b/app/models/concerns/planting_search.rb
index 7e5837195..38f37261e 100644
--- a/app/models/concerns/planting_search.rb
+++ b/app/models/concerns/planting_search.rb
@@ -37,7 +37,7 @@ module PlantingSearch
         planted_from: planted_from,
         quantity: quantity,
         sunniness: sunniness,
-        thumbnail_url: default_photo&.thumbnail_url,
+        thumbnail_url: default_photo&.thumbnail_url || crop.default_photo&.thumbnail_url,
         created_at: created_at.to_i
       }
     end
diff --git a/app/models/concerns/seed_search.rb b/app/models/concerns/seed_search.rb
index d2389d70d..833f331f1 100644
--- a/app/models/concerns/seed_search.rb
+++ b/app/models/concerns/seed_search.rb
@@ -31,10 +31,11 @@ module SeedSearch
         photos_count: photos.size,
         plant_before: plant_before,
         quantity: quantity,
-        thumbnail_url: default_photo&.thumbnail_url,
+        thumbnail_url: default_photo&.thumbnail_url || crop.default_photo&.thumbnail_url,
         tradable_to: tradable_to,
         tradeable: tradable?,
         finished: finished?,
+        location: location,
         created_at: created_at.to_i
       }
     end
@@ -43,7 +44,8 @@ module SeedSearch
       search('*',
              limit: limit,
              where: {
-               photos_count: { gt: 0 }
+               finished: false,
+               tradeable: true,
              },
              boost_by: [:created_at],
              load: false)