Refactor some of our elastic helpers and specs

doc/development/search/advanced_search_migration_styleguide.md

@@ -66,17 +66,15 @@ The following migration helpers are available in `ee/app/workers/concerns/elasti
 
 Backfills a specific field in an index. In most cases, the mapping for the field should already be added.
 
-Requires the `index_name` and `field_name` methods to backfill a single field.
+Requires the `field_name` method and `DOCUMENT_TYPE` constant to backfill a single field.
 
 ```ruby
 class MigrationName < Elastic::Migration
   include Elastic::MigrationBackfillHelper
 
-  private
+  DOCUMENT_TYPE = Issue
 
-  def index_name
-    Issue.__elasticsearch__.index_name
-  end
+  private
 
   def field_name
     :schema_version
@@ -84,17 +82,15 @@ class MigrationName < Elastic::Migration
 end
 ```
 
-Requires the `index_name` and `field_names` methods to backfill multiple fields if any field is null.
+Requires the `field_names` method and `DOCUMENT_TYPE` constant to backfill multiple fields if any field is null.
 
 ```ruby
 class MigrationName < Elastic::Migration
   include Elastic::MigrationBackfillHelper
 
-  private
+  DOCUMENT_TYPE = Issue
 
-  def index_name
-    Issue.__elasticsearch__.index_name
-  end
+  private
 
   def field_names
     %w[schema_version visibility_level]
@@ -106,17 +102,15 @@ end
 
 Updates a mapping in an index by calling `put_mapping` with the mapping specified.
 
