From dd3c8ad69d056c8817e79dd865a051f481c58053 Mon Sep 17 00:00:00 2001
From: Andrew Kane <andrew@ankane.org>
Date: Sat, 19 Feb 2022 21:58:51 -0800
Subject: [PATCH] Improved code [skip ci]

---
 lib/searchkick/index.rb | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/lib/searchkick/index.rb b/lib/searchkick/index.rb
index 6bf55b0..6927222 100644
--- a/lib/searchkick/index.rb
+++ b/lib/searchkick/index.rb
@@ -397,14 +397,14 @@ module Searchkick
     end
 
     def notify(record, name)
-      name = "#{record.searchkick_klass.name} #{name}" if record && record.searchkick_klass
-      event = {
-        name: name,
-        id: search_id(record)
-      }
       if Searchkick.callbacks_value == :bulk
         yield
       else
+        name = "#{record.searchkick_klass.name} #{name}" if record && record.searchkick_klass
+        event = {
+          name: name,
+          id: search_id(record)
+        }
         ActiveSupport::Notifications.instrument("request.searchkick", event) do
           yield
         end
@@ -412,14 +412,15 @@ module Searchkick
     end
 
     def notify_bulk(records, name)
-      event = {
-        name: "#{records.first.searchkick_klass.name} #{name}",
-        count: records.size
-      }
-      event[:id] = search_id(records.first) if records.size == 1
       if Searchkick.callbacks_value == :bulk
         yield
       else
+        event = {
+          name: "#{records.first.searchkick_klass.name} #{name}",
+          count: records.size
+        }
+        # TODO remove
+        event[:id] = search_id(records.first) if records.size == 1
         ActiveSupport::Notifications.instrument("request.searchkick", event) do
           yield
         end
--
libgit2 0.21.0