Refactor inbox processing logic

ditkrg · Feb 28, 2024 · 88a10c6 · 88a10c6
1 parent 7cb0dc2
commit 88a10c6
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 8 deletions.
diff --git a/lib/inboxable/polling_receiver_worker.rb b/lib/inboxable/polling_receiver_worker.rb
@@ -10,24 +10,22 @@ def perform
 
     def perform_activerecord
       Inboxable.inbox_model.pending
-               .where(last_attempted_at: [..Time.zone.now, nil])
                .find_in_batches(batch_size: ENV.fetch('INBOXABLE__BATCH_SIZE', 100).to_i)
                .each do |batch|
         batch.each do |inbox|
           inbox.processor_class_name.constantize.perform_async(inbox.id)
-          inbox.update(last_attempted_at: 1.minute.from_now, status: :processed, allow_processing: false)
+          inbox.update(last_attempted_at: Time.zone.now, status: :processing, allow_processing: false)
         end
       end
     end
 
     def perform_mongoid
       batch_size = ENV.fetch('INBOXABLE__BATCH_SIZE', 100).to_i
       Inboxable.inbox_model.pending
-               .any_of({ last_attempted_at: ..Time.zone.now }, { last_attempted_at: nil })
                .each_slice(batch_size) do |batch|
         batch.each do |inbox|
           inbox.processor_class_name.constantize.perform_async(inbox.id.to_s)
-          inbox.update(last_attempted_at: 1.minute.from_now, status: :processed, allow_processing: false)
+          inbox.update(last_attempted_at: Time.zone.now, status: :processing, allow_processing: false)
         end
       end
     end

diff --git a/lib/templates/activerecrod_inbox.rb b/lib/templates/activerecrod_inbox.rb
@@ -5,7 +5,7 @@ class Inbox < ApplicationRecord
   after_commit :process, if: :allow_processing?
 
   # Scopes and Enums
-  enum status: { pending: 0, processed: 1, failed: 2 }
+  enum status: { pending: 0, processed: 1, failed: 2, processing: 3 }
 
   def increment_attempt
     self.attempts = attempts + 1
@@ -25,6 +25,6 @@ def check_threshold_reach
   end
 
   def check_publishing
-    self.allow_processing = false if processed?
+    self.allow_processing = false unless pending?
   end
 end
diff --git a/lib/templates/mongoid_inbox.rb b/lib/templates/mongoid_inbox.rb
@@ -17,7 +17,7 @@ class Inbox
 
   attr_accessor :allow_processing
 
-  as_enum :status, %i[pending processed failed], field: { type: String, default: 'pending' }, map: :string
+  as_enum :status, %i[pending processed failed processing], field: { type: String, default: 'pending' }, map: :string
 
   statuses.each_key do |key|
     scope key, -> { where(status_cd: key) }
@@ -45,6 +45,6 @@ def check_threshold_reach
   end
 
   def check_publishing
-    self.allow_processing = false if processed?
+    self.allow_processing = false unless pending?
   end
 end