From fa0e8314884915a1e85d68fcdab2cfafa022f3fb Mon Sep 17 00:00:00 2001
From: Daniel O'Connor <daniel.oconnor@gmail.com>
Date: Fri, 26 Jan 2024 10:31:34 +0000
Subject: [PATCH 1/4] Bump searchkick

---
 Gemfile.lock | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 0425e65d1b..4ca9561913 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -376,7 +376,7 @@ GEM
     moneta (1.0.0)
     multi_json (1.15.0)
     multi_xml (0.6.0)
-    multipart-post (2.2.3)
+    multipart-post (2.3.0)
     net-imap (0.3.7)
       date
       net-protocol
@@ -578,9 +578,8 @@ GEM
       tilt
     scout_apm (5.3.5)
       parser
-    searchkick (4.6.3)
-      activemodel (>= 5)
-      elasticsearch (>= 6, < 7.14)
+    searchkick (5.3.1)
+      activemodel (>= 6.1)
       hashie
     selenium-webdriver (4.16.0)
       rexml (~> 3.2, >= 3.2.5)

From 28aebbd15240e4c657fcf0c2e13db8c97db1526b Mon Sep 17 00:00:00 2001
From: Daniel O'Connor <daniel.oconnor@gmail.com>
Date: Fri, 26 Jan 2024 10:39:12 +0000
Subject: [PATCH 2/4] Bump to 7.0.0

---
 Gemfile      |  2 +-
 Gemfile.lock | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Gemfile b/Gemfile
index ec34f05f3c..8ff0bf8dc4 100644
--- a/Gemfile
+++ b/Gemfile
@@ -100,7 +100,7 @@ gem 'omniauth-twitter'
 gem "chartkick"
 
 # clever elastic search
-gem 'elasticsearch', '< 7.0.0'
+gem 'elasticsearch', '~> 7.0.0'
 gem 'searchkick'
 
 gem "hashie", ">= 3.5.3"
diff --git a/Gemfile.lock b/Gemfile.lock
index 4ca9561913..f74c0c1c4d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -208,18 +208,18 @@ GEM
     dotenv-rails (2.8.1)
       dotenv (= 2.8.1)
       railties (>= 3.2)
-    elasticsearch (6.8.3)
-      elasticsearch-api (= 6.8.3)
-      elasticsearch-transport (= 6.8.3)
-    elasticsearch-api (6.8.3)
+    elasticsearch (7.0.0)
+      elasticsearch-api (= 7.0.0)
+      elasticsearch-transport (= 7.0.0)
+    elasticsearch-api (7.0.0)
       multi_json
     elasticsearch-model (7.1.1)
       activesupport (> 3)
       elasticsearch (> 1)
       hashie
     elasticsearch-rails (7.1.0)
-    elasticsearch-transport (6.8.3)
-      faraday (~> 1)
+    elasticsearch-transport (7.0.0)
+      faraday
       multi_json
     erubi (1.12.0)
     erubis (2.7.0)
@@ -677,7 +677,7 @@ DEPENDENCIES
   devise
   discard (>= 1.2)
   dotenv-rails
-  elasticsearch (< 7.0.0)
+  elasticsearch (~> 7.0.0)
   factory_bot_rails
   faker
   faraday

From 37138246cb7482bcb332b18ca59cac3ea10fcdbf Mon Sep 17 00:00:00 2001
From: Daniel O'Connor <daniel.oconnor@gmail.com>
Date: Fri, 26 Jan 2024 10:48:12 +0000
Subject: [PATCH 3/4] Fix

---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 2cd38e58f8..4b2fe99488 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -227,11 +227,11 @@ GEM
       dotenv (= 2.8.1)
       railties (>= 3.2)
     dumb_delegator (1.0.0)
-      multi_json
     elasticsearch (7.0.0)
       elasticsearch-api (= 7.0.0)
       elasticsearch-transport (= 7.0.0)
     elasticsearch-api (7.0.0)
+      multi_json
     elasticsearch-model (7.1.1)
       activesupport (> 3)
       elasticsearch (> 1)

From ae9fa485faae358d61a593d896005c572dc825e8 Mon Sep 17 00:00:00 2001
From: Daniel O'Connor <daniel.oconnor@gmail.com>
Date: Fri, 26 Jan 2024 12:08:48 +0000
Subject: [PATCH 4/4] Fix crop search

---
 app/controllers/crops_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/crops_controller.rb b/app/controllers/crops_controller.rb
index 8b76fdd370..1332967a10 100644
--- a/app/controllers/crops_controller.rb
+++ b/app/controllers/crops_controller.rb
@@ -63,7 +63,7 @@ def search
     @crops = CropSearchService.search(@term,
                                       page:           params[:page],
                                       per_page:       Crop.per_page,
-                                      current_member:)
+                                      current_member:).to_a
     respond_with @crops
   end