Refactor ElasticsearchIndexJob and GeocodingJob to improve error handling and job queueing

Author: rsmithlal

app/jobs/better_together/elasticsearch_index_job.rb

@@ -5,7 +5,10 @@ module BetterTogether
   # This job is responsible for indexing and deleting documents in Elasticsearch
   # when records are created, updated, or destroyed.
   class ElasticsearchIndexJob < ApplicationJob
-    queue_as :default
+    queue_as :es_indexing
+
+    # Don't retry on deserialization errors - the record no longer exists
+    discard_on ActiveJob::DeserializationError
 
     def perform(record, action)
       return unless record.respond_to? :__elasticsearch__
@@ -18,6 +21,9 @@ def perform(record, action)
       else
         raise ArgumentError, "Unknown action: #{action}"
       end
+    rescue ActiveRecord::RecordNotFound
+      # Record was deleted before the job could run - this is expected for delete operations
+      Rails.logger.info "ElasticsearchIndexJob: Record no longer exists, skipping #{action} operation"
     end
   end
 end

app/jobs/better_together/geography/geocoding_job.rb

@@ -6,9 +6,15 @@ class GeocodingJob < ApplicationJob # rubocop:todo Style/Documentation
       queue_as :geocoding
       retry_on StandardError, wait: :polynomially_longer, attempts: 5
 
+      # Don't retry on deserialization errors - the record no longer exists
+      discard_on ActiveJob::DeserializationError
+
       def perform(geocodable)
         coords = geocodable.geocode
         geocodable.save if coords
+      rescue ActiveRecord::RecordNotFound
+        # Record was deleted before the job could run
+        Rails.logger.info 'GeocodingJob: Record no longer exists, skipping geocoding operation'
       end
     end
   end