16b8693e1b
Standardizes the contact company import/filter/automation contract on `company_name`. Closes #14096 Revives #9907 ## Why Contact company is read across the current CRM/contact UI from `additional_attributes['company_name']`, but CSV import and a few backend filter/automation paths still used the older `company` key. That meant imported company values could be saved in a place the dashboard, sorting, filters, and automation conditions did not consistently read from. Based on the production data check, the legacy `company` automation configuration is effectively dead: the affected account did not have contacts populated with `additional_attributes['company']`. So this PR intentionally avoids adding long-term fallback behavior and uses `company_name` as the single key going forward. ## What changed - Contact CSV import now writes only `company_name` into `additional_attributes['company_name']`. - The example contact import CSV now uses the `company_name` header. - Contact company sorting/filter config now uses `company_name`. - Automation condition config now uses `company_name`. - Existing standard automation conditions with `attribute_key: 'company'` are migrated to `company_name`. - Existing saved contact filters with standard `attribute_key: 'company'` are migrated to `company_name`. - Custom attributes named `company` are preserved and are not rewritten by the migration. ## How to test - Import a contact CSV with a `company_name` column and confirm the Contact Company field is populated. - Sort contacts by Company and confirm imported contacts are ordered correctly. - Create/edit an automation with Company as a condition and confirm it saves with `company_name`. - Verify existing saved contact filters and automation rules using the old standard `company` key are migrated to `company_name`. --------- Co-authored-by: Claude <noreply@anthropic.com> Co-authored-by: Sojan Jose <sojan@pepalo.com>
75 lines
3.0 KiB
Ruby
75 lines
3.0 KiB
Ruby
# == Schema Information
|
|
#
|
|
# Table name: custom_attribute_definitions
|
|
#
|
|
# id :bigint not null, primary key
|
|
# attribute_description :text
|
|
# attribute_display_name :string
|
|
# attribute_display_type :integer default("text")
|
|
# attribute_key :string
|
|
# attribute_model :integer default("conversation_attribute")
|
|
# attribute_values :jsonb
|
|
# default_value :integer
|
|
# regex_cue :string
|
|
# regex_pattern :string
|
|
# created_at :datetime not null
|
|
# updated_at :datetime not null
|
|
# account_id :bigint
|
|
#
|
|
# Indexes
|
|
#
|
|
# attribute_key_model_index (attribute_key,attribute_model,account_id) UNIQUE
|
|
# index_custom_attribute_definitions_on_account_id (account_id)
|
|
#
|
|
class CustomAttributeDefinition < ApplicationRecord
|
|
STANDARD_ATTRIBUTES = {
|
|
:conversation => %w[status priority assignee_id inbox_id team_id display_id campaign_id labels browser_language country_code referer created_at
|
|
last_activity_at],
|
|
:contact => %w[name email phone_number identifier country_code city company_name created_at last_activity_at referer blocked]
|
|
}.freeze
|
|
|
|
scope :with_attribute_model, ->(attribute_model) { attribute_model.presence && where(attribute_model: attribute_model) }
|
|
validates :attribute_display_name, presence: true
|
|
before_validation :normalize_attribute_fields
|
|
|
|
validates :attribute_key,
|
|
presence: true,
|
|
uniqueness: { scope: [:account_id, :attribute_model] },
|
|
format: { with: /\A[\p{L}\p{N}_.\-]+\z/, message: I18n.t('errors.custom_attribute_definition.attribute_key_format') }
|
|
|
|
validates :attribute_display_type, presence: true
|
|
validates :attribute_model, presence: true
|
|
validate :attribute_must_not_conflict, on: :create
|
|
|
|
enum attribute_model: { conversation_attribute: 0, contact_attribute: 1 }
|
|
enum attribute_display_type: { text: 0, number: 1, currency: 2, percent: 3, link: 4, date: 5, list: 6, checkbox: 7 }
|
|
|
|
belongs_to :account
|
|
after_update :update_widget_pre_chat_custom_fields
|
|
after_destroy :sync_widget_pre_chat_custom_fields
|
|
|
|
private
|
|
|
|
def normalize_attribute_fields
|
|
self.attribute_key = attribute_key.strip if attribute_key.present?
|
|
self.attribute_display_name = attribute_display_name.strip if attribute_display_name.present?
|
|
end
|
|
|
|
def sync_widget_pre_chat_custom_fields
|
|
::Inboxes::SyncWidgetPreChatCustomFieldsJob.perform_later(account, attribute_key)
|
|
end
|
|
|
|
def update_widget_pre_chat_custom_fields
|
|
::Inboxes::UpdateWidgetPreChatCustomFieldsJob.perform_later(account, self)
|
|
end
|
|
|
|
def attribute_must_not_conflict
|
|
model_keys = attribute_model.to_sym == :conversation_attribute ? :conversation : :contact
|
|
return unless attribute_key.in?(STANDARD_ATTRIBUTES[model_keys])
|
|
|
|
errors.add(:attribute_key, I18n.t('errors.custom_attribute_definition.key_conflict'))
|
|
end
|
|
end
|
|
|
|
CustomAttributeDefinition.include_mod_with('Concerns::CustomAttributeDefinition')
|