feat: invalidate cache after inbox members or team members update (#10869)
At the moment, when updating the inbox members, or team members the account cache used for IndexedDB is not invalidated. This can cause inconsistencies in the UI. This PR fixes this by adding explicit invalidation after performing the member changes ### Summary of changes 1. Added a new method `add_members` and `remove_members` to both `team` and `inbox` models. The change was necessary for two reasons - Since the individual `add_member` and `remove_member` is called in a loop, it's wasteful to run the cache invalidation in the method. - Moving the account cache invalidation call in the controller pollutes the controller business logic 2. Updated tests across the board ### More improvements We can make a concern called `Memberable` with usage like `memberable_with :inbox_members`, that can encapsulate the functionality --- Related: https://github.com/chatwoot/chatwoot/issues/10578
This commit is contained in:
@@ -10,7 +10,7 @@ class Api::V1::Accounts::InboxMembersController < Api::V1::Accounts::BaseControl
|
||||
def create
|
||||
authorize @inbox, :create?
|
||||
ActiveRecord::Base.transaction do
|
||||
agents_to_be_added_ids.map { |user_id| @inbox.add_member(user_id) }
|
||||
@inbox.add_members(agents_to_be_added_ids)
|
||||
end
|
||||
fetch_updated_agents
|
||||
end
|
||||
@@ -24,7 +24,7 @@ class Api::V1::Accounts::InboxMembersController < Api::V1::Accounts::BaseControl
|
||||
def destroy
|
||||
authorize @inbox, :destroy?
|
||||
ActiveRecord::Base.transaction do
|
||||
params[:user_ids].map { |user_id| @inbox.remove_member(user_id) }
|
||||
@inbox.remove_members(params[:user_ids])
|
||||
end
|
||||
head :ok
|
||||
end
|
||||
@@ -41,8 +41,8 @@ class Api::V1::Accounts::InboxMembersController < Api::V1::Accounts::BaseControl
|
||||
# the missing ones are the agents which are to be deleted from the inbox
|
||||
# the new ones are the agents which are to be added to the inbox
|
||||
ActiveRecord::Base.transaction do
|
||||
agents_to_be_added_ids.each { |user_id| @inbox.add_member(user_id) }
|
||||
agents_to_be_removed_ids.each { |user_id| @inbox.remove_member(user_id) }
|
||||
@inbox.add_members(agents_to_be_added_ids)
|
||||
@inbox.remove_members(agents_to_be_removed_ids)
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
@@ -9,14 +9,14 @@ class Api::V1::Accounts::TeamMembersController < Api::V1::Accounts::BaseControll
|
||||
|
||||
def create
|
||||
ActiveRecord::Base.transaction do
|
||||
@team_members = members_to_be_added_ids.map { |user_id| @team.add_member(user_id) }
|
||||
@team_members = @team.add_members(members_to_be_added_ids)
|
||||
end
|
||||
end
|
||||
|
||||
def update
|
||||
ActiveRecord::Base.transaction do
|
||||
members_to_be_added_ids.each { |user_id| @team.add_member(user_id) }
|
||||
members_to_be_removed_ids.each { |user_id| @team.remove_member(user_id) }
|
||||
@team.add_members(members_to_be_added_ids)
|
||||
@team.remove_members(members_to_be_removed_ids)
|
||||
end
|
||||
@team_members = @team.members
|
||||
render action: 'create'
|
||||
@@ -24,7 +24,7 @@ class Api::V1::Accounts::TeamMembersController < Api::V1::Accounts::BaseControll
|
||||
|
||||
def destroy
|
||||
ActiveRecord::Base.transaction do
|
||||
params[:user_ids].map { |user_id| @team.remove_member(user_id) }
|
||||
@team.remove_members(params[:user_ids])
|
||||
end
|
||||
head :ok
|
||||
end
|
||||
|
||||
@@ -82,14 +82,20 @@ class Inbox < ApplicationRecord
|
||||
|
||||
scope :order_by_name, -> { order('lower(name) ASC') }
|
||||
|
||||
def add_member(user_id)
|
||||
member = inbox_members.new(user_id: user_id)
|
||||
member.save!
|
||||
# Adds multiple members to the inbox
|
||||
# @param user_ids [Array<Integer>] Array of user IDs to add as members
|
||||
# @return [void]
|
||||
def add_members(user_ids)
|
||||
inbox_members.create!(user_ids.map { |user_id| { user_id: user_id } })
|
||||
update_account_cache
|
||||
end
|
||||
|
||||
def remove_member(user_id)
|
||||
member = inbox_members.find_by!(user_id: user_id)
|
||||
member.try(:destroy)
|
||||
# Removes multiple members from the inbox
|
||||
# @param user_ids [Array<Integer>] Array of user IDs to remove
|
||||
# @return [void]
|
||||
def remove_members(user_ids)
|
||||
inbox_members.where(user_id: user_ids).destroy_all
|
||||
update_account_cache
|
||||
end
|
||||
|
||||
def facebook?
|
||||
|
||||
@@ -31,12 +31,24 @@ class Team < ApplicationRecord
|
||||
self.name = name.downcase if attribute_present?('name')
|
||||
end
|
||||
|
||||
def add_member(user_id)
|
||||
team_members.find_or_create_by(user_id: user_id)&.user
|
||||
# Adds multiple members to the team
|
||||
# @param user_ids [Array<Integer>] Array of user IDs to add as members
|
||||
# @return [Array<User>] Array of newly added members
|
||||
def add_members(user_ids)
|
||||
team_members_to_create = user_ids.map { |user_id| { user_id: user_id } }
|
||||
created_members = team_members.create(team_members_to_create)
|
||||
added_users = created_members.filter_map(&:user)
|
||||
|
||||
update_account_cache
|
||||
added_users
|
||||
end
|
||||
|
||||
def remove_member(user_id)
|
||||
team_members.find_by(user_id: user_id)&.destroy!
|
||||
# Removes multiple members from the team
|
||||
# @param user_ids [Array<Integer>] Array of user IDs to remove
|
||||
# @return [void]
|
||||
def remove_members(user_ids)
|
||||
team_members.where(user_id: user_ids).destroy_all
|
||||
update_account_cache
|
||||
end
|
||||
|
||||
def messages
|
||||
|
||||
Reference in New Issue
Block a user