mirror of
https://github.com/lingble/chatwoot.git
synced 2025-11-01 19:48:08 +00:00
c88447c11f
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
57 lines
2.3 KiB
Ruby
57 lines
2.3 KiB
Ruby
require 'rails_helper'
|
|
|
|
RSpec.describe Team do
|
|
describe 'associations' do
|
|
it { is_expected.to belong_to(:account) }
|
|
it { is_expected.to have_many(:conversations) }
|
|
it { is_expected.to have_many(:team_members) }
|
|
end
|
|
|
|
describe '#add_members' do
|
|
let(:team) { FactoryBot.create(:team) }
|
|
|
|
before do
|
|
allow(Rails.configuration.dispatcher).to receive(:dispatch)
|
|
end
|
|
|
|
it 'handles adds all members and resets cache keys' do
|
|
users = FactoryBot.create_list(:user, 3)
|
|
team.add_members(users.map(&:id))
|
|
expect(team.reload.team_members.size).to eq(3)
|
|
|
|
expect(Rails.configuration.dispatcher).to have_received(:dispatch).at_least(:once)
|
|
.with(
|
|
'account.cache_invalidated',
|
|
kind_of(Time),
|
|
account: team.account,
|
|
cache_keys: team.account.cache_keys
|
|
)
|
|
end
|
|
end
|
|
|
|
describe '#remove_members' do
|
|
let(:team) { FactoryBot.create(:team) }
|
|
let(:users) { FactoryBot.create_list(:user, 3) }
|
|
|
|
before do
|
|
team.add_members(users.map(&:id))
|
|
allow(Rails.configuration.dispatcher).to receive(:dispatch)
|
|
end
|
|
|
|
it 'removes the members and resets cache keys' do
|
|
expect(team.reload.team_members.size).to eq(3)
|
|
|
|
team.remove_members(users.map(&:id))
|
|
expect(team.reload.team_members.size).to eq(0)
|
|
|
|
expect(Rails.configuration.dispatcher).to have_received(:dispatch).at_least(:once)
|
|
.with(
|
|
'account.cache_invalidated',
|
|
kind_of(Time),
|
|
account: team.account,
|
|
cache_keys: team.account.cache_keys
|
|
)
|
|
end
|
|
end
|
|
end
|