Merge pull request #22 from aymenn/service-tests

Service tests

Author: nataliehuynh

src/@types/types.ts

@@ -36,4 +36,9 @@ export interface JoinConferenceParams extends Request {
   params: {
     conferenceName: string
   }
+}
+
+export interface ParticipantToDial {
+  address: string,
+  proxyAddress: string
 }

src/services/inboundCall.service.ts

@@ -1,8 +1,12 @@
+import client from '../twilioClient'
 import VoiceResponse from "twilio/lib/twiml/VoiceResponse";
 
-import { getConversationByAddressPair } from "../utils/getConversationByAddressPair.util";
-
-import client from '../twilioClient'
+import {
+  getConversationByAddressPair,
+  participantsToDial,
+  listConversationParticipants,
+  generateConferenceName
+} from "../utils/";
 
 export const generateTwiml = async (from: string, to: string) => {
   let response = new VoiceResponse();
@@ -16,33 +20,18 @@ export const generateTwiml = async (from: string, to: string) => {
       language: process.env.CALL_ANNOUCEMENT_LANGUAGE as any,
     }, process.env.OUT_OF_SESSION_MESSAGE_FOR_CALL);
   } else {
-    const participants = await client.conversations
-      .conversations(conversation.conversationSid)
-      .participants
-      .list()
-
-    const participantsToDial = participants.reduce((result, p) => {
-      if (p.messagingBinding.type === "sms" && p.messagingBinding.address != from) {
-          console.log(`Adding ${p.messagingBinding.address} to list of numbers to dial.\n`)
-
-          result.push({
-              address: p.messagingBinding.address,
-              proxyAddress: p.messagingBinding.proxy_address
-          })
-      }
-
-      return result;
-    }, [])
+    const participants = await listConversationParticipants(conversation.conversationSid)
+    const dialList = participantsToDial(participants, from)
 
     response.say({
       voice: process.env.CALL_ANNOUCEMENT_VOICE as any,
       language: process.env.CALL_ANNOUCEMENT_LANGUAGE as any
     }, process.env.CONNECTING_CALL_ANNOUCEMENT);
 
-    if (participantsToDial.length > 1) {
-      const conferenceName = `${from}_at_${Date.now()}`
+    if (dialList.length > 1) {
+      const conferenceName = generateConferenceName(from)
 
-      const callPromises = participantsToDial.map(pa => {
+      const callPromises = dialList.map(pa => {
           console.log(`Dialing ${pa.address} from ${pa.proxyAddress}...`);
 
           return client.calls.create({
@@ -52,28 +41,20 @@ export const generateTwiml = async (from: string, to: string) => {
           });
       });
 
-      try {
-        await Promise.all(callPromises)
-      } catch(err) {
-        console.log(err)
-        throw new Error(err)
-      }
+      await Promise.all(callPromises)
 
       const dial = response.dial();
       dial.conference({
           endConferenceOnExit: true
       }, conferenceName);
-
-
     } else {
-      const callee = participantsToDial[0]
+      const callee = dialList[0]
       const dial = response.dial({
         callerId: callee.proxyAddress
       });
 
       dial.number(callee.address);
     }
-
   }
 
   return response;

src/services/session.service.ts

@@ -1,5 +1,6 @@
+import { type } from "os";
 import { ActiveProxyAddresses, ProxyBindings } from "../@types/types";
-import { listParticipantConversations, addParticipant } from "../utils";
+import { listParticipantConversations, retryAddParticipant } from "../utils";
 
 export const getActiveProxyAddresses = async (phoneNumbers: Array<String>) : Promise<ActiveProxyAddresses> => {
   let activeConversations = {}
@@ -49,46 +50,12 @@ export const matchAvailableProxyAddresses = async (activeProxyAddresses: ActiveP
   }
 }
 
-const retryParticipantAdd = async (conversationSid: string, participantAddress: string, proxyAddresses: Array<string>) => {
-  try {
-    while(proxyAddresses.length > 0) {
-      try {
-        const participant = {
-          'messagingBinding.address': participantAddress,
-          'messagingBinding.proxyAddress': proxyAddresses[0]
-        } as any
-  
-        return addParticipant(conversationSid, participant)
-  
-      } catch(err) {
-        if (err.code === 50416) {
-          const remainingProxyAddresses = proxyAddresses.shift()
-          retryParticipantAdd(conversationSid, participantAddress, remainingProxyAddresses as any)
-        }
-        console.log(err)
-        throw new Error(err)
-      }
-    }
-
-    throw new Error(`No proxy addresses available for ${participantAddress}`)
-  } catch(err) {
-    console.log(err)
-    throw new Error(err)
-  }
-}
-
 export const addParticipantsToConversation = async (conversationSid: string, proxyBindings: ProxyBindings) => {
   const promises = []
-
+  
   for (const [participantAddress, proxyAddresses] of Object.entries(proxyBindings)) {
-
-    try {
-      const participantAttempt = retryParticipantAdd(conversationSid, participantAddress, proxyAddresses)
-      promises.push(participantAttempt)
-    } catch (err) {
-      console.log(err)
-      throw new Error(err)
-    }
+    const participantAttempt = retryAddParticipant(conversationSid, participantAddress, proxyAddresses)
+    promises.push(participantAttempt)
   }
 
   try {

src/utils/generateConferenceName.util.ts

@@ -0,0 +1,3 @@
+export const generateConferenceName = (phoneNumber: string) : string => {
+  return encodeURIComponent(`${phoneNumber}_at_${Date.now()}`)
+}

src/utils/index.ts

@@ -1,4 +1,9 @@
 export * from "./addParticipant.util";
 export * from "./createConversation.util";
 export * from "./deleteConversation.util";
-export * from "./listParticipantConversations.util"
+export * from "./listParticipantConversations.util"
+export * from "./retryAddParticipant.util"
+export * from "./listConversationParticipants.util"
+export * from "./participantsToDial.util"
+export * from "./getConversationByAddressPair.util"
+export * from "./generateConferenceName.util"

src/utils/listConversationParticipants.util.ts

@@ -0,0 +1,25 @@
+import retry from 'async-retry'
+import { ParticipantInstance } from 'twilio/lib/rest/conversations/v1/conversation/participant'
+import client from '../twilioClient'
+
+export const listConversationParticipants = async (conversation: string) : Promise<ParticipantInstance[]> => {
+  return retry(async (quit) => {
+    try {
+      const participants = await client.conversations
+        .conversations(conversation)
+        .participants
+        .list()
+
+      return participants
+    } catch (err) {
+      if (err.status !== 429) {
+        quit(new Error(err));
+        return;
+      }
+
+      console.log('Re-trying on 429 error');
+      throw new Error(err);
+    }
+  })
+
+}

src/utils/participantsToDial.util.ts

@@ -0,0 +1,20 @@
+import { ParticipantInstance } from "twilio/lib/rest/conversations/v1/conversation/participant";
+import { ParticipantToDial } from "../@types/types";
+
+export const participantsToDial = (participants: Array<ParticipantInstance>, from: string) : ParticipantToDial[] => {
+  
+  const output = participants.reduce((result, p) => {
+    if (p.messagingBinding.type === "sms" && p.messagingBinding.address != from) {
+        console.log(`Adding ${p.messagingBinding.address} to list of numbers to dial.\n`)
+  
+        result.push({
+            address: p.messagingBinding.address,
+            proxyAddress: p.messagingBinding.proxy_address
+        })
+    }
+  
+    return result;
+  }, [])
+
+  return output;
+}

src/utils/retryAddParticipant.util.ts

@@ -0,0 +1,29 @@
+import { addParticipant } from "./addParticipant.util"
+
+export const retryAddParticipant = async (conversationSid: string, participantAddress: string, proxyAddresses: Array<string>) => {
+  try {
+    while(proxyAddresses.length > 0) {
+      try {
+        const participant = {
+          'messagingBinding.address': participantAddress,
+          'messagingBinding.proxyAddress': proxyAddresses[0]
+        } as any
+  
+        return addParticipant(conversationSid, participant)
+  
+      } catch(err) {
+        if (err.code === 50416) {
+          const remainingProxyAddresses = proxyAddresses.shift()
+          retryAddParticipant(conversationSid, participantAddress, remainingProxyAddresses as any)
+        }
+        console.log(err)
+        throw new Error(err)
+      }
+    }
+
+    throw new Error(`No proxy addresses available for ${participantAddress}`)
+  } catch(err) {
+    console.log(err)
+    throw new Error(err)
+  }
+}