-Requires the `index_name` and `new_mappings` methods.
+Requires the `new_mappings` method and `DOCUMENT_TYPE` constant.
 
 ```ruby
 class MigrationName < Elastic::Migration
   include Elastic::MigrationUpdateMappingsHelper
 
-  private
+  DOCUMENT_TYPE = Issue
 
-  def index_name
-    Issue.__elasticsearch__.index_name
-  end
+  private
 
   def new_mappings
     {

ee/app/workers/concerns/elastic/migration_backfill_helper.rb

@@ -31,6 +31,8 @@ def completed?
     private
 
     def index_name
+      return self.class::DOCUMENT_TYPE.__elasticsearch__.index_name if self.class.const_defined?(:DOCUMENT_TYPE)
+
       raise NotImplementedError
     end
 

ee/app/workers/concerns/elastic/migration_update_mappings_helper.rb

@@ -24,6 +24,8 @@ def completed?
     private
 
     def index_name
+      return self.class::DOCUMENT_TYPE.__elasticsearch__.index_name if self.class.const_defined?(:DOCUMENT_TYPE)
+
       raise NotImplementedError
     end
 

ee/elastic/migrate/20230307102400_backfill_hashed_root_namespace_id_on_notes.rb

@@ -12,10 +12,6 @@ class BackfillHashedRootNamespaceIdOnNotes < Elastic::Migration
 
   private
 
-  def index_name
-    DOCUMENT_TYPE.__elasticsearch__.index_name
-  end
-
   def field_name
     'hashed_root_namespace_id'
   end

ee/elastic/migrate/20230316150000_add_hashed_root_namespace_id_to_merge_requests.rb

@@ -3,11 +3,9 @@
 class AddHashedRootNamespaceIdToMergeRequests < Elastic::Migration
   include Elastic::MigrationUpdateMappingsHelper
 
-  private
+  DOCUMENT_TYPE = MergeRequest
 
-  def index_name
-    MergeRequest.__elasticsearch__.index_name
-  end
+  private
 
   def new_mappings
     {

ee/elastic/migrate/20230317120500_add_hashed_root_namespace_id_to_issues.rb

@@ -3,11 +3,9 @@
 class AddHashedRootNamespaceIdToIssues < Elastic::Migration
   include Elastic::MigrationUpdateMappingsHelper
 
-  private
+  DOCUMENT_TYPE = Issue
 
-  def index_name
-    Issue.__elasticsearch__.index_name
-  end
+  private
 
   def new_mappings
     {

ee/elastic/migrate/20230321091100_backfill_hashed_root_namespace_id_on_issues.rb

@@ -12,10 +12,6 @@ class BackfillHashedRootNamespaceIdOnIssues < Elastic::Migration
 
   private
 
-  def index_name
-    DOCUMENT_TYPE.__elasticsearch__.index_name
-  end
-
   def field_name
     'hashed_root_namespace_id'
   end

ee/elastic/migrate/20230321202400_backfill_hashed_root_namespace_id_on_merge_requests.rb

@@ -12,10 +12,6 @@ class BackfillHashedRootNamespaceIdOnMergeRequests < Elastic::Migration
 
   private
 
-  def index_name
-    DOCUMENT_TYPE.__elasticsearch__.index_name
-  end
-
   def field_name
     'hashed_root_namespace_id'
   end

ee/elastic/migrate/20230426195404_add_hidden_to_merge_requests.rb

@@ -3,11 +3,9 @@
 class AddHiddenToMergeRequests < Elastic::Migration
   include Elastic::MigrationUpdateMappingsHelper
 
-  private
+  DOCUMENT_TYPE = MergeRequest
 
-  def index_name
-    MergeRequest.__elasticsearch__.index_name
-  end
+  private
 
   def new_mappings
     {

ee/elastic/migrate/20230427555555_backfill_hidden_on_merge_requests.rb

@@ -12,10 +12,6 @@ class BackfillHiddenOnMergeRequests < Elastic::Migration
 
   private
 
-  def index_name
-    DOCUMENT_TYPE.__elasticsearch__.index_name
-  end
-
   def field_name
     :hidden
   end

ee/elastic/migrate/20230519142363_add_ci_catalog_to_project.rb

@@ -3,11 +3,9 @@
 class AddCiCatalogToProject < Elastic::Migration
   include Elastic::MigrationUpdateMappingsHelper
 
-  private
+  DOCUMENT_TYPE = Project
 
-  def index_name
-    Project.__elasticsearch__.index_name
-  end
+  private
 
   def new_mappings
     {

ee/elastic/migrate/20230607500000_backfill_milestone_permissions_to_milestone_documents.rb

@@ -11,10 +11,6 @@ class BackfillMilestonePermissionsToMilestoneDocuments < Elastic::Migration
 
   private
 
-  def index_name
-    DOCUMENT_TYPE.__elasticsearch__.index_name
-  end
-
   def field_names
     %w[merge_requests_access_level issues_access_level visibility_level]
   end

ee/elastic/migrate/20230628094243_add_archived_to_issues.rb

@@ -3,11 +3,9 @@
 class AddArchivedToIssues < Elastic::Migration
   include Elastic::MigrationUpdateMappingsHelper
 
-  private
+  DOCUMENT_TYPE = Issue
 
-  def index_name
-    Issue.__elasticsearch__.index_name
-  end
+  private
 
   def new_mappings
     {

ee/elastic/migrate/20230628094700_backfill_archived_on_issues.rb

@@ -12,10 +12,6 @@ class BackfillArchivedOnIssues < Elastic::Migration
 
   private
 
-  def index_name
-    DOCUMENT_TYPE.__elasticsearch__.index_name
-  end
-
   def field_name
     'archived'
   end

ee/elastic/migrate/20230710142700_add_archived_to_merge_requests.rb

@@ -3,11 +3,9 @@
 class AddArchivedToMergeRequests < Elastic::Migration
   include Elastic::MigrationUpdateMappingsHelper
 
-  private
+  DOCUMENT_TYPE = MergeRequest
 
-  def index_name
-    MergeRequest.__elasticsearch__.index_name
-  end
+  private
 
   def new_mappings
     {

ee/elastic/migrate/20230711140500_backfill_archived_on_merge_requests.rb

@@ -12,10 +12,6 @@ class BackfillArchivedOnMergeRequests < Elastic::Migration
 
   private
 
-  def index_name
-    DOCUMENT_TYPE.__elasticsearch__.index_name
-  end
-
   def field_name
     'archived'
   end

ee/elastic/migrate/20230717132609_backfill_archived_on_work_items.rb

@@ -12,10 +12,6 @@ class BackfillArchivedOnWorkItems < Elastic::Migration
 
   private
 
-  def index_name
-    DOCUMENT_TYPE.__elasticsearch__.index_name
-  end
-
   def field_name
     'archived'
   end

ee/elastic/migrate/20230719142200_add_archived_to_notes.rb

@@ -3,11 +3,9 @@
 class AddArchivedToNotes < Elastic::Migration
   include Elastic::MigrationUpdateMappingsHelper
 
-  private
+  DOCUMENT_TYPE = Note
 
-  def index_name
-    ::Elastic::Latest::NoteConfig.index_name
-  end
+  private
 
   def new_mappings
     { archived: { type: 'boolean' } }

ee/elastic/migrate/20230722212041_backfill_archived_on_notes.rb

@@ -11,10 +11,6 @@ class BackfillArchivedOnNotes < Elastic::Migration
 
   private
 
-  def index_name
-    DOCUMENT_TYPE.__elasticsearch__.index_name
-  end
-
   def field_name
     'archived'
   end

ee/elastic/migrate/20230823154049_add_schema_version_to_merge_request.rb

@@ -3,11 +3,9 @@
 class AddSchemaVersionToMergeRequest < Elastic::Migration
   include Elastic::MigrationUpdateMappingsHelper
 
-  private
+  DOCUMENT_TYPE = MergeRequest
 
-  def index_name
-    ::Elastic::Latest::MergeRequestConfig.index_name
-  end
+  private
 
   def new_mappings
     {