[STREAM-575] Don't emit a pendingSession when we have an activeSession if the conversation update is for the same conversation as the activeSession

Author: hjon

src/sessions/softphone-session-handler.ts

@@ -277,7 +277,7 @@ export class SoftphoneSessionHandler extends BaseSessionHandler {
         }
 
         /* only emit `pendingSession` if we already have an active session */
-        if (session && session === this.activeSession) {
+        if (session && session === this.activeSession && conversationId !== session.conversationId) {
           const pendingSession: IPendingSession = {
             id: session.id,
             sessionId: session.id,

test/unit/sessions/softphone-session-handler.test.ts

@@ -1197,12 +1197,13 @@ describe('handleSoftphoneConversationUpdate()', () => {
     );
   });
 
-  it('should emit a pending session if we already have an active session', async () => {
+  it('should emit a pending session if we already have an active session with a different conversationId', async () => {
     const { update, participant, callState, session } = generateUpdate({
       callState: CommunicationStates.alerting
     });
 
     handler.activeSession = session;
+    update.id = session.conversationId + '1';
 
     handler.handleSoftphoneConversationUpdate(update, participant, callState, session);
 
@@ -1228,6 +1229,21 @@ describe('handleSoftphoneConversationUpdate()', () => {
     expect(mockSessionManager.pendingSessions[0]).toEqual(expectedPendingSession);
   });
 
+  it('should not emit a pending session if the active session is for the same conversation', async () => {
+    const { update, participant, callState, session } = generateUpdate({
+      callState: CommunicationStates.alerting
+    });
+    handler.activeSession = session;
+
+    handler.handleSoftphoneConversationUpdate(update, participant, callState, session);
+
+    await flushPromises();
+
+    expect(emitConversationEventSpy).not.toHaveBeenCalled();
+    expect(sdkEmitSpy).not.toHaveBeenCalled();
+    expect(mockSessionManager.pendingSessions.length).toBe(0);
+  });
+
   it('should not emit a pending session if we do not have an active session', () => {
     const { update, participant, callState, session } = generateUpdate({
       callState: CommunicationStates.alerting