Clean up code

Author: Edward Banner

functions/zoom-meeting-webhook-handler/index.js

@@ -67,23 +67,25 @@ async function getCallIdFromChannel() {
 }
 
 
-async function addParticipant(user) {
+async function addParticipantToCall(zoomEvent) {
+  const slackUser = toSlackUser(zoomEvent);
   const call_id = await getCallIdFromChannel();
-  await slack.calls.participants.add({ id: call_id, users: [user] });
+  await slack.calls.participants.add({ id: call_id, users: [slackUser] });
 }
 
 
-async function removeParticipant(user) {
+async function removeParticipantFromCall(zoomEvent) {
+  const slackUser = toSlackUser(zoomEvent);
   const call_id = await getCallIdFromChannel();
-  await slack.calls.participants.remove({ id: call_id, users: [user] });
+  await slack.calls.participants.remove({ id: call_id, users: [slackUser] });
 }
 
 
 function toSlackUser(zoomEvent) {
-  const zoomName = zoomEvent?.payload?.object?.participant?.user_name;
+  const zoomDisplayName = zoomEvent?.payload?.object?.participant?.user_name;
   return {
-    external_id: zoomName,
-    display_name: zoomName,
+    external_id: zoomDisplayName,
+    display_name: zoomDisplayName,
   };
 }
 
@@ -100,30 +102,37 @@ async function getActiveParticipants() {
 }
 
 
+async function endCall() {
+  const call_id = await getCallIdFromChannel();
+  await slack.calls.end({ id: call_id });
+}
+
+
 exports.handler = async function(event) {
   if (isSlashCommand(event)) {
+    // FIXME: Check for /co-working-room end
     const call_id = await handleStartCall();
     return { statusCode: 200, body: JSON.stringify(call_id) }
   }
 
   // Zoom webhooks
   const zoomEvent = parseBody(event);
   const zoomEventName = zoomEvent?.event;
+
   if (zoomEventName === "endpoint.url_validation") {
-    return json(200, handleValidation(zoomEvent));
+    return json(200, handleValidation(zoomEvent)); // FIXME: Define `json`
   }
 
   else if (zoomEventName === "meeting.participant_joined") {
-    await addParticipant(toSlackUser(zoomEvent));
+    await addParticipantToCall(zoomEvent);
     return { statusCode: 204 };
   }
 
   else if (zoomEventName === "meeting.participant_left") {
-    await removeParticipant(toSlackUser(zoomEvent));
+    await removeParticipantFromCall(zoomEvent);
     const active = await getActiveParticipants();
     if (active.length === 0) {
-      const call_id = await getCallIdFromChannel();
-      await slack.calls.end({ id: call_id });
+      endCall();
     }
     return { statusCode: 204 };
   }