Merge branch 'simplify-es-maintenance-callbacks' into 'master'

Simplify elasticsearch maintenance callbacks

See merge request gitlab-org/gitlab!24895

ee/app/models/concerns/elastic/application_versioned_search.rb

@@ -34,14 +34,21 @@ module Elastic
       Elasticsearch::Model::Registry.add(self) if self.is_a?(Class)
 
       if self < ActiveRecord::Base
-        after_commit on: :create do
-          if Gitlab::CurrentSettings.elasticsearch_indexing? && self.searchable?
-            ElasticIndexerWorker.perform_async(:index, self.class.to_s, self.id, self.es_id)
+        after_commit :maintain_elasticsearch_create, on: :create
+        after_commit :maintain_elasticsearch_update, on: :update
+        after_commit :maintain_elasticsearch_destroy, on: :destroy
       end
     end
 
-        after_commit on: :update do
-          if Gitlab::CurrentSettings.elasticsearch_indexing? && self.searchable?
+    def maintain_elasticsearch_create
+      return unless Gitlab::CurrentSettings.elasticsearch_indexing? && self.searchable?
+
+      ElasticIndexerWorker.perform_async(:index, self.class.to_s, self.id, self.es_id)
+    end
+
+    def maintain_elasticsearch_update
+      return unless Gitlab::CurrentSettings.elasticsearch_indexing? && self.searchable?
+
       ElasticIndexerWorker.perform_async(
         :update,
         self.class.to_s,
@@ -50,21 +57,14 @@ module Elastic
         changed_fields: self.previous_changes.keys
       )
     end
-        end
 
-        after_commit on: :destroy do
-          if Gitlab::CurrentSettings.elasticsearch_indexing? && self.searchable?
+    def maintain_elasticsearch_destroy
+      return unless Gitlab::CurrentSettings.elasticsearch_indexing? && self.searchable?
+
       ElasticIndexerWorker.perform_async(
-              :delete,
-              self.class.to_s,
-              self.id,
-              self.es_id,
-              es_parent: self.es_parent
+        :delete, self.class.to_s, self.id, self.es_id, es_parent: self.es_parent
       )
     end
-        end
-      end
-    end
 
     class_methods do
       def __elasticsearch__