A platform for community discussion. Free, open, simple.
PERF: Add Users to Group Improvements Pt. 3 (#39091)
Bannon Tannerf1226c4cb907
diff --git a/app/models/group_user.rb b/app/models/group_user.rbindex dddd915f2d5..c59f538cce0 100644--- a/app/models/group_user.rb+++ b/app/models/group_user.rb@@ -5,18 +5,9 @@ class GroupUser < ActiveRecord::Basebelongs_to :userbefore_create :set_notification_level- after_destroy :grant_other_available_title- after_destroy :remove_primary_and_flair_group, :recalculate_trust_level- after_save :update_title- after_save :set_primary_group-- after_save :grant_trust_level- after_save :set_category_notifications- after_save :set_tag_notifications-- after_commit :increase_group_user_count, on: [:create]- after_commit :decrease_group_user_count, on: [:destroy]+ after_commit :sync_add_via_manager, on: :create+ after_commit :sync_remove_via_manager, on: :destroydef self.notification_levelsNotificationLevels.all@@ -88,63 +79,10 @@ class GroupUser < ActiveRecord::Baseself.notification_level = group&.default_notification_level || 3end- def set_primary_group- user.update!(primary_group: group) if group.primary_group- end-- def remove_primary_and_flair_group- return if self.destroyed_by_association&.active_record == User # User is being destroyed, so don't try to update-- updates = {}- updates[:primary_group_id] = nil if user.primary_group_id == group_id- updates[:flair_group_id] = nil if user.flair_group_id == group_id-- user.update(updates) if updates.present?- end-- def grant_other_available_title- if group.title.present? && group.title == user.title- user.update_attribute(:title, user.next_best_title)- end- end-- def update_title- if group.title.present?- DB.exec(- "- UPDATE users SET title = :title- WHERE (title IS NULL OR title = '') AND id = :id",- id: user_id,- title: group.title,- )- end- end-- def grant_trust_level- return if group.grant_trust_level.nil? || group.grant_trust_level.zero?-- TrustLevelGranter.grant(group.grant_trust_level, user)- end-- def recalculate_trust_level- return if group.grant_trust_level.nil? || group.grant_trust_level.zero?- return if self.destroyed_by_association&.active_record == User # User is being destroyed, so don't try to recalculate-- Promotion.recalculate(user, use_previous_trust_level: true)- end-- def set_category_notifications- self.class.set_category_notifications(group, user)- end-def self.set_category_notifications(group, user)bulk_set_category_notifications(group, [user.id])end- def set_tag_notifications- self.class.set_tag_notifications(group, user)- end-def self.set_tag_notifications(group, user)bulk_set_tag_notifications(group, [user.id])end@@ -194,12 +132,12 @@ class GroupUser < ActiveRecord::BaseTagUser.auto_track(user_ids: user_ids)end- def increase_group_user_count- Group.increment_counter(:user_count, self.group_id)+ def sync_add_via_manager+ GroupManager.new(group).sync_add_side_effects([user.id])end- def decrease_group_user_count- Group.decrement_counter(:user_count, self.group_id)+ def sync_remove_via_manager+ GroupManager.new(group).sync_removal_side_effects([user.id])enddef self.semantically_higher_notification_level_sql(new_col, existing_col)diff --git a/lib/group_manager.rb b/lib/group_manager.rbindex 67c95bb26f8..e529587caff 100644--- a/lib/group_manager.rb+++ b/lib/group_manager.rb@@ -11,23 +11,12 @@ class GroupManageradded_user_ids = bulk_add_transaction(user_ids)return [] if added_user_ids.blank?- if @group.grant_trust_level.present? && [email protected]_trust_level.zero?- Jobs.enqueue(- :bulk_grant_trust_level,- user_ids: added_user_ids,- trust_level: @group.grant_trust_level,- )- end-- GroupUser.bulk_set_category_notifications(@group, added_user_ids)- GroupUser.bulk_set_tag_notifications(@group, added_user_ids)+ bulk_publish_category_updates(added_user_ids)User.where(id: added_user_ids).find_each { |user| @group.trigger_user_added_event(user, automatic) }- bulk_publish_category_updates(added_user_ids)-added_user_idsend@@ -37,16 +26,12 @@ class GroupManagergroup_users_to_remove = @group.group_users.where(user_id: user_ids)return [] if group_users_to_remove.empty?- removed_user_ids = group_users_to_remove.pluck(:user_id)-webhook_payloads = build_user_removed_webhook_payloads(group_users_to_remove)+ removed_user_ids = group_users_to_remove.pluck(:user_id)bulk_remove_transaction(removed_user_ids)- if @group.grant_trust_level.present? && [email protected]_trust_level.zero?- Jobs.enqueue(:bulk_grant_trust_level, user_ids: removed_user_ids, recalculate: true)- end-+ recalculate_trust_level(removed_user_ids)bulk_publish_category_updates(removed_user_ids)User.where(id: removed_user_ids).find_each { |user| @group.trigger_user_removed_event(user) }@@ -55,6 +40,30 @@ class GroupManagerremoved_user_idsend+ def sync_add_side_effects(added_user_ids)+ update_title(added_user_ids)+ set_primary_group_and_update_flair(added_user_ids)+ grant_trust_level(added_user_ids)+ GroupUser.bulk_set_category_notifications(@group, added_user_ids)+ GroupUser.bulk_set_tag_notifications(@group, added_user_ids)+ increase_group_user_count(added_user_ids)+ end++ def sync_removal_side_effects(removed_user_ids)+ decrease_group_user_count(removed_user_ids)++ removed_user_id = removed_user_ids.first+ return unless User.exists?(removed_user_id)++ grant_other_available_title(removed_user_ids)+ remove_primary_and_flair_group(removed_user_ids)+ sync_recalculate_trust_level(removed_user_id)+ end++ def decrease_group_user_count(removed_user_ids)+ Group.update_counters(@group.id, user_count: -removed_user_ids.size)+ end+privatedef bulk_add_transaction(user_ids)@@ -91,32 +100,7 @@ class GroupManagerreturn added_user_ids if added_user_ids.blank?- if @group.primary_group?- User- .where(id: added_user_ids)- .where("flair_group_id IS NOT DISTINCT FROM primary_group_id")- .update_all(flair_group_id: @group.id)-- DB.exec(<<~SQL, user_ids: added_user_ids, new_title: @group.title)- UPDATE users u- SET title = :new_title- WHERE u.id IN (:user_ids)- AND u.primary_group_id IS NOT NULL- AND EXISTS (- SELECT 1 FROM groups g- WHERE g.id = u.primary_group_id- AND g.title = u.title- )- SQL-- User.where(id: added_user_ids).update_all(primary_group_id: @group.id)- end-- if @group.title.present?- User.where(id: added_user_ids, title: [nil, ""]).update_all(title: @group.title)- end-- Group.update_counters(@group.id, user_count: added_user_ids.size)+ sync_add_side_effects(added_user_ids)endadded_user_ids@@ -126,37 +110,10 @@ class GroupManagerGroup.transaction do@group.group_users.where(user_id: removed_user_ids).delete_all- User.where(primary_group_id: @group.id, id: removed_user_ids).update_all(- primary_group_id: nil,- )- User.where(flair_group_id: @group.id, id: removed_user_ids).update_all(flair_group_id: nil)-- if @group.title.present?- DB.exec(<<~SQL, user_ids: removed_user_ids, title: @group.title)- UPDATE users u- SET title = NULL- WHERE u.id IN (:user_ids)- AND u.title = :title- AND NOT EXISTS (- SELECT 1 FROM group_users gu- JOIN groups g ON g.id = gu.group_id- WHERE gu.user_id = u.id- AND g.title IS NOT NULL AND g.title <> ''- )- AND NOT EXISTS (- SELECT 1 FROM user_badges ub- JOIN badges b ON b.id = ub.badge_id- WHERE ub.user_id = u.id- AND b.allow_title = true- )- SQL-- User- .where(id: removed_user_ids, title: @group.title)- .find_each { |user| user.update_column(:title, user.next_best_title) }- end-- Group.update_counters(@group.id, user_count: -removed_user_ids.size)+ remove_primary_and_flair_group(removed_user_ids)+ grant_other_available_title(removed_user_ids)++ decrease_group_user_count(removed_user_ids)endend@@ -216,4 +173,97 @@ class GroupManager)endend++ def update_title(added_user_ids)+ if @group.title.present?+ User.where(id: added_user_ids, title: [nil, ""]).update_all(title: @group.title)+ end+ end++ def set_primary_group_and_update_flair(added_user_ids)+ return unless @group.primary_group?++ User+ .where(id: added_user_ids)+ .where("flair_group_id IS NOT DISTINCT FROM primary_group_id")+ .update_all(flair_group_id: @group.id)++ DB.exec(<<~SQL, user_ids: added_user_ids, new_title: @group.title)+ UPDATE users u+ SET title = :new_title+ WHERE u.id IN (:user_ids)+ AND u.primary_group_id IS NOT NULL+ AND EXISTS (+ SELECT 1 FROM groups g+ WHERE g.id = u.primary_group_id+ AND g.title = u.title+ )+ SQL++ User.where(id: added_user_ids).update_all(primary_group_id: @group.id)+ end++ def grant_trust_level(added_user_ids)+ return if @group.grant_trust_level.nil? || @group.grant_trust_level.zero?++ if added_user_ids.size == 1+ user = User.find(added_user_ids.first)+ TrustLevelGranter.grant(@group.grant_trust_level, user)+ else+ Jobs.enqueue(+ :bulk_grant_trust_level,+ user_ids: added_user_ids,+ trust_level: @group.grant_trust_level,+ )+ end+ end++ def increase_group_user_count(added_user_ids)+ Group.update_counters(@group.id, user_count: added_user_ids.size)+ end++ def grant_other_available_title(removed_user_ids)+ if @group.title.present?+ DB.exec(<<~SQL, user_ids: removed_user_ids, title: @group.title)+ UPDATE users u+ SET title = NULL+ WHERE u.id IN (:user_ids)+ AND u.title = :title+ AND NOT EXISTS (+ SELECT 1 FROM group_users gu+ JOIN groups g ON g.id = gu.group_id+ WHERE gu.user_id = u.id+ AND g.title IS NOT NULL AND g.title <> ''+ )+ AND NOT EXISTS (+ SELECT 1 FROM user_badges ub+ JOIN badges b ON b.id = ub.badge_id+ WHERE ub.user_id = u.id+ AND b.allow_title = true+ )+ SQL++ User+ .where(id: removed_user_ids, title: @group.title)+ .find_each { |user| user.update_column(:title, user.next_best_title) }+ end+ end++ def remove_primary_and_flair_group(removed_user_ids)+ User.where(primary_group_id: @group.id, id: removed_user_ids).update_all(primary_group_id: nil)+ User.where(flair_group_id: @group.id, id: removed_user_ids).update_all(flair_group_id: nil)+ end++ def recalculate_trust_level(removed_user_ids)+ return if @group.grant_trust_level.nil? || @group.grant_trust_level.zero?++ Jobs.enqueue(:bulk_grant_trust_level, user_ids: removed_user_ids, recalculate: true)+ end++ def sync_recalculate_trust_level(removed_user_id)+ return if @group.grant_trust_level.nil? || @group.grant_trust_level.zero?++ user = User.find(removed_user_id)+ Promotion.recalculate(user, use_previous_trust_level: true)+ endenddiff --git a/spec/models/group_user_spec.rb b/spec/models/group_user_spec.rbindex 6f0aa0f5f69..cc476deeee7 100644--- a/spec/models/group_user_spec.rb+++ b/spec/models/group_user_spec.rb@@ -12,6 +12,41 @@ RSpec.describe GroupUser doexpect do group_user.destroy! end.to change { group.reload.user_count }.from(1).to(0)end++ it "grants group title to user without one" do+ group.update!(title: "Cool Group")++ Fabricate(:group_user, group: group, user: user)++ expect(user.reload.title).to eq("Cool Group")+ end++ it "does not overwrite an existing title" do+ user.update!(title: "Existing Title")+ group.update!(title: "Cool Group")++ Fabricate(:group_user, group: group, user: user)++ expect(user.reload.title).to eq("Existing Title")+ end++ it "sets primary_group_id and flair_group_id for a primary group" do+ group.update!(primary_group: true)++ Fabricate(:group_user, group: group, user: user)++ user.reload+ expect(user.primary_group_id).to eq(group.id)+ expect(user.flair_group_id).to eq(group.id)+ end++ it "grants trust level when group has grant_trust_level" do+ group.update!(grant_trust_level: 3)++ Fabricate(:group_user, group: group, user: user)++ expect(user.reload.trust_level).to eq(3)+ endendit "correctly sets notification level" do@@ -55,7 +90,9 @@ RSpec.describe GroupUser doendit "doesn't change anything with no configured defaults" do- expect { group.add(user) }.to_not change { CategoryUser.count }+ expect { Fabricate(:group_user, group: group, user: user) }.to_not change {+ CategoryUser.count+ }endit "adds new category notifications" do@@ -65,7 +102,11 @@ RSpec.describe GroupUser dogroup.watching_category_ids = [category4.id]group.watching_first_post_category_ids = [category5.id]group.save!- expect { group.add(user) }.to change { CategoryUser.count }.by(5)++ expect { Fabricate(:group_user, group: group, user: user) }.to change {+ CategoryUser.count+ }.by(5)+h = CategoryUser.notification_levels_for(user)expect(h[category1.id]).to eq(levels[:muted])expect(h[category2.id]).to eq(levels[:regular])@@ -98,7 +139,9 @@ RSpec.describe GroupUser dogroup.regular_category_ids = [category1.id]group.watching_first_post_category_ids = [category2.id, category3.id, category4.id]group.save!- group.add(user)++ Fabricate(:group_user, group: group, user: user)+h = CategoryUser.notification_levels_for(user)expect(h[category1.id]).to eq(levels[:regular])expect(h[category2.id]).to eq(levels[:watching_first_post])@@ -125,7 +168,9 @@ RSpec.describe GroupUser dogroup.muted_category_ids = [category3.id]group.tracking_category_ids = [category4.id]group.save!- group.add(user)++ Fabricate(:group_user, group: group, user: user)+h = CategoryUser.notification_levels_for(user)expect(h[category1.id]).to eq(levels[:tracking])expect(h[category2.id]).to eq(levels[:watching])@@ -149,7 +194,7 @@ RSpec.describe GroupUser doendit "doesn't change anything with no configured defaults" do- expect { group.add(user) }.to_not change { TagUser.count }+ expect { Fabricate(:group_user, group: group, user: user) }.to_not change { TagUser.count }endit "adds new tag notifications" do@@ -159,7 +204,9 @@ RSpec.describe GroupUser dogroup.watching_tags = [tag4.name]group.watching_first_post_tags = [tag5.name]group.save!- expect { group.add(user) }.to change { TagUser.count }.by(5)++ expect { Fabricate(:group_user, group: group, user: user) }.to change { TagUser.count }.by(5)+expect(TagUser.lookup(user, :muted).pluck(:tag_id)).to eq([tag1.id])expect(TagUser.lookup(user, :regular).pluck(:tag_id)).to eq([tag2.id])expect(TagUser.lookup(user, :tracking).pluck(:tag_id)).to eq([tag3.id])@@ -175,7 +222,9 @@ RSpec.describe GroupUser dogroup.regular_tags = [tag1.name]group.watching_first_post_tags = [tag2.name, tag3.name, tag4.name]group.save!- group.add(user)++ Fabricate(:group_user, group: group, user: user)+expect(TagUser.lookup(user, :muted).pluck(:tag_id)).to be_emptyexpect(TagUser.lookup(user, :regular).pluck(:tag_id)).to eq([tag1.id])expect(TagUser.lookup(user, :tracking).pluck(:tag_id)).to be_empty@@ -193,7 +242,9 @@ RSpec.describe GroupUser dogroup.muted_tags = [tag3.name]group.tracking_tags = [tag2.name]group.save!- group.add(user)++ Fabricate(:group_user, group: group, user: user)+expect(TagUser.lookup(user, :muted).pluck(:tag_id)).to eq([tag3.id])expect(TagUser.lookup(user, :tracking).pluck(:tag_id)).to eq([tag1.id])expect(TagUser.lookup(user, :watching).pluck(:tag_id)).to eq([tag2.id])@@ -276,11 +327,9 @@ RSpec.describe GroupUser dodescribe "#destroy!" dofab!(:group)- it "removes `primary_group_id`, `flair_group_id` and exec `match_primary_group_changes` method on user model" do+ it "removes `primary_group_id`, `flair_group_id` on user model" douser = Fabricate(:user, primary_group: group, flair_group: group)group_user = Fabricate(:group_user, group: group, user: user)-- user.expects(:match_primary_group_changes).oncegroup_user.destroy!user.reload@@ -316,6 +365,28 @@ RSpec.describe GroupUser do)end+ it "restores title from another group when removed from title group" do+ other_group = Fabricate(:group, title: "Other Title")+ Fabricate(:group_user, group: other_group, user: user)+ group.update!(title: "Main Title")+ group_user = Fabricate(:group_user, group: group, user: user)+ user.update!(title: "Main Title")++ group_user.destroy!++ expect(user.reload.title).to eq("Other Title")+ end++ it "clears title when no other titled group exists" do+ group.update!(title: "Only Title")+ group_user = Fabricate(:group_user, group: group, user: user)+ user.update!(title: "Only Title")++ group_user.destroy!++ expect(user.reload.title).to be_nil+ end+it "protects user trust level if all requirements are met" doPromotion.stubs(:tl2_met?).returns(true)diff --git a/spec/models/invite_redeemer_spec.rb b/spec/models/invite_redeemer_spec.rbindex 4481749c00b..2bfd5c57800 100644--- a/spec/models/invite_redeemer_spec.rb+++ b/spec/models/invite_redeemer_spec.rb@@ -445,6 +445,8 @@ RSpec.describe InviteRedeemer dopassword: password,).redeem+ user.reload+expect(user.group_users.count).to eq(4)expect(user.trust_level).to eq(2)end