Pass segmentId to automation processing

backend/src/serverless/microservices/nodejs/automation/workers/newActivityWorker.ts

@@ -126,8 +126,8 @@ export const prepareActivityPayload = (activity: any): any => {
  * @param activityId activity unique ID
  * @param activityData activity data
  */
-export default async (tenantId: string, activityId: string): Promise<void> => {
-  const userContext = await getUserContext(tenantId)
+export default async (tenantId: string, activityId: string, segmentId: string): Promise<void> => {
+  const userContext = await getUserContext(tenantId, null, [segmentId])
 
   try {
     // check if relevant automations exists in this tenant

backend/src/serverless/microservices/nodejs/automation/workers/newMemberWorker.ts

@@ -84,8 +84,8 @@ export const prepareMemberPayload = (member: any): any => {
  * @param memberId tenant member ID
  * @param memberData community member data
  */
-export default async (tenantId: string, memberId?: string): Promise<void> => {
-  const userContext = await getUserContext(tenantId)
+export default async (tenantId: string, memberId: string, segmentId: string): Promise<void> => {
+  const userContext = await getUserContext(tenantId, null, [segmentId])
 
   try {
     // check if relevant automation exists in this tenant

backend/src/serverless/microservices/nodejs/messageTypes.ts

@@ -29,13 +29,19 @@ export type ActivityAutomationData = {
   activityId: string
 }
 
-export type NewActivityAutomationMessage = BaseNodeMicroserviceMessage & ActivityAutomationData
+export type NewActivityAutomationMessage = BaseNodeMicroserviceMessage &
+  ActivityAutomationData & {
+    segmentId: string
+  }
 
 export type MemberAutomationData = {
   memberId: string
 }
 
-export type NewMemberAutomationMessage = BaseNodeMicroserviceMessage & MemberAutomationData
+export type NewMemberAutomationMessage = BaseNodeMicroserviceMessage &
+  MemberAutomationData & {
+    segmentId: string
+  }
 
 export type ProcessAutomationMessage = BaseNodeMicroserviceMessage & {
   automationType: AutomationType

backend/src/serverless/microservices/nodejs/workerFactory.ts

@@ -116,10 +116,18 @@ async function workerFactory(event: NodeMicroserviceMessage): Promise<any> {
       switch (automationRequest.trigger) {
         case AutomationTrigger.NEW_ACTIVITY:
           const newActivityAutomationRequest = event as NewActivityAutomationMessage
-          return newActivityWorker(tenant, newActivityAutomationRequest.activityId)
+          return newActivityWorker(
+            tenant,
+            newActivityAutomationRequest.activityId,
+            newActivityAutomationRequest.segmentId,
+          )
         case AutomationTrigger.NEW_MEMBER:
           const newMemberAutomationRequest = event as NewMemberAutomationMessage
-          return newMemberWorker(tenant, newMemberAutomationRequest.memberId)
+          return newMemberWorker(
+            tenant,
+            newMemberAutomationRequest.memberId,
+            newMemberAutomationRequest.segmentId,
+          )
         default:
           throw new Error(`Invalid automation trigger ${automationRequest.trigger}!`)
       }

backend/src/serverless/utils/nodeWorkerSQS.ts

@@ -84,11 +84,13 @@ export const sendNodeWorkerMessage = async (
 export const sendNewActivityNodeSQSMessage = async (
   tenant: string,
   activityId: string,
+  segmentId: string,
 ): Promise<void> => {
   const payload = {
     type: NodeWorkerMessageType.NODE_MICROSERVICE,
     tenant,
     activityId,
+    segmentId,
     trigger: AutomationTrigger.NEW_ACTIVITY,
     service: 'automation',
   }
@@ -98,11 +100,13 @@ export const sendNewActivityNodeSQSMessage = async (
 export const sendNewMemberNodeSQSMessage = async (
   tenant: string,
   memberId: string,
+  segmentId: string,
 ): Promise<void> => {
   const payload = {
     type: NodeWorkerMessageType.NODE_MICROSERVICE,
     tenant,
     memberId,
+    segmentId,
     trigger: AutomationTrigger.NEW_MEMBER,
     service: 'automation',
   }

backend/src/services/activityService.ts

@@ -179,7 +179,11 @@ export default class ActivityService extends LoggerBase {
 
       if (!existing && fireCrowdWebhooks) {
         try {
-          await sendNewActivityNodeSQSMessage(this.options.currentTenant.id, record.id)
+          await sendNewActivityNodeSQSMessage(
+            this.options.currentTenant.id,
+            record.id,
+            record.segmentId,
+          )
         } catch (err) {
           this.log.error(
             err,

backend/src/services/memberService.ts

@@ -390,7 +390,8 @@ export default class MemberService extends LoggerBase {
 
       if (!existing && fireCrowdWebhooks) {
         try {
-          await sendNewMemberNodeSQSMessage(this.options.currentTenant.id, record.id)
+          const segment = SequelizeRepository.getStrictlySingleActiveSegment(this.options)
+          await sendNewMemberNodeSQSMessage(this.options.currentTenant.id, record.id, segment.id)
         } catch (err) {
           logger.error(err, `Error triggering new member automation - ${record.id}!`)
         }

backend/src/services/segmentService.ts

@@ -384,6 +384,9 @@ export default class SegmentService extends LoggerBase {
   }
 
   static async getTenantActivityTypes(subprojects: any) {
+    if (!subprojects) {
+      return { custom: {}, default: {} }
+    }
     return subprojects.reduce((acc: any, subproject) => {
       const activityTypes = SegmentRepository.buildActivityTypes(subproject)