LeadMagnet/leadchat
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

chore: Fix schema disparities (#7554)

Browse Source 
- Fixing the schema disparities that crept up during merges
- Also, fix the issue with migrate command regenerating the schema for contacts.rb model
This commit is contained in:
Sojan Jose
2023-07-19 19:15:43 +03:00
committed by GitHub
parent f3f665cabb
commit 1d718b92b7
3 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Gemfile.lock
View File

@@ -365,13 +365,13 @@ GEM
image_processing (1.12.2) image_processing (1.12.2)
mini_magick (>= 4.9.5, < 5) mini_magick (>= 4.9.5, < 5)
ruby-vips (>= 2.0.17, < 3) ruby-vips (>= 2.0.17, < 3)
io-console (0.6.0)
irb (1.7.2)
reline (>= 0.3.6)
informers (0.2.0) informers (0.2.0)
blingfire (>= 0.1.7) blingfire (>= 0.1.7)
numo-narray numo-narray
onnxruntime (>= 0.5.1) onnxruntime (>= 0.5.1)
io-console (0.6.0)
irb (1.7.2)
reline (>= 0.3.6)
jbuilder (2.11.5) jbuilder (2.11.5)
actionview (>= 5.0.0) actionview (>= 5.0.0)
activesupport (>= 5.0.0) activesupport (>= 5.0.0)

6
app/models/contact.rb
View File

@@ -1,3 +1,5 @@
# rubocop:disable Layout/LineLength
# == Schema Information # == Schema Information
# #
# Table name: contacts # Table name: contacts
@@ -19,12 +21,14 @@
# index_contacts_on_account_id (account_id) # index_contacts_on_account_id (account_id)
# index_contacts_on_lower_email_account_id (lower((email)::text), account_id) # index_contacts_on_lower_email_account_id (lower((email)::text), account_id)
# index_contacts_on_name_email_phone_number_identifier (name,email,phone_number,identifier) USING gin # index_contacts_on_name_email_phone_number_identifier (name,email,phone_number,identifier) USING gin
# index_contacts_on_nonempty_fields (account_id,email,phone_number,identifier) WHERE (((email)::text <> ''::text) OR ((phone_number)::text <> ''::text) OR ((identifier)::text <> ''::text)) # rubocop:disable Layout/LineLength # index_contacts_on_nonempty_fields (account_id,email,phone_number,identifier) WHERE (((email)::text <> ''::text) OR ((phone_number)::text <> ''::text) OR ((identifier)::text <> ''::text))
# index_contacts_on_phone_number_and_account_id (phone_number,account_id) # index_contacts_on_phone_number_and_account_id (phone_number,account_id)
# uniq_email_per_account_contact (email,account_id) UNIQUE # uniq_email_per_account_contact (email,account_id) UNIQUE
# uniq_identifier_per_account_contact (identifier,account_id) UNIQUE # uniq_identifier_per_account_contact (identifier,account_id) UNIQUE
# #
# rubocop:enable Layout/LineLength
class Contact < ApplicationRecord class Contact < ApplicationRecord
include Avatarable include Avatarable
include AvailabilityStatusable include AvailabilityStatusable

2
db/schema.rb
View File

@@ -585,8 +585,8 @@ ActiveRecord::Schema[7.0].define(version: 2023_07_14_054138) do
t.jsonb "auto_assignment_config", default: {} t.jsonb "auto_assignment_config", default: {}
t.boolean "lock_to_single_conversation", default: false, null: false t.boolean "lock_to_single_conversation", default: false, null: false
t.bigint "portal_id" t.bigint "portal_id"
t.string "business_name"
t.integer "sender_name_type", default: 0, null: false t.integer "sender_name_type", default: 0, null: false
t.string "business_name"
t.index ["account_id"], name: "index_inboxes_on_account_id" t.index ["account_id"], name: "index_inboxes_on_account_id"
t.index ["channel_id", "channel_type"], name: "index_inboxes_on_channel_id_and_channel_type" t.index ["channel_id", "channel_type"], name: "index_inboxes_on_channel_id_and_channel_type"
t.index ["portal_id"], name: "index_inboxes_on_portal_id" t.index ["portal_id"], name: "index_inboxes_on_portal_id"