Skip to content

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

FIX: protect against reminder counter not being set (#45090)

Sam0fcfb34131a0
diff --git a/plugins/discourse-events/jobs/scheduled/monitor_event_dates.rb b/plugins/discourse-events/jobs/scheduled/monitor_event_dates.rb
index 3cacb426c99..d85d8d974e4 100644
--- a/plugins/discourse-events/jobs/scheduled/monitor_event_dates.rb
+++ b/plugins/discourse-events/jobs/scheduled/monitor_event_dates.rb
@@ -24,7 +24,7 @@ module Jobs
event_date_id: event_date.id,
reminder: reminder[:description],
)
- event_date.update!(reminder_counter: event_date.reminder_counter + 1)
+ event_date.update!(reminder_counter: event_date.reminder_counter.to_i + 1)
end
end
@@ -85,7 +85,7 @@ module Jobs
end
.select { |reminder| reminder[:date] <= Time.current }
.sort_by { |reminder| reminder[:date] }
- .drop(event_date.reminder_counter)
+ .drop(event_date.reminder_counter.to_i)
end
end
end
diff --git a/plugins/discourse-events/spec/jobs/scheduled/monitor_event_dates_spec.rb b/plugins/discourse-events/spec/jobs/scheduled/monitor_event_dates_spec.rb
index 1b7528c6b60..8aaf9e3c97e 100644
--- a/plugins/discourse-events/spec/jobs/scheduled/monitor_event_dates_spec.rb
+++ b/plugins/discourse-events/spec/jobs/scheduled/monitor_event_dates_spec.rb
@@ -31,6 +31,24 @@ describe Jobs::DiscourseCalendar::MonitorEventDates do
end
let(:past_date_no_end_time) { past_event_no_end_time.event_dates.first }
+ describe "#execute" do
+ it "sends due reminders when the reminder counter is nil" do
+ past_date.update!(reminder_counter: nil)
+ freeze_time(past_date.starts_at - 59.minutes)
+
+ expect_enqueued_with(
+ job: :discourse_post_event_send_reminder,
+ args: {
+ event_id: past_event.id,
+ event_date_id: past_date.id,
+ reminder: "notification.1.hours",
+ },
+ ) { job.execute({}) }
+
+ expect(past_date.reload.reminder_counter).to eq(1)
+ end
+ end
+
describe "#send_reminder" do
it "lodge reminder jobs in correct times" do
expect_not_enqueued_with(job: :discourse_post_event_send_reminder) { job.execute({}) }