From f4acbaa89ae35b8fcd6c56bee2cae5a147a67f2b Mon Sep 17 00:00:00 2001
From: Brenda Wallace <brenda@brenda.nz>
Date: Sat, 29 Feb 2020 19:51:53 +1300
Subject: [PATCH] Use pokemon for plant parts

---
 app/helpers/buttons_helper.rb           | 12 ------------
 app/models/concerns/search_plantings.rb |  2 +-
 lib/tasks/search.rake                   |  7 ++++---
 spec/factories/plant_parts.rb           |  2 +-
 4 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/app/helpers/buttons_helper.rb b/app/helpers/buttons_helper.rb
index 7e822e78b..850b6398a 100644
--- a/app/helpers/buttons_helper.rb
+++ b/app/helpers/buttons_helper.rb
@@ -31,18 +31,6 @@ module ButtonsHelper
             data: { confirm: 'All plantings associated with this garden will be marked as finished. Are you sure?' }
   end
 
-  def crop_plant_button(crop)
-    create_button(Planting,
-                  new_planting_path(params: { crop_id: crop.id }),
-                  planting_icon, t('buttons.plant'))
-  end
-
-  def crop_save_seeds_button(crop)
-    create_button(Seed,
-                  new_seed_path(params: { crop_id: crop.id }),
-                  seed_icon, t('buttons.save_seeds'))
-  end
-
   def create_button(model_to_create, path, icon, label)
     return unless can?(:create, model_to_create)
 
diff --git a/app/models/concerns/search_plantings.rb b/app/models/concerns/search_plantings.rb
index 61fd4fc2c..38490e809 100644
--- a/app/models/concerns/search_plantings.rb
+++ b/app/models/concerns/search_plantings.rb
@@ -26,7 +26,7 @@ module SearchPlantings
         percentage_grown:           percentage_grown.to_i,
         planted_at:                 planted_at,
         planted_from:               planted_from,
-        planted_year:               planted_at.year,
+        planted_year:               planted_at&.year,
         quantity:                   quantity,
         sunniness:                  sunniness,
         garden_id:                  garden_id,
diff --git a/lib/tasks/search.rake b/lib/tasks/search.rake
index d93fd601f..396a9f33b 100644
--- a/lib/tasks/search.rake
+++ b/lib/tasks/search.rake
@@ -3,8 +3,9 @@
 namespace :search do
   desc 'reindex'
   task reindex: :environment do
-    Crop.all.each_slice(50) do |batch|
-      Crop.searchkick_index.import(batch)
-    end
+    Crop.reindex
+    Planting.reindex
+    Harvest.reindex
+    Seed.reindex
   end
 end
diff --git a/spec/factories/plant_parts.rb b/spec/factories/plant_parts.rb
index 371ce3733..8b573fa54 100644
--- a/spec/factories/plant_parts.rb
+++ b/spec/factories/plant_parts.rb
@@ -4,6 +4,6 @@
 
 FactoryBot.define do
   factory :plant_part do
-    name { Faker::Lorem.unique.word }
+    name { Faker::Games::Pokemon.unique.name }
   end
 end