KumiSystems/Chatwoot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

chore: Add the ability to use same key for conversation and contact (#3526)

Browse source
This commit is contained in:
Muhsin Keloth 2021-12-08 20:15:27 +05:30 committed by GitHub
parent 35130bc83e
commit 3ee6b7d6e9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/models/custom_attribute_definition.rb
View file

@ -16,7 +16,7 @@
#
# Indexes
#
# attribute_key_index (attribute_key,account_id) UNIQUE
# attribute_key_model_index (attribute_key,attribute_model,account_id) UNIQUE
# index_custom_attribute_definitions_on_account_id (account_id)
#
class CustomAttributeDefinition < ApplicationRecord
@ -25,7 +25,7 @@ class CustomAttributeDefinition < ApplicationRecord
validates :attribute_key,
presence: true,
uniqueness: { scope: :account_id }
uniqueness: { scope: [:account_id, :attribute_model] }
validates :attribute_display_type, presence: true
validates :attribute_model, presence: true

8
db/migrate/20211208081344_add_attribute_model_index_on_custom_attribute_definition.rb Normal file
View file

@ -0,0 +1,8 @@
class AddAttributeModelIndexOnCustomAttributeDefinition < ActiveRecord::Migration[6.1]
def change
remove_index :custom_attribute_definitions, [:attribute_key, :account_id], name: 'attribute_key_index',
if_exists: true
add_index :custom_attribute_definitions, [:attribute_key, :attribute_model, :account_id], unique: true, name: 'attribute_key_model_index',
if_not_exists: true
end
end

2
db/schema.rb
View file

@ -368,7 +368,7 @@ ActiveRecord::Schema.define(version: 2021_12_08_085931) do
t.text "attribute_description"
t.jsonb "attribute_values", default: []
t.index ["account_id"], name: "index_custom_attribute_definitions_on_account_id"
t.index ["attribute_key", "account_id"], name: "attribute_key_index", unique: true
t.index ["attribute_key", "attribute_model", "account_id"], name: "attribute_key_model_index", unique: true
end
create_table "custom_filters", force: :cascade do |t|