From 0c019b2e45787b9062605904e4a9dff07b4f2331 Mon Sep 17 00:00:00 2001
From: Jan Cernik <66427541+jancernik@users.noreply.github.com>
Date: Fri, 13 Sep 2024 16:01:20 -0300
Subject: [PATCH] FIX: Error when moving the group default notification state
 (#28910)

---
 .../app/templates/group/manage/tags.hbs        | 10 +++++-----
 app/models/group_tag_notification_default.rb   | 11 ++++++++---
 spec/models/group_spec.rb                      | 18 ++++++++++++++++++
 3 files changed, 31 insertions(+), 8 deletions(-)

diff --git a/app/assets/javascripts/discourse/app/templates/group/manage/tags.hbs b/app/assets/javascripts/discourse/app/templates/group/manage/tags.hbs
index caebf64bd86..5635b458422 100644
--- a/app/assets/javascripts/discourse/app/templates/group/manage/tags.hbs
+++ b/app/assets/javascripts/discourse/app/templates/group/manage/tags.hbs
@@ -19,7 +19,7 @@
 
     <TagChooser
       @tags={{this.model.watching_tags}}
-      @blacklist={{this.selectedTags}}
+      @blockedTags={{this.selectedTags}}
       @everyTag={{true}}
       @unlimitedTagCount={{true}}
       @options={{hash allowAny=false}}
@@ -36,7 +36,7 @@
 
     <TagChooser
       @tags={{this.model.tracking_tags}}
-      @blacklist={{this.selectedTags}}
+      @blockedTags={{this.selectedTags}}
       @everyTag={{true}}
       @unlimitedTagCount={{true}}
       @options={{hash allowAny=false}}
@@ -53,7 +53,7 @@
 
     <TagChooser
       @tags={{this.model.watching_first_post_tags}}
-      @blacklist={{this.selectedTags}}
+      @blockedTags={{this.selectedTags}}
       @everyTag={{true}}
       @unlimitedTagCount={{true}}
       @options={{hash allowAny=false}}
@@ -70,7 +70,7 @@
 
     <TagChooser
       @tags={{this.model.regular_tags}}
-      @blacklist={{this.selectedTags}}
+      @blockedTags={{this.selectedTags}}
       @everyTag={{true}}
       @unlimitedTagCount={{true}}
       @options={{hash allowAny=false}}
@@ -87,7 +87,7 @@
 
     <TagChooser
       @tags={{this.model.muted_tags}}
-      @blacklist={{this.selectedTags}}
+      @blockedTags={{this.selectedTags}}
       @everyTag={{true}}
       @unlimitedTagCount={{true}}
       @options={{hash allowAny=false}}
diff --git a/app/models/group_tag_notification_default.rb b/app/models/group_tag_notification_default.rb
index 312dd2bd68e..48b2e71e81f 100644
--- a/app/models/group_tag_notification_default.rb
+++ b/app/models/group_tag_notification_default.rb
@@ -34,9 +34,14 @@ class GroupTagNotificationDefault < ActiveRecord::Base
       changed = true
     end
 
-    (tag_ids - old_ids).each do |id|
-      self.create!(group: group, tag_id: id, notification_level: notification_levels[level])
-      changed = true
+    new_records_attrs =
+      (tag_ids - old_ids).map do |tag_id|
+        { group_id: group.id, tag_id: tag_id, notification_level: notification_levels[level] }
+      end
+
+    unless new_records_attrs.empty?
+      result = GroupTagNotificationDefault.insert_all(new_records_attrs)
+      changed = true if result.rows.length > 0
     end
 
     changed
diff --git a/spec/models/group_spec.rb b/spec/models/group_spec.rb
index fafaf1b328c..27fd72e427d 100644
--- a/spec/models/group_spec.rb
+++ b/spec/models/group_spec.rb
@@ -1380,6 +1380,24 @@ RSpec.describe Group do
       expect(GroupTagNotificationDefault.lookup(group, :watching)).to be_empty
     end
 
+    it "can change the notification level for a tag" do
+      GroupTagNotificationDefault.create!(
+        group: group,
+        tag: tag1,
+        notification_level: GroupTagNotificationDefault.notification_levels[:watching],
+      )
+
+      group.watching_tags = [tag1.name]
+      group.save!
+      expect(GroupTagNotificationDefault.lookup(group, :watching).pluck(:tag_id)).to eq([tag1.id])
+
+      group.watching_tags = []
+      group.tracking_tags = [tag1.name]
+      group.save!
+      expect(GroupTagNotificationDefault.lookup(group, :watching)).to be_empty
+      expect(GroupTagNotificationDefault.lookup(group, :tracking).pluck(:tag_id)).to eq([tag1.id])
+    end
+
     it "can apply default notifications for admins group" do
       group = Group.find(Group::AUTO_GROUPS[:admins])
       group.tracking_category_ids = [category1.id]