From c0232ad7c80b7ca5226df1430e9c41cbafd243ae Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Wed, 3 Apr 2024 18:02:46 +0530 Subject: [PATCH] feat: handle conversation query order --- app/builders/messages/facebook/message_builder.rb | 2 +- app/builders/messages/instagram/message_builder.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/builders/messages/facebook/message_builder.rb b/app/builders/messages/facebook/message_builder.rb index 53c6147e6..2c55922f6 100644 --- a/app/builders/messages/facebook/message_builder.rb +++ b/app/builders/messages/facebook/message_builder.rb @@ -58,7 +58,7 @@ class Messages::Facebook::MessageBuilder < Messages::Messenger::MessageBuilder def set_conversation_based_on_inbox_config if @inbox.lock_to_single_conversation - Conversation.find_by(conversation_params) || build_conversation + Conversation.where(conversation_params).order(created_at: :desc).first || build_conversation else find_or_build_for_multiple_conversations end diff --git a/app/builders/messages/instagram/message_builder.rb b/app/builders/messages/instagram/message_builder.rb index 24889d205..741052d67 100644 --- a/app/builders/messages/instagram/message_builder.rb +++ b/app/builders/messages/instagram/message_builder.rb @@ -79,7 +79,7 @@ class Messages::Instagram::MessageBuilder < Messages::Messenger::MessageBuilder def set_conversation_based_on_inbox_config if @inbox.lock_to_single_conversation - instagram_direct_message_conversation.first || build_conversation + instagram_direct_message_conversation.order(created_at: :desc).first || build_conversation else find_or_build_for_multiple_conversations end