Fixes/gh action elasticsearch (#1043)

Author: rsmithlal

.github/workflows/rubyonrails.yml

@@ -24,6 +24,7 @@ jobs:
       RAILS_ENV: test
       DATABASE_URL: "postgis://rails:password@localhost:5432/rails_test"
       ES_HOST:  "http://localhost"
+      ELASTICSEARCH_URL: "http://localhost:9200"
       RAILS_VERSION: ${{ matrix.rails }}
 
     services:
@@ -80,6 +81,12 @@ jobs:
           bundle exec rake -f spec/dummy/Rakefile db:schema:load
         continue-on-error: ${{ matrix.allowed_failure }}
 
+      - name: Wait for Elasticsearch
+        if: (matrix.rails == '7.1.5.1') || steps.update.outcome == 'success'
+        run: |
+          echo "Waiting for Elasticsearch to be healthy..."
+          curl -s "http://localhost:9200/_cluster/health?wait_for_status=yellow&timeout=60s" || (echo "Elasticsearch not healthy" && exit 1)
+
       - name: Run RSpec
         if: (matrix.rails == '7.1.5.1') || steps.update.outcome == 'success'
         env:

app/controllers/better_together/search_controller.rb

@@ -10,20 +10,25 @@ def search # rubocop:todo Metrics/AbcSize, Metrics/MethodLength
       suggestions = []
 
       if @query.present?
-        response = Elasticsearch::Model.search(build_search_query(@query), searchable_models)
-
-        search_results = response.records.to_a
-        suggestions = response.response['suggest']['suggestions'].map do |s|
-          s['options'].map do |o|
-            o['text']
-          end
-        end.flatten
-
-        BetterTogether::Metrics::TrackSearchQueryJob.perform_later(
-          @query,
-          search_results.length,
-          I18n.locale.to_s
-        )
+        begin
+          response = Elasticsearch::Model.search(build_search_query(@query), searchable_models)
+
+          search_results = response.records.to_a
+
+          suggest_source = response.response.dig('suggest', 'suggestions') || []
+          suggestions = suggest_source.flat_map { |s| s.fetch('options', []).map { |o| o['text'] } }
+
+          BetterTogether::Metrics::TrackSearchQueryJob.perform_later(
+            @query,
+            search_results.length,
+            I18n.locale.to_s
+          )
+        rescue StandardError => e
+          Rails.logger.warn("Search error: #{e.class}: #{e.message}")
+          # Fall back to empty results so the page still renders
+          search_results = []
+          suggestions = []
+        end
       end
 
       # Use Kaminari for pagination

config/initializers/elasticsearch.rb

@@ -1,8 +1,17 @@
 # frozen_string_literal: true
 
 # config/initializers/elasticsearch.rb
+
+# Prefer a single URL. If ELASTICSEARCH_URL is not set, build it from ES_HOST and ES_PORT.
+url = ENV['ELASTICSEARCH_URL'] || begin
+  host = ENV.fetch('ES_HOST', 'http://localhost')
+  port = ENV.fetch('ES_PORT', 9200)
+  "#{host}:#{port}"
+end
+
 Elasticsearch::Model.client = Elasticsearch::Client.new(
-  port: ENV.fetch('ES_PORT', 9200),
-  host: ENV.fetch('ES_HOST', 'http://elasticsearch'),
-  url: ENV.fetch('ELASTICSEARCH_URL', 'http://elasticsearch:9201')
+  url: url,
+  retry_on_failure: true,
+  reload_connections: true,
+  transport_options: { request: { timeout: 5, open_timeout: 2 } }
 )