chore: Improve the behaviour of lock to single conversation (#7863)

spec/services/twilio/incoming_message_service_spec.rb

@@ -24,7 +24,7 @@ describe Twilio::IncomingMessageService do
       expect(conversation.reload.messages.last.content).to eq('testing3')
     end
 
-    it 'creates a new conversation' do
+    it 'creates a new conversation when payload is from different number' do
       params = {
         SmsSid: 'SMxx',
         From: '+123456',
@@ -37,6 +37,7 @@ describe Twilio::IncomingMessageService do
       expect(twilio_channel.inbox.conversations.count).to eq(2)
     end
 
+    # Since we support the case with phone number as well. the previous case is with accoud_sid and messaging_service_sid
     context 'with a phone number' do
       let!(:twilio_channel) do
         create(:channel_twilio_sms, :with_phone_number, account: account, account_sid: 'ACxxx',
@@ -56,7 +57,7 @@ describe Twilio::IncomingMessageService do
         expect(conversation.reload.messages.last.content).to eq('testing3')
       end
 
-      it 'creates a new conversation' do
+      it 'creates a new conversation when payload is from different number' do
         params = {
           SmsSid: 'SMxx',
           From: '+123456',
@@ -68,6 +69,39 @@ describe Twilio::IncomingMessageService do
         described_class.new(params: params).perform
         expect(twilio_channel.inbox.conversations.count).to eq(2)
       end
+
+      it 'reopen last conversation if last conversation is resolved and lock to single conversation is enabled' do
+        params = {
+          SmsSid: 'SMxx',
+          From: '+12345',
+          AccountSid: 'ACxxx',
+          To: twilio_channel.phone_number,
+          Body: 'testing3'
+        }
+
+        twilio_channel.inbox.update(lock_to_single_conversation: true)
+        conversation.update(status: 'resolved')
+        described_class.new(params: params).perform
+        # message appended to the last conversation
+        expect(conversation.reload.messages.last.content).to eq('testing3')
+        expect(conversation.reload.status).to eq('open')
+      end
+
+      it 'creates a new conversation if last conversation is resolved and lock to single conversation is disabled' do
+        params = {
+          SmsSid: 'SMxx',
+          From: '+12345',
+          AccountSid: 'ACxxx',
+          To: twilio_channel.phone_number,
+          Body: 'testing3'
+        }
+
+        twilio_channel.inbox.update(lock_to_single_conversation: false)
+        conversation.update(status: 'resolved')
+        described_class.new(params: params).perform
+        expect(twilio_channel.inbox.conversations.count).to eq(2)
+        expect(twilio_channel.inbox.conversations.last.messages.last.content).to eq('testing3')
+      end
     end
 
     context 'with multiple channels configured' do