Fixed message when visit not found for geocoding

ankane · Mar 1, 2018 · 1bb48e7 · 1bb48e7
1 parent f956194
commit 1bb48e7
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/app/jobs/ahoy/geocode_v2_job.rb b/app/jobs/ahoy/geocode_v2_job.rb
@@ -13,7 +13,6 @@ def perform(visit_token, ip)
 
       if location
         data = {
-          visit_token: visit_token,
           country: location.try(:country).presence,
           region: location.try(:state).presence,
           city: location.try(:city).presence,

diff --git a/lib/ahoy/database_store.rb b/lib/ahoy/database_store.rb
@@ -25,14 +25,15 @@ def track_event(data)
     end
 
     def geocode(data)
-      data = slice_data(visit_model, data.except(:visit_token))
+      visit_token = data.delete(:visit_token)
+      data = slice_data(visit_model, data)
       if defined?(Mongoid::Document) && visit_model < Mongoid::Document
         # upsert since visit might not be found due to eventual consistency
-        visit_model.where(visit_token: ahoy.visit_token).find_one_and_update({"$set": data}, {upsert: true})
+        visit_model.where(visit_token: visit_token).find_one_and_update({"$set": data}, {upsert: true})
       elsif visit
         visit.update_attributes(data)
       else
-        Ahoy.log "Visit for geocode not found: #{data[:visit_token]}"
+        Ahoy.log "Visit for geocode not found: #{visit_token}"
       end
     end
 

diff --git a/lib/ahoy/tracker.rb b/lib/ahoy/tracker.rb
@@ -65,7 +65,11 @@ def geocode(data)
       if exclude?
         debug "Geocode excluded"
       else
-        @store.geocode(data.select { |_, v| v })
+        data = {
+          visit_token: visit_token
+          }.merge(data).select { |_, v| v }
+
+        @store.geocode(data)
         true
       end
     rescue => e