fix(companies): sync contact company names (#14759)
Fixes company-contact name drift when a company is renamed or deleted. Closes: N/A ## Why Contacts keep a denormalized `additional_attributes.company_name` for display and filtering. Company rename/delete flows could leave that copied value stale even though the actual `company_id` relationship changed. ## What changed - Enqueues an async company contact-name sync job when a company name changes. - Moves company deletion into `Companies::DeleteJob`. - The delete job unlinks linked contacts, clears only the copied `company_name`, and then deletes the company. - Uses bulk JSON updates for the cleanup path so contact records are not saved, which avoids contact update callbacks, webhook dispatch, and automation side effects. ## How to test - Link a contact to a company, rename the company, and confirm the contact company name updates after the job runs. - Delete a company with linked contacts and confirm the delete job removes the company, unassigns linked contacts, and preserves other contact additional attributes. --------- Co-authored-by: Sony Mathew <sony@chatwoot.com> Co-authored-by: Sony Mathew <2040199+sony-mathew@users.noreply.github.com>
This commit is contained in:
co-authored by
Sony Mathew
Sony Mathew
parent
44b32eacec
commit
2b37fef0e0
@@ -385,13 +385,13 @@ RSpec.describe 'Companies API', type: :request do
|
||||
let(:admin) { create(:user, account: account, role: :administrator) }
|
||||
let(:company) { create(:company, account: account) }
|
||||
|
||||
it 'deletes the company' do
|
||||
company
|
||||
it 'enqueues company deletion' do
|
||||
expect do
|
||||
delete "/api/v1/accounts/#{account.id}/companies/#{company.id}",
|
||||
headers: admin.create_new_auth_token,
|
||||
as: :json
|
||||
end.to change(Company, :count).by(-1)
|
||||
end.to have_enqueued_job(Companies::DeleteJob).with(company_id: company.id)
|
||||
|
||||
expect(response).to have_http_status(:ok)
|
||||
end
|
||||
end
|
||||
|
||||
@@ -0,0 +1,19 @@
|
||||
require 'rails_helper'
|
||||
|
||||
RSpec.describe Companies::DeleteJob, type: :job do
|
||||
describe '#perform' do
|
||||
it 'unlinks contacts, clears company names, and deletes the company' do
|
||||
account = create(:account)
|
||||
company = create(:company, account: account, name: 'Acme')
|
||||
contact = create(:contact, account: account, company: company, additional_attributes: { 'company_name' => 'Acme', 'city' => 'Berlin' })
|
||||
other_contact = create(:contact, account: account, additional_attributes: { 'company_name' => 'Acme' })
|
||||
|
||||
described_class.perform_now(company_id: company.id)
|
||||
|
||||
expect { company.reload }.to raise_error(ActiveRecord::RecordNotFound)
|
||||
expect(contact.reload.company_id).to be_nil
|
||||
expect(contact.additional_attributes).to eq('city' => 'Berlin')
|
||||
expect(other_contact.reload.additional_attributes).to eq('company_name' => 'Acme')
|
||||
end
|
||||
end
|
||||
end
|
||||
@@ -0,0 +1,38 @@
|
||||
require 'rails_helper'
|
||||
|
||||
RSpec.describe Companies::SyncContactNamesJob, type: :job do
|
||||
let(:account) { create(:account) }
|
||||
let(:company) { create(:company, account: account, name: 'Acme') }
|
||||
|
||||
describe '#perform' do
|
||||
it 'updates linked contact company names' do
|
||||
contact = create(:contact, account: account, company: company, additional_attributes: { 'company_name' => 'Acme', 'city' => 'Berlin' })
|
||||
|
||||
company.update!(name: 'Acme Labs')
|
||||
|
||||
described_class.perform_now(company_id: company.id)
|
||||
|
||||
expect(contact.reload.additional_attributes).to eq('company_name' => 'Acme Labs', 'city' => 'Berlin')
|
||||
end
|
||||
|
||||
it 'uses the current company name when a stale rename job runs' do
|
||||
contact = create(:contact, account: account, company: company, additional_attributes: { 'company_name' => 'Acme' })
|
||||
company.update!(name: 'Acme Labs')
|
||||
|
||||
described_class.perform_now(company_id: company.id)
|
||||
|
||||
expect(contact.reload.additional_attributes).to eq('company_name' => 'Acme Labs')
|
||||
end
|
||||
|
||||
it 'does not save contacts while syncing the denormalized company name' do
|
||||
contact = create(:contact, account: account, company: company, additional_attributes: { 'company_name' => 'Acme' })
|
||||
original_updated_at = contact.reload.updated_at
|
||||
|
||||
company.update!(name: 'Acme Labs')
|
||||
|
||||
described_class.perform_now(company_id: company.id)
|
||||
|
||||
expect(contact.reload.updated_at).to eq(original_updated_at)
|
||||
end
|
||||
end
|
||||
end
|
||||
@@ -46,4 +46,15 @@ RSpec.describe Company, type: :model do
|
||||
expect(company.reload.last_activity_at).to be_within(1.second).of(original_activity_at)
|
||||
end
|
||||
end
|
||||
|
||||
describe 'contact company name sync' do
|
||||
let(:account) { create(:account) }
|
||||
let(:company) { create(:company, account: account, name: 'Acme') }
|
||||
|
||||
it 'enqueues contact company name sync when the company name changes' do
|
||||
expect do
|
||||
company.update!(name: 'Acme Labs')
|
||||
end.to have_enqueued_job(Companies::SyncContactNamesJob).with(company_id: company.id)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
Reference in New Issue
Block a user