Skip to content

A platform for community discussion. Free, open, simple.

FIX: Skip obsolete topic reminder timers (#44874)

Sam24009eb109b6
diff --git a/app/models/topic_timer.rb b/app/models/topic_timer.rb
index 8b20f7c320c..78870721f4f 100644
--- a/app/models/topic_timer.rb
+++ b/app/models/topic_timer.rb
@@ -139,6 +139,10 @@ class TopicTimer < BaseTimer
Jobs.enqueue(TopicTimer.type_job_map[:delete], topic_timer_id: id)
end
+ def schedule_auto_reminder_job
+ # Reminders are handled by bookmarks; legacy topic timers have no action.
+ end
+
def schedule_auto_clear_slow_mode_job
Jobs.enqueue(TopicTimer.type_job_map[:clear_slow_mode], topic_timer_id: id)
end
diff --git a/spec/jobs/topic_timer_enqueuer_spec.rb b/spec/jobs/topic_timer_enqueuer_spec.rb
index c2bf80b7640..f9f72a64b31 100644
--- a/spec/jobs/topic_timer_enqueuer_spec.rb
+++ b/spec/jobs/topic_timer_enqueuer_spec.rb
@@ -64,6 +64,32 @@ RSpec.describe Jobs::TopicTimerEnqueuer do
job.execute
end
+ it "skips obsolete reminder timers without warnings while enqueueing supported timers" do
+ [nil, 1.day.ago].each do |deleted_at|
+ Fabricate(
+ :topic_timer,
+ topic: Fabricate(:topic, deleted_at: deleted_at),
+ execute_at: 1.minute.ago,
+ created_at: 1.hour.ago,
+ status_type: TopicTimer.types[:reminder],
+ )
+ end
+ slow_mode_timer =
+ Fabricate(
+ :topic_timer,
+ execute_at: 1.minute.ago,
+ created_at: 1.hour.ago,
+ status_type: TopicTimer.types[:clear_slow_mode],
+ )
+
+ logger = track_log_messages { job.execute }
+
+ expect(logger.warnings).to be_empty
+ expect_job_enqueued(job: :close_topic, args: { topic_timer_id: timer1.id })
+ expect_job_enqueued(job: :open_topic, args: { topic_timer_id: timer2.id })
+ expect_job_enqueued(job: :clear_slow_mode, args: { topic_timer_id: slow_mode_timer.id })
+ end
+
it "does not fail to enqueue other timers just because one timer errors" do
TopicTimer.any_instance.stubs(:enqueue_typed_job).raises(StandardError).then.returns(true)
expect { job.execute }.not_to raise_error
diff --git a/spec/models/topic_timer_spec.rb b/spec/models/topic_timer_spec.rb
index 62bec827e86..3d6a8aec361 100644
--- a/spec/models/topic_timer_spec.rb
+++ b/spec/models/topic_timer_spec.rb
@@ -175,6 +175,15 @@ RSpec.describe TopicTimer, type: :model do
end
end
+ describe "#enqueue_typed_job" do
+ it "does nothing for obsolete reminder timers" do
+ topic_timer.update!(status_type: described_class.types[:reminder])
+
+ expect { topic_timer.enqueue_typed_job }.not_to change { Sidekiq::Queues["default"].size }
+ expect(topic_timer.reload).not_to be_trashed
+ end
+ end
+
describe "runnable?" do
it "returns false if execute_at > now" do
topic_timer =