Improve search

Allow multi-model results.

Only include searchable in models that are ready to return search results.

Author: rsmithlal

app/assets/stylesheets/better_together/image-galleries.scss

@@ -1,4 +1,4 @@
 
 .image-gallery {
-  min-height: 50vh;
+  // min-height: 50vh;
 }

app/controllers/better_together/search_controller.rb

@@ -4,42 +4,44 @@ module BetterTogether
   # Handles dispatching search queries to elasticsearch and displaying the results
   class SearchController < ApplicationController
     def search
+      searchable_models = BetterTogether::Searchable.included_in_models
       @query = params[:q]
+      search_results = []
+      suggestions = []
 
       if @query.present?
-        search_response = BetterTogether::Page.search({
+        response = Elasticsearch::Model.search({
           query: {
             bool: {
               must: [
                 {
                   multi_match: {
                     query: @query,
-                    fields: ['title^2', 'content', 'blocks.rich_text_content.body'],
+                    fields: ['title^3', 'content', 'blocks.rich_text_content.body^2', 'formatted_address^2', 'name^3', 'description^2'],
                     type: 'best_fields'
                   }
                 }
               ]
             }
           },
-          highlight: {
-            fields: {
-              title: {},
-              content: {},
-              'blocks.rich_text_content.body': {
-                fragment_size: 150,
-                number_of_fragments: 3
+          suggest: {
+            text: @query,
+            suggestions: {
+              term: {
+                field: 'name',
+                suggest_mode: 'always'
               }
             }
           }
-        })
+        }, searchable_models)
 
-        # Use Kaminari for pagination
-        @results = Kaminari.paginate_array(search_response.records.to_a).page(params[:page]).per(10)
-        @highlights = search_response.response['hits']['hits']
-      else
-        @results = BetterTogether::Page.none.page(params[:page]).per(10)
-        @highlights = []
+        search_results = response.records.to_a
+        suggestions = response.response['suggest']['suggestions'].map { |s| s['options'].map { |o| o['text'] } }.flatten
       end
+
+      # Use Kaminari for pagination
+      @results = Kaminari.paginate_array(search_results).page(params[:page]).per(10)
+      @suggestions = suggestions
     end
 
   end

app/jobs/better_together/elasticsearch_index_job.rb

@@ -0,0 +1,19 @@
+
+module BetterTogether
+  class ElasticsearchIndexJob < ApplicationJob
+    queue_as :default
+
+    def perform(record, action)
+      return unless record.respond_to? :__elasticsearch__
+
+      case action
+      when :index
+        record.__elasticsearch__.index_document
+      when :delete
+        record.__elasticsearch__.delete_document
+      else
+        raise ArgumentError, "Unknown action: #{action}"
+      end
+    end
+  end
+end

app/models/better_together/calendar.rb

@@ -8,7 +8,6 @@ class Calendar < ApplicationRecord
     include Identifier
     include Privacy
     include Protected
-    include Searchable
     include Viewable
 
     belongs_to :community, class_name: '::BetterTogether::Community'
@@ -18,19 +17,6 @@ class Calendar < ApplicationRecord
     translates :name
     translates :description, backend: :action_text
 
-    settings index: { number_of_shards: 1 } do
-      mappings dynamic: 'false' do
-        indexes :name, as: 'name'
-        indexes :description, as: 'description'
-        indexes :rich_text_content, type: 'nested' do
-          indexes :body, type: 'text'
-        end
-        indexes :rich_text_translations, type: 'nested' do
-          indexes :body, type: 'text'
-        end
-      end
-    end
-
     def to_s
       name
     end

app/models/better_together/community.rb

@@ -10,7 +10,6 @@ class Community < ApplicationRecord
     include Protected
     include Privacy
     include Permissible
-    include Searchable
 
     belongs_to :creator,
                class_name: '::BetterTogether::Person',
@@ -60,21 +59,7 @@ class Community < ApplicationRecord
     before_save :purge_cover_image, if: -> { remove_cover_image == '1' }
     before_save :purge_logo, if: -> { remove_logo == '1' }
 
-    validates :name,
-              presence: true
-
-    settings index: { number_of_shards: 1 } do
-      mappings dynamic: 'false' do
-        indexes :title, as: 'title'
-        indexes :description_html, as: 'description_html'
-        indexes :rich_text_content, type: 'nested' do
-          indexes :body, type: 'text'
-        end
-        indexes :rich_text_translations, type: 'nested' do
-          indexes :body, type: 'text'
-        end
-      end
-    end
+    validates :name, presence: true
 
     # Resize the cover image to specific dimensions
     def cover_image_variant(width, height)

app/models/better_together/content/block.rb

@@ -8,11 +8,6 @@ module Content
     class Block < ApplicationRecord
       include ::BetterTogether::Content::BlockAttributes
 
-      SUBCLASSES = [
-        ::BetterTogether::Content::Image, ::BetterTogether::Content::Hero, ::BetterTogether::Content::Html,
-        ::BetterTogether::Content::Css, ::BetterTogether::Content::RichText, ::BetterTogether::Content::Template
-      ].freeze
-
       has_many :page_blocks, foreign_key: :block_id, dependent: :destroy
       has_many :pages, through: :page_blocks
 
@@ -43,7 +38,7 @@ def self.block_name
       end
 
       def self.load_all_subclasses
-        SUBCLASSES.each(&:connection) # Add all known subclasses here
+        Rails.application.eager_load! # Ensure all models are loaded
       end
 
       def self.localized_block_attributes

app/models/better_together/geography/map.rb

@@ -9,7 +9,6 @@ class Map < ApplicationRecord
       include Identifier # Adds unique identifier functionality
       include Privacy # Manages privacy settings
       include Protected # Adds protection mechanisms
-      include Searchable # Enables search capabilities
       include Viewable # Tracks view counts and related metrics
 
       belongs_to :mappable, polymorphic: true, optional: true
@@ -26,19 +25,6 @@ class Map < ApplicationRecord
 
       before_validation :set_default_center, on: :create
 
-      settings index: { number_of_shards: 1 } do
-        mappings dynamic: 'false' do
-          indexes :title, as: 'title'
-          indexes :description, as: 'description'
-          indexes :rich_text_content, type: 'nested' do
-            indexes :body, type: 'text'
-          end
-          indexes :rich_text_translations, type: 'nested' do
-            indexes :body, type: 'text'
-          end
-        end
-      end
-
       def self.permitted_attributes(id: false, destroy: false)
         super + %i[type zoom center]
       end

app/models/better_together/infrastructure/building.rb

@@ -11,7 +11,6 @@ class Building < Structure
       include Geography::Geospatial::One
       include Privacy
       include PrimaryCommunity
-      include Searchable
 
       belongs_to :address,
                  -> { where(label: 'physical', physical: true, primary_flag: true) },
@@ -40,19 +39,6 @@ class Building < Structure
 
       slugged :name
 
-      settings index: { number_of_shards: 1 } do
-        mappings dynamic: 'false' do
-          indexes :name, as: 'name'
-          indexes :description, as: 'description'
-          indexes :rich_text_content, type: 'nested' do
-            indexes :body, type: 'text'
-          end
-          indexes :rich_text_translations, type: 'nested' do
-            indexes :body, type: 'text'
-          end
-        end
-      end
-
       def self.permitted_attributes(id: false, destroy: false)
         [
           {

app/models/better_together/infrastructure/floor.rb

@@ -12,7 +12,6 @@ class Floor < ApplicationRecord
       include Positioned
       include Privacy
       include PrimaryCommunity
-      include Searchable
 
       after_create :ensure_room
 
@@ -24,19 +23,6 @@ class Floor < ApplicationRecord
 
       slugged :name
 
-      settings index: { number_of_shards: 1 } do
-        mappings dynamic: 'false' do
-          indexes :name, as: 'name'
-          indexes :description, as: 'description'
-          indexes :rich_text_content, type: 'nested' do
-            indexes :body, type: 'text'
-          end
-          indexes :rich_text_translations, type: 'nested' do
-            indexes :body, type: 'text'
-          end
-        end
-      end
-
       validates :level,
                 numericality: { only_integer: true },
                 uniqueness: { scope: %i[building_id] },

app/models/better_together/infrastructure/room.rb

@@ -11,7 +11,6 @@ class Room < ApplicationRecord
       include Geography::Geospatial::One
       include Privacy
       include PrimaryCommunity
-      include Searchable
 
       belongs_to :floor, class_name: 'BetterTogether::Infrastructure::Floor', touch: true
       has_one :building, through: :floor, class_name: 'BetterTogether::Infrastructure::Building'
@@ -23,19 +22,6 @@ class Room < ApplicationRecord
 
       slugged :name
 
-      settings index: { number_of_shards: 1 } do
-        mappings dynamic: 'false' do
-          indexes :name, as: 'name'
-          indexes :description, as: 'description'
-          indexes :rich_text_content, type: 'nested' do
-            indexes :body, type: 'text'
-          end
-          indexes :rich_text_translations, type: 'nested' do
-            indexes :body, type: 'text'
-          end
-        end
-      end
-
       def to_s
         name
       end