Skip to content

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

FIX: Avoid duplicate assignment notifications when bulk-adding group members (#44595)

Osama Sayegh9f8eaaadd867
diff --git a/plugins/discourse-assign/app/jobs/regular/assign_notification.rb b/plugins/discourse-assign/app/jobs/regular/assign_notification.rb
index 8f0eed9df6a..03cf98f2aa5 100644
--- a/plugins/discourse-assign/app/jobs/regular/assign_notification.rb
+++ b/plugins/discourse-assign/app/jobs/regular/assign_notification.rb
@@ -6,7 +6,7 @@ module Jobs
raise Discourse::InvalidParameters.new(:assignment_id) if args[:assignment_id].nil?
return if SilencedAssignment.exists?(assignment_id: args[:assignment_id])
- Assignment.find(args[:assignment_id]).create_missing_notifications!
+ Assignment.find(args[:assignment_id]).create_missing_notifications!(user_id: args[:user_id])
end
end
end
diff --git a/plugins/discourse-assign/app/models/assignment.rb b/plugins/discourse-assign/app/models/assignment.rb
index f6723b077c7..35d2da9b229 100644
--- a/plugins/discourse-assign/app/models/assignment.rb
+++ b/plugins/discourse-assign/app/models/assignment.rb
@@ -59,8 +59,16 @@ class Assignment < ActiveRecord::Base
assigned_to.is_a?(Group)
end
- def assigned_users
- Array.wrap(assigned_to.try(:users) || assigned_to)
+ def assigned_users(user_id: nil)
+ if assigned_to_group?
+ members = assigned_to.users
+ members = members.where(id: user_id) if user_id
+ members.to_a
+ elsif user_id.nil? || assigned_to&.id == user_id
+ Array.wrap(assigned_to)
+ else
+ []
+ end
end
def post
@@ -68,8 +76,8 @@ class Assignment < ActiveRecord::Base
target
end
- def create_missing_notifications!
- assigned_users.each do |user|
+ def create_missing_notifications!(user_id: nil)
+ assigned_users(user_id:).each do |user|
next if user.notifications.for_assignment(self).exists?
DiscourseAssign::CreateNotification.call(
assignment: self,
diff --git a/plugins/discourse-assign/plugin.rb b/plugins/discourse-assign/plugin.rb
index fb8ae5a2423..4b85d6a52e4 100644
--- a/plugins/discourse-assign/plugin.rb
+++ b/plugins/discourse-assign/plugin.rb
@@ -943,7 +943,7 @@ after_initialize do
on(:user_added_to_group) do |user, group, automatic:|
group.assignments.active.find_each do |assignment|
- Jobs.enqueue(:assign_notification, assignment_id: assignment.id)
+ Jobs.enqueue(:assign_notification, assignment_id: assignment.id, user_id: user.id)
end
end
diff --git a/plugins/discourse-assign/spec/jobs/regular/assign_notification_spec.rb b/plugins/discourse-assign/spec/jobs/regular/assign_notification_spec.rb
index 8b92fc4f476..2c11e5087c4 100644
--- a/plugins/discourse-assign/spec/jobs/regular/assign_notification_spec.rb
+++ b/plugins/discourse-assign/spec/jobs/regular/assign_notification_spec.rb
@@ -31,5 +31,24 @@ RSpec.describe Jobs::AssignNotification do
execute_job
end
end
+
+ context "when `user_id` is provided for a group assignment" do
+ fab!(:group)
+ fab!(:added_member, :user)
+ fab!(:existing_member, :user)
+ fab!(:topic) { Fabricate(:post).topic }
+ fab!(:assignment) { Fabricate(:topic_assignment, topic: topic, assigned_to: group) }
+
+ let(:args) { { assignment_id: assignment.id, user_id: added_member.id } }
+
+ before { group.users = [added_member, existing_member] }
+
+ it "creates the notification only for that user" do
+ execute_job
+ expect(Notification.for_assignment(assignment).pluck(:user_id)).to contain_exactly(
+ added_member.id,
+ )
+ end
+ end
end
end
diff --git a/plugins/discourse-assign/spec/models/assignment_spec.rb b/plugins/discourse-assign/spec/models/assignment_spec.rb
index dc627d3de14..526d1681b64 100644
--- a/plugins/discourse-assign/spec/models/assignment_spec.rb
+++ b/plugins/discourse-assign/spec/models/assignment_spec.rb
@@ -196,6 +196,22 @@ RSpec.describe Assignment do
)
create_missing_notifications
end
+
+ it "creates the missing notification only for the given user" do
+ Fabricate(:post, topic: assignment.topic)
+ assignment.create_missing_notifications!(user_id: users.second.id)
+ expect(Notification.for_assignment(assignment).pluck(:user_id)).to contain_exactly(
+ users.first.id,
+ users.second.id,
+ )
+ end
+
+ it "creates nothing for a user who is not a member of the group" do
+ assignment.create_missing_notifications!(user_id: Fabricate(:user).id)
+ expect(Notification.for_assignment(assignment).pluck(:user_id)).to contain_exactly(
+ users.first.id,
+ )
+ end
end
end
diff --git a/plugins/discourse-assign/spec/plugin_spec.rb b/plugins/discourse-assign/spec/plugin_spec.rb
index 12a33cc9ce6..5f27ebfd936 100644
--- a/plugins/discourse-assign/spec/plugin_spec.rb
+++ b/plugins/discourse-assign/spec/plugin_spec.rb
@@ -241,13 +241,20 @@ RSpec.describe DiscourseAssign do
it "creates missing notifications for added user" do
group.add(user)
[first_assignment, second_assignment].each do |assignment|
- expect_job_enqueued(job: Jobs::AssignNotification, args: { assignment_id: assignment.id })
+ expect_job_enqueued(
+ job: Jobs::AssignNotification,
+ args: {
+ assignment_id: assignment.id,
+ user_id: user.id,
+ },
+ )
end
expect(
job_enqueued?(
job: Jobs::AssignNotification,
args: {
assignment_id: third_assignment.id,
+ user_id: user.id,
},
),
).to eq(false)