Add admin search for info requests

app/controllers/admin_request_controller.rb

@@ -15,8 +15,16 @@ class AdminRequestController < AdminController
 
   def index
     @query = params[:query]
+    @search_engine = params[:search_engine]
+
     if @query
-      info_requests = InfoRequest.where(["lower(title) like lower('%'||?||'%')", @query])
+      if @search_engine == 'legacy'
+        info_requests = InfoRequest.where(
+          ["lower(title) like lower('%'||?||'%')", @query]
+        )
+      else
+        info_requests = InfoRequest.newsearch(@query, limit: 10000)
+      end
     else
       info_requests = InfoRequest
     end
@@ -27,6 +35,7 @@ def index
 
     @info_requests =
       info_requests.
+      includes(:embargo, :user, public_body: :translations).
       order(sort_query).
       paginate(page: params[:page], per_page: 100)
   end

app/models/concerns/searchable.rb

@@ -254,14 +254,96 @@
     # This would normally not be run beyond the initial indexing of a
     # pre-existing database.
     def reindex_all(batch_size: 1000)
-      start = Time.zone.now
-      count = 0
-      indexable.find_each(batch_size: batch_size) do |record|
-        record.reindex
-        count += 1
+      opts = Searchable.class_variable_get(:@@searchable_models)[name]
+      return if opts.nil?
+      all_keys = (opts[:index] || {}).keys + (opts[:admin_index] || {}).keys
+      # if any of the index keys starts with a '.', we need to call ruby attributes,
+      # reindex instance one by one
+      if all_keys.any?(/^\./)
+        start = Time.zone.now
+        count = 0
+        indexable.find_each(batch_size: batch_size) do |record|
+          record.reindex
+          count += 1
+        end
+        elapsed = Time.zone.now - start
+        Rails.logger.info("Reindexed #{count} #{name} in #{elapsed} seconds")
+      else
+        reindex_all_inside_db
+      end
+    end
+
+    # alternative implementation of reindex_all that works for models
+    # whose searchable.index and searchable.admin_index only contain
+    # SQL column names, and no ruby attributes. In that case, it is
+    # possible to send a single request to the db to generate the entire
+    # set of search_documents.
+    def reindex_all_inside_db
+      def partition_table_name(model)
+        "search_documents_#{model.downcase.gsub('::', '_')}"
       end
-      elapsed = Time.zone.now - start
-      Rails.logger.info("Reindexed #{count} #{name} in #{elapsed} seconds")
+
+      def raw_content_query(idx_name)
+        opts = Searchable.class_variable_get(:@@searchable_models)[model_name.name]
+        if opts[idx_name].nil?
+          "''"
+        else
+          "concat(#{opts[idx_name].keys.join(', \' \', ')})"
+        end
+      end
+
+      def content_tsv_query(idx_name, language)
+        opts = Searchable.class_variable_get(:@@searchable_models)[model_name.name]
+        if opts[idx_name].nil?
+          "''"
+        else
+          bits = opts[idx_name].keys.map { |c|
+            "setweight(to_tsvector('#{language}'::regconfig, unaccent(coalesce(#{c}, ''))), '#{opts[idx_name][c]}')"
+          }
+          bits.join('||')
+        end
+      end
+
+      language = Searchable.lang_from_locale(
+        AlaveteliLocalization.default_locale
+      )
+      start = Time.now
+      query = <<-SQL
+        INSERT INTO "#{partition_table_name(model_name.name)}" (
+          "searchable_type",
+          "searchable_id",
+          "language",
+          "section_ref",
+          "raw_content",
+          "raw_admin_content",
+          "content_tsv",
+          "admin_content_tsv",
+          "created_at",
+          "updated_at"
+        )
+        SELECT
+          '#{model_name.name}',
+          id,
+          '#{language}',
+          '1',
+          #{raw_content_query(:index)},
+          #{raw_content_query(:admin_index)},
+          #{content_tsv_query(:index, language)},
+          #{content_tsv_query(:admin_index, language)},
+          CURRENT_TIMESTAMP,
+          CURRENT_TIMESTAMP
+          FROM #{table_name}
+      SQL
+
+      Rails.logger.debug(query)
+      ActiveRecord::Base.connection.exec_query(
+        "TRUNCATE #{partition_table_name(model_name.name)}"
+      )
+      ActiveRecord::Base.connection.exec_query(query)
+      t = Time.now - start
+      Rails.logger.info(
+        "Reindexed #{indexable.count} #{name} in #{t} seconds (in database)"
+      )
     end
   end
 

app/models/info_request.rb

@@ -45,6 +45,7 @@ class InfoRequest < ApplicationRecord
   include LinkToHelper
 
   include Categorisable
+  include Searchable
   include Taggable
   include Notable
   include RateLimited
@@ -212,6 +213,16 @@ class << self
   before_destroy :expire
   after_destroy :notify_associations, :update_counter_cache
 
+  searchable index: {
+               "title": "A",
+               "url_title": "B",
+               "prominence_reason": "D"
+             },
+             admin_index: {
+               "external_user_name": "A",
+               "external_url": "A"
+             }
+
   # Return info request corresponding to an incoming email address, or nil if
   # none found. Checks the hash to ensure the email came from the public body -
   # only they are sent the email address with the has in it. (We don't check

app/views/admin_request/index.html.erb

@@ -10,11 +10,25 @@
 
 <%= form_tag({}, method: 'get', class: 'form form-search') do %>
   <div class="input-append">
-    <%= text_field_tag 'query', params[:query], size: 30, class: 'input-large search-query' %>
-    <%= submit_tag 'Search', class: 'btn' %>
+    <%= text_field_tag "query",
+    params[:query],
+    size: 30,
+    class: "input-large search-query" %>
+    <%= submit_tag "Search", class: "btn" %>
   </div>
 
-  <span class="help-inline">(substring search, titles only)</span>
+  <div>
+    <%= radio_button_tag "search_engine", "legacy", checked: "legacy" == @search_engine %>
+    <%= label_tag "search_engine",
+    "legacy engine: substring search in titles only",
+    class: "help-inline" %>
+    <%= radio_button_tag "search_engine",
+    "new",
+    checked: (@search_engine ? "new" == @search_engine : true) %>
+    <%= label_tag "search_engine",
+    "new engine: please report poor search results!",
+    class: "help-inline" %>
+  </div>
 <% end %>
 
 <%= render partial: 'some_requests', locals: { info_requests: @info_requests } %>

spec/models/concerns/searchable_spec.rb

@@ -61,8 +61,8 @@
   end
 
   it 'does not index models that are not registered as searchable' do
-    body = FactoryBot.create(:initial_request)
-    expect(SearchDocument.where(searchable_type: "InfoRequest").count).to eq(0)
+    n = FactoryBot.create(:notification)
+    expect(SearchDocument.where(searchable_type: "Notification").count).to eq(0)
   end
 
   describe '.reindex_all' do