079d4b4996
* fix(conversations): enforce NOT NULL + FK on contact_id Conversations had contact_id nullable with no FK to contacts. Combined with dependent: :destroy_async on Contact#conversations, deleting a contact could leave conversations pointing to a missing contact, breaking the conversations#index API with "undefined method 'additional_attributes' for nil" from the contact partial. Changes: - Migration cleans up existing orphans, sets contact_id NOT NULL and adds a FK with ON DELETE CASCADE so the invariant is enforced at the DB level (complements the existing Rails presence validation). - ContactMergeAction uses update_all for conversations/messages/notes/ contact_inboxes so a failing callback cannot silently leave records pointing to the mergee contact before it is destroyed. - Drop the now-redundant orphan filter in Conversations::ResolutionJob and its spec; the invariant is enforced at the schema level. * fix: address review feedback - Drop the ON DELETE CASCADE FK on conversations.contact_id. Several conversation-owned tables (messages, mentions, conversation_participants, reporting_events, csat_survey_responses, calls, applied_slas, sla_events, and polymorphic notifications) still have plain conversation_id references without FK cascades. The DB-level cascade would skip Conversation's dependent: cleanup and replace the NULL-contact bug with orphan children, and would also conflict with the existing non-cascade FKs on scheduled_messages/recurring_scheduled_messages. Keep the invariant at the Rails layer (NOT NULL + presence validation + dependent: :destroy_async). - Clean up orphan conversations in the migration via Rails destroy so dependent associations are propagated correctly, instead of a raw DELETE FROM conversations that would orphan all child rows. - Revert ContactMergeAction.merge_* methods back to per-record update! so Conversation#after_update_commit still fires (notify_status_change / CONVERSATION_CONTACT_CHANGED) for contact_id changes. The bang form still removes the silent-failure risk of the original .update call.
71 lines
2.3 KiB
Ruby
71 lines
2.3 KiB
Ruby
class ContactMergeAction
|
|
include Events::Types
|
|
pattr_initialize [:account!, :base_contact!, :mergee_contact!]
|
|
|
|
def perform
|
|
# This case happens when an agent updates a contact email in dashboard,
|
|
# while the contact also update his email via email collect box
|
|
return @base_contact if base_contact.id == mergee_contact.id
|
|
|
|
ActiveRecord::Base.transaction do
|
|
validate_contacts
|
|
merge_conversations
|
|
merge_messages
|
|
merge_contact_inboxes
|
|
merge_contact_notes
|
|
merge_and_remove_mergee_contact
|
|
end
|
|
@base_contact
|
|
end
|
|
|
|
private
|
|
|
|
def validate_contacts
|
|
return if belongs_to_account?(@base_contact) && belongs_to_account?(@mergee_contact)
|
|
|
|
raise StandardError, 'contact does not belong to the account'
|
|
end
|
|
|
|
def belongs_to_account?(contact)
|
|
@account.id == contact.account_id
|
|
end
|
|
|
|
def merge_conversations
|
|
Conversation.where(contact_id: @mergee_contact.id).find_each do |conversation|
|
|
conversation.update!(contact_id: @base_contact.id)
|
|
end
|
|
end
|
|
|
|
def merge_contact_notes
|
|
Note.where(contact_id: @mergee_contact.id, account_id: @mergee_contact.account_id).find_each do |note|
|
|
note.update!(contact_id: @base_contact.id)
|
|
end
|
|
end
|
|
|
|
def merge_messages
|
|
Message.where(sender: @mergee_contact).find_each do |message|
|
|
message.update!(sender: @base_contact)
|
|
end
|
|
end
|
|
|
|
def merge_contact_inboxes
|
|
ContactInbox.where(contact_id: @mergee_contact.id).find_each do |contact_inbox|
|
|
contact_inbox.update!(contact_id: @base_contact.id)
|
|
end
|
|
end
|
|
|
|
def merge_and_remove_mergee_contact
|
|
mergable_attribute_keys = %w[identifier name email phone_number additional_attributes custom_attributes]
|
|
base_contact_attributes = base_contact.attributes.slice(*mergable_attribute_keys).compact_blank
|
|
mergee_contact_attributes = mergee_contact.attributes.slice(*mergable_attribute_keys).compact_blank
|
|
|
|
# attributes in base contact are given preference
|
|
merged_attributes = mergee_contact_attributes.deep_merge(base_contact_attributes)
|
|
|
|
@mergee_contact.reload.destroy!
|
|
Rails.configuration.dispatcher.dispatch(CONTACT_MERGED, Time.zone.now, contact: @base_contact,
|
|
tokens: [@base_contact.contact_inboxes.filter_map(&:pubsub_token)])
|
|
@base_contact.update!(merged_attributes)
|
|
end
|
|
end
|