CHI-3946-productionise_backend

lambdas/account-scoped/src/channelCapture/channelCaptureHandlers.ts

@@ -23,6 +23,7 @@ import { Twilio } from 'twilio';
 import { ROUTE_PREFIX } from '../router';
 import { AccountSID } from '@tech-matters/twilio-types';
 import { savePostSurvey } from '../hrm/savePostSurvey';
+import { ChannelType } from '@tech-matters/twilio-types';
 
 const triggerTypes = ['withUserMessage', 'withNextMessage'] as const;
 export type TriggerTypes = (typeof triggerTypes)[number];
@@ -43,7 +44,7 @@ export type CapturedChannelAttributes = {
   releaseFlag?: string;
   chatbotCallbackWebhookSid: string;
   isConversation: boolean;
-  channelType: string;
+  channelType: ChannelType;
 };
 
 export const isChatCaptureControlTask = (taskAttributes: {
@@ -154,7 +155,7 @@ type CaptureChannelOptions = {
   memoryAttribute?: string; // where in the task attributes we want to save the bot's memory (allows compatibility for multiple bots)
   releaseFlag?: string; // the flag we want to set true when the channel is released
   isConversation: boolean;
-  channelType: string;
+  channelType: ChannelType;
   webhookBaseUrl: string;
 };
 
@@ -357,7 +358,7 @@ export type HandleChannelCaptureParams = (
   releaseFlag?: string; // The flag we want to set true in the channel attributes when the channel is released
   additionControlTaskAttributes?: string; // Optional attributes to include in the control task, in the string representation of a JSON
   controlTaskTTL?: number;
-  channelType: string;
+  channelType: ChannelType;
   twilioWorkspaceSid: string;
   chatServiceSid: string;
   surveyWorkflowSid: string;

lambdas/account-scoped/src/channelCapture/postSurveyListener.ts

@@ -18,7 +18,7 @@ import {
   registerTaskRouterEventHandler,
   TaskRouterEventHandler,
 } from '../taskrouter/taskrouterEventHandler';
-import { AccountSID } from '@tech-matters/twilio-types';
+import { AccountSID, ChannelType } from '@tech-matters/twilio-types';
 import { Twilio } from 'twilio';
 import { EventType, TASK_WRAPUP } from '../taskrouter/eventTypes';
 import { EventFields } from '../taskrouter';
@@ -96,7 +96,7 @@ const postSurveyInitHandler = async ({
   client: Twilio;
   taskSid: string;
   taskLanguage: string;
-  channelType: string;
+  channelType: ChannelType;
   environment: string;
   webhookBaseUrl: string;
   chatServiceSid: string;

lambdas/account-scoped/src/conversation/createConversation.ts

@@ -15,14 +15,18 @@
  */
 
 import { Twilio } from 'twilio';
-import { ConversationSID } from '@tech-matters/twilio-types';
-import { AseloCustomChannel } from '../customChannels/aseloCustomChannels';
+import {
+  AseloCustomChannelType,
+  ChannelType,
+  channelTypes,
+  ConversationSID,
+} from '@tech-matters/twilio-types';
 import { newErr, newOk, Result } from '../Result';
 
 const CONVERSATION_CLOSE_TIMEOUT = 'P3D'; // ISO 8601 duration format https://en.wikipedia.org/wiki/ISO_8601
 export type CreateFlexConversationParams = {
   studioFlowSid: string;
-  channelType: AseloCustomChannel | 'web'; // The chat channel being used
+  channelType: ChannelType & (AseloCustomChannelType | typeof channelTypes.WEB); // The chat channel being used
   uniqueUserName: string; // Unique identifier for this user
   senderScreenName: string; // Friendly info to show in the Flex UI (like Telegram handle)
   onMessageAddedWebhookUrl?: string; // The url that must be used as the onMessageSent event webhook.

lambdas/account-scoped/src/conversation/getExternalRecordingS3Location.ts

@@ -20,16 +20,13 @@ import { newErr, newOk } from '../Result';
 import { getTwilioClient, getDocsBucketName } from '@tech-matters/twilio-configuration';
 import { newMissingParameterResult } from '../httpErrors';
 
-export const getExternalRecordingS3LocationHandler: FlexValidatedHandler = async (
-  { body: event },
-  accountSid: AccountSID,
-) => {
-  const { callSid } = event as { callSid?: string };
-
-  if (!callSid) {
-    return newMissingParameterResult('callSid');
-  }
-
+export const getExternalRecordingS3Location = async ({
+  callSid,
+  accountSid,
+}: {
+  callSid: string;
+  accountSid: AccountSID;
+}) => {
   try {
     const client = await getTwilioClient(accountSid);
     const bucket = await getDocsBucketName(accountSid);
@@ -56,3 +53,16 @@ export const getExternalRecordingS3LocationHandler: FlexValidatedHandler = async
     return newErr({ message: err.message, error: { statusCode: 500, cause: err } });
   }
 };
+
+export const getExternalRecordingS3LocationHandler: FlexValidatedHandler = async (
+  { body: event },
+  accountSid: AccountSID,
+) => {
+  const { callSid } = event as { callSid?: string };
+
+  if (!callSid) {
+    return newMissingParameterResult('callSid');
+  }
+
+  return getExternalRecordingS3Location({ accountSid, callSid });
+};

lambdas/account-scoped/src/conversation/janitorTaskRouterListener.ts

@@ -33,10 +33,10 @@ import { retrieveFeatureFlags } from '../configuration/aseloConfiguration';
 import { chatChannelJanitor } from './chatChannelJanitor';
 import { hasTaskControl } from '../transfer/hasTaskControl';
 import { isChatCaptureControlTask } from '../channelCapture/channelCaptureHandlers';
-import { isAseloCustomChannel } from '../customChannels/aseloCustomChannels';
 import { getWorkspaceSid } from '@tech-matters/twilio-configuration';
 import { ChatChannelSID, ConversationSID } from '@tech-matters/twilio-types';
 import { getCurrentDefinitionVersion } from '../hrm/formDefinitionsCache';
+import { ChannelType, isAseloCustomChannelType } from '@tech-matters/twilio-types';
 
 const isCleanupBotCapture = (
   eventType: EventType,
@@ -71,8 +71,8 @@ const isCleanupCustomChannel = async (
   workspaceSid: string,
   taskSid: string,
   taskAttributes: {
-    channelType?: string;
-    customChannelType?: string;
+    channelType?: ChannelType;
+    customChannelType?: ChannelType;
     isChatCaptureControl?: boolean;
   },
 ) => {
@@ -84,7 +84,7 @@ const isCleanupCustomChannel = async (
     return false;
   }
 
-  return isAseloCustomChannel(
+  return isAseloCustomChannelType(
     taskAttributes.customChannelType || taskAttributes.channelType,
   );
 };

lambdas/account-scoped/src/customChannels/configuration.ts

@@ -14,9 +14,12 @@
  * along with this program.  If not, see https://www.gnu.org/licenses/.
  */
 
-import { AccountSID } from '@tech-matters/twilio-types';
+import {
+  AccountSID,
+  AseloCustomChannelType,
+  ChannelType,
+} from '@tech-matters/twilio-types';
 import { getSsmParameter, SsmParameterNotFound } from '@tech-matters/ssm-cache';
-import { AseloCustomChannel } from './customChannelToFlex';
 import { retrieveServiceConfigurationAttributes } from '../configuration/aseloConfiguration';
 import { getTwilioClient } from '@tech-matters/twilio-configuration';
 
@@ -89,7 +92,7 @@ export const getFacebookAppSecret = (): Promise<string> =>
 
 export const getChannelStudioFlowSid = (
   accountSid: AccountSID,
-  channelName: AseloCustomChannel | 'chat',
+  channelName: ChannelType & (AseloCustomChannelType | 'chat'),
 ): Promise<string> =>
   getSsmParameter(
     `/${process.env.NODE_ENV}/twilio/${accountSid}/${channelName}_studio_flow_sid`,

lambdas/account-scoped/src/customChannels/customChannelToFlex.ts

@@ -78,8 +78,6 @@ export const removeConversation = async (
   },
 ) => client.conversations.v1.conversations.get(conversationSid).remove();
 
-export { AseloCustomChannel, isAseloCustomChannel } from './aseloCustomChannels';
-
 type SendConversationMessageToFlexParams = Omit<
   CreateFlexConversationParams,
   'twilioNumber'

lambdas/account-scoped/src/customChannels/instagram/instagramToFlex.ts

@@ -19,13 +19,13 @@
 import '@twilio-labs/serverless-runtime-types';
 import crypto from 'crypto';
 import {
-  AseloCustomChannel,
   findExistingConversation,
   sendConversationMessageToFlex,
 } from '../customChannelToFlex';
 import { AccountScopedHandler, HttpRequest } from '../../httpTypes';
 import {
   AccountSID,
+  aseloCustomChannelTypes,
   ConversationSID,
   InstagramMessageEvent,
   InstagramMessageObject,
@@ -117,15 +117,15 @@ export const instagramToFlexHandler: AccountScopedHandler = async (
   const senderExternalId = sender.id;
   const messageExternalId = message.mid;
   const subscribedExternalId = event.entry[0].id;
-  const channelType = AseloCustomChannel.Instagram;
+  const channelType = aseloCustomChannelTypes.INSTAGRAM;
   const chatFriendlyName = `${channelType}:${senderExternalId}`;
   const uniqueUserName = `${channelType}:${senderExternalId}`;
   const senderScreenName = senderExternalId; // TODO: see if we can use ig handle somehow
   const messageAttributes = JSON.stringify({ messageExternalId });
   const onMessageSentWebhookUrl = `${process.env.WEBHOOK_BASE_URL}/lambda/twilio/account-scoped/${accountSid}/customChannels/instagram/flexToInstagram?recipientId=${senderExternalId}`;
   const studioFlowSid = await getChannelStudioFlowSid(
     accountSid,
-    AseloCustomChannel.Instagram,
+    aseloCustomChannelTypes.INSTAGRAM,
   );
   let result;
   if (isInstagramStoryReply(message)) {

lambdas/account-scoped/src/customChannels/line/lineToFlex.ts

@@ -15,11 +15,8 @@
  */
 
 import crypto from 'crypto';
-import { AccountSID } from '@tech-matters/twilio-types';
-import {
-  AseloCustomChannel,
-  sendConversationMessageToFlex,
-} from '../customChannelToFlex';
+import { AccountSID, aseloCustomChannelTypes } from '@tech-matters/twilio-types';
+import { sendConversationMessageToFlex } from '../customChannelToFlex';
 import { AccountScopedHandler, HttpRequest } from '../../httpTypes';
 import { newErr, newOk } from '../../Result';
 import { getChannelStudioFlowSid, getLineChannelSecret } from '../configuration';
@@ -125,13 +122,13 @@ export const lineToFlexHandler: AccountScopedHandler = async (
 
   const studioFlowSid = await getChannelStudioFlowSid(
     accountSid,
-    AseloCustomChannel.Line,
+    aseloCustomChannelTypes.LINE,
   );
   const responses: any[] = [];
 
   for (const messageEvent of messageEvents) {
     const messageText = messageEvent.message.text;
-    const channelType = AseloCustomChannel.Line;
+    const channelType = aseloCustomChannelTypes.LINE;
     const subscribedExternalId = destination; // AseloChat ID on Line
     const senderExternalId = messageEvent.source.userId; // The child ID on Line
     const chatFriendlyName = `${channelType}:${senderExternalId}`;

lambdas/account-scoped/src/customChannels/modica/modicaToFlex.ts

@@ -14,11 +14,8 @@
  * along with this program.  If not, see https://www.gnu.org/licenses/.
  */
 
-import { AccountSID } from '@tech-matters/twilio-types';
-import {
-  AseloCustomChannel,
-  sendConversationMessageToFlex,
-} from '../customChannelToFlex';
+import { AccountSID, aseloCustomChannelTypes } from '@tech-matters/twilio-types';
+import { sendConversationMessageToFlex } from '../customChannelToFlex';
 import { AccountScopedHandler, HttpRequest } from '../../httpTypes';
 import { newErr, newOk } from '../../Result';
 import { getChannelStudioFlowSid } from '../configuration';
@@ -41,7 +38,7 @@ export const modicaToFlexHandler: AccountScopedHandler = async (
   const { source, destination, content } = event;
 
   const messageText = content;
-  const channelType = AseloCustomChannel.Modica;
+  const channelType = aseloCustomChannelTypes.MODICA;
   const subscribedExternalId = destination; // The helpline short code
   const senderExternalId = source; // The child phone number
   const chatFriendlyName = senderExternalId;
@@ -50,7 +47,7 @@ export const modicaToFlexHandler: AccountScopedHandler = async (
   const onMessageSentWebhookUrl = `${process.env.WEBHOOK_BASE_URL}/lambda/twilio/account-scoped/${accountSid}/customChannels/modica/flexToModica?recipientId=${senderExternalId}`;
   const studioFlowSid = await getChannelStudioFlowSid(
     accountSid,
-    AseloCustomChannel.Modica,
+    aseloCustomChannelTypes.MODICA,
   );
   console.debug(
     'ModicaToFlex: sending message from',

lambdas/account-scoped/src/customChannels/telegram/telegramToFlex.ts

@@ -14,11 +14,8 @@
  * along with this program.  If not, see https://www.gnu.org/licenses/.
  */
 
-import { AccountSID } from '@tech-matters/twilio-types';
-import {
-  AseloCustomChannel,
-  sendConversationMessageToFlex,
-} from '../customChannelToFlex';
+import { AccountSID, aseloCustomChannelTypes } from '@tech-matters/twilio-types';
+import { sendConversationMessageToFlex } from '../customChannelToFlex';
 import { AccountScopedHandler, HttpRequest } from '../../httpTypes';
 import { newErr, newOk } from '../../Result';
 import { getChannelStudioFlowSid, getTelegramBotApiSecretToken } from '../configuration';
@@ -61,14 +58,14 @@ export const telegramToFlexHandler: AccountScopedHandler = async (
     chat: { id: senderExternalId, username, first_name: firstName },
   } = event.message;
 
-  const channelType = AseloCustomChannel.Telegram;
+  const channelType = aseloCustomChannelTypes.TELEGRAM;
   const chatFriendlyName = username || `${channelType}:${senderExternalId}`;
   const uniqueUserName = `${channelType}:${senderExternalId}`;
   const senderScreenName = firstName || username || 'child';
   const onMessageAddedWebhookUrl = `${process.env.WEBHOOK_BASE_URL}/lambda/twilio/account-scoped/${accountSid}/customChannels/telegram/flexToTelegram?recipientId=${senderExternalId}`;
   const studioFlowSid = await getChannelStudioFlowSid(
     accountSid,
-    AseloCustomChannel.Telegram,
+    aseloCustomChannelTypes.TELEGRAM,
   );
   console.debug(
     'TelegramToFlex: sending message from',