diff --git a/app/jobs/scheduled/enqueue_reminders.rb b/app/jobs/scheduled/enqueue_reminders.rb index c5cb59e..13aea39 100644 --- a/app/jobs/scheduled/enqueue_reminders.rb +++ b/app/jobs/scheduled/enqueue_reminders.rb @@ -20,6 +20,8 @@ module Jobs Group.assign_allowed_groups.pluck(:id).join(",") end + REMINDER_BUFFER_MINUTES = 10 + def user_ids global_frequency = SiteSetting.remind_assigns_frequency frequency = @@ -46,7 +48,7 @@ module Jobs AND #{frequency} > 0 AND ( last_reminder.value IS NULL OR - last_reminder.value::TIMESTAMP <= CURRENT_TIMESTAMP - ('1 MINUTE'::INTERVAL * #{frequency}) + last_reminder.value::TIMESTAMP <= CURRENT_TIMESTAMP - ('1 MINUTE'::INTERVAL * #{frequency}) + ('1 MINUTE'::INTERVAL * #{REMINDER_BUFFER_MINUTES}) ) AND assignments.updated_at::TIMESTAMP <= CURRENT_TIMESTAMP - ('1 MINUTE'::INTERVAL * #{frequency}) AND assignments.assigned_to_type = 'User' diff --git a/spec/jobs/scheduled/enqueue_reminders_spec.rb b/spec/jobs/scheduled/enqueue_reminders_spec.rb index 12ef3a9..1b0b9a3 100644 --- a/spec/jobs/scheduled/enqueue_reminders_spec.rb +++ b/spec/jobs/scheduled/enqueue_reminders_spec.rb @@ -3,12 +3,13 @@ require "rails_helper" RSpec.describe Jobs::EnqueueReminders do - let(:assign_allowed_group) { Group.find_by(name: "staff") } - let(:user) { Fabricate(:user, groups: [assign_allowed_group]) } + fab!(:assign_allowed_group) { Fabricate(:group) } + fab!(:user) { Fabricate(:user, groups: [assign_allowed_group]) } before do SiteSetting.remind_assigns_frequency = RemindAssignsFrequencySiteSettings::MONTHLY_MINUTES SiteSetting.assign_enabled = true + SiteSetting.assign_allowed_on_groups = "#{assign_allowed_group.id}" end describe "#execute" do @@ -47,6 +48,16 @@ RSpec.describe Jobs::EnqueueReminders do end describe "assignment frequency" do + it "enqueues a reminder if the user reminder frequency is 1 day and the last reminded at is almost 1 day" do + user.custom_fields[PendingAssignsReminder::REMINDERS_FREQUENCY] = RemindAssignsFrequencySiteSettings::DAILY_MINUTES + user.custom_fields[PendingAssignsReminder::REMINDED_AT] = 1.days.ago + user.save + + assign_multiple_tasks_to(user, assigned_on: 1.day.ago - 1.minute) + + assert_reminders_enqueued(1) + end + it "does not enqueue a reminder if it's too soon" do user.upsert_custom_fields(PendingAssignsReminder::REMINDED_AT => 1.days.ago) assign_multiple_tasks_to(user)