Change sender_id to contact_id in conversations (#167)

* change sender_id to contact_id in conversations

* Fix failing tests

* Fix seeds

* fix specs

* Fix issues in facebook messenger
This commit is contained in:
Sojan Jose
2019-10-21 00:40:18 +05:30
committed by GitHub
parent 2099dc01a6
commit ba8f055802
20 changed files with 294 additions and 309 deletions

View File

@@ -16,7 +16,7 @@ FactoryBot.define do
account: conversation.account,
channel: create(:channel_widget, account: conversation.account)
)
conversation.sender ||= create(:contact, account: conversation.account)
conversation.contact ||= create(:contact, account: conversation.account)
conversation.assignee ||= create(:user)
end
end

View File

@@ -1,23 +0,0 @@
# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html
one:
content: MyText
account_id: 1
channel_id: 1
inbox_id: 1
conversation_id: 1
sender_id: 1
sender_type: MyString
reciever_id: 1
reciever_type: MyString
two:
content: MyText
account_id: 1
channel_id: 1
inbox_id: 1
conversation_id: 1
sender_id: 1
sender_type: MyString
reciever_id: 1
reciever_type: MyString

View File

@@ -79,7 +79,7 @@ RSpec.describe Conversation, type: :model do
create(
:conversation,
account: account,
sender: create(:contact, account: account),
contact: create(:contact, account: account),
inbox: inbox,
assignee: nil
)
@@ -205,7 +205,7 @@ RSpec.describe Conversation, type: :model do
let(:expected_data) do
{
meta: {
sender: conversation.sender.push_event_data,
sender: conversation.contact.push_event_data,
assignee: conversation.assignee
},
id: conversation.display_id,

View File

@@ -14,7 +14,7 @@ RSpec.describe Conversations::EventDataPresenter do
let(:expected_data) do
{
meta: {
sender: conversation.sender.push_event_data,
sender: conversation.contact.push_event_data,
assignee: conversation.assignee
},
id: conversation.display_id,