discourse
/
discourse-assign
mirror of https://github.com/discourse/discourse-assign.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FIX: Fix reminder frequency not getting sent daily when early by a few seconds/minutes (#496) 

Add a buffer in determining whether to remind a user about assignments
This commit is contained in:
Natalie Tay 2023-08-10 12:04:27 +08:00 committed by GitHub
parent a0bd07115e
commit f5cc748986
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 61 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/jobs/scheduled/enqueue_reminders.rb
View File

@ -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'

39
spec/jobs/scheduled/enqueue_reminders_spec.rb
View File

@ -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
@ -36,8 +37,31 @@ RSpec.describe Jobs::EnqueueReminders do
assert_reminders_enqueued(0)
end
it "doesn't count assigns from deleted topics" do
deleted_post = Fabricate(:post)
assign_one_task_to(user, post: deleted_post)
(PendingAssignsReminder::REMINDER_THRESHOLD - 1).times { assign_one_task_to(user) }
deleted_post.topic.trash!
assert_reminders_enqueued(0)
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 => 2.days.ago)
user.upsert_custom_fields(PendingAssignsReminder::REMINDED_AT => 1.days.ago)
assign_multiple_tasks_to(user)
assert_reminders_enqueued(0)
@ -76,15 +100,6 @@ RSpec.describe Jobs::EnqueueReminders do
assert_reminders_enqueued(1)
end
it "doesn't count assigns from deleted topics" do
deleted_post = Fabricate(:post)
assign_one_task_to(user, post: deleted_post)
(PendingAssignsReminder::REMINDER_THRESHOLD - 1).times { assign_one_task_to(user) }
deleted_post.topic.trash!
assert_reminders_enqueued(0)
end
def assert_reminders_enqueued(expected_amount)