Add new automations triggering rules to automations worker (#1879)

Co-authored-by: Loïc Saint-Roch <loicsaintroch@users.noreply.github.com>
CrowdDotDev · Nov 24, 2023 · d5cc9b4 · d5cc9b4
1 parent 67b3511
commit d5cc9b4
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 20 deletions.
diff --git a/services/apps/automations_worker/src/repos/automation.repo.ts b/services/apps/automations_worker/src/repos/automation.repo.ts
@@ -17,6 +17,7 @@ export interface IRelevantAutomationData {
   settings: AutomationSettings
   trigger: AutomationTrigger
   slackWebHook: string | null
+  createdAt: string
 }
 
 export interface IDbAutomationExecutionInsertData {
@@ -91,7 +92,8 @@ export class AutomationRepository extends RepositoryBase<AutomationRepository> {
              a.type, 
              a.trigger, 
              a.settings,
-             s."slackWebHook"
+             s."slackWebHook",
+             a."createdAt"
       from automations a 
         inner join settings s on s."tenantId" = a."tenantId"
       where a."tenantId" = $(tenantId) and a.trigger = $(trigger) and a.state = $(state)

diff --git a/services/apps/automations_worker/src/repos/types.ts b/services/apps/automations_worker/src/repos/types.ts
@@ -13,6 +13,8 @@ export interface IMemberData {
 
   lastActivityId: string
   lastActivity: IActivityData
+
+  joinedAt: string
 }
 
 export interface IActivityData {
@@ -21,6 +23,7 @@ export interface IActivityData {
   platform: string
   attributes: any
   body: string
+  timestamp: string
 
   // a bunch more but we just passing them as the payload - not needed here for now
 

diff --git a/services/apps/automations_worker/src/services/automation.service.ts b/services/apps/automations_worker/src/services/automation.service.ts
@@ -43,10 +43,18 @@ export class AutomationService {
   ): Promise<boolean> {
     const settings = automation.settings as NewMemberSettings
 
-    let process = true
+    let shouldProcess = true
+
+    // check if member joined after automation was created
+    if (new Date(automation.createdAt) > new Date(member.joinedAt)) {
+      this.log.warn(
+        `Ignoring automation ${automation.id} - Member ${member.id} joined before automation!`,
+      )
+      shouldProcess = false
+    }
 
     // check whether member platforms matches
-    if (settings.platforms && settings.platforms.length > 0) {
+    if (shouldProcess && settings.platforms && settings.platforms.length > 0) {
       const platforms = Object.keys(member.username)
       if (!platforms.some((platform) => settings.platforms.includes(platform))) {
         this.log.warn(
@@ -56,11 +64,11 @@ export class AutomationService {
             ', ',
           )}]`,
         )
-        process = false
+        shouldProcess = false
       }
     }
 
-    if (process) {
+    if (shouldProcess) {
       const hasAlreadyBeenTriggered = await this.automationRepo.hasAlreadyBeenTriggered(
         automation.id,
         member.id,
@@ -69,11 +77,11 @@ export class AutomationService {
         this.log.warn(
           `Ignoring automation ${automation.id} - Member ${member.id} was already processed!`,
         )
-        process = false
+        shouldProcess = false
       }
     }
 
-    return process
+    return shouldProcess
   }
 
   async shouldProcessActivity(
@@ -82,65 +90,73 @@ export class AutomationService {
   ): Promise<boolean> {
     const settings = automation.settings as NewActivitySettings
 
-    let process = true
+    let shouldProcess = true
+
+    // check if activity created after automation was created
+    if (new Date(automation.createdAt) > new Date(activity.timestamp)) {
+      this.log.warn(
+        `Ignoring automation ${automation.id} - Activity ${activity.id} was created before automation!`,
+      )
+      shouldProcess = false
+    }
 
     // check whether activity type matches
-    if (settings.types && settings.types.length > 0) {
+    if (shouldProcess && settings.types && settings.types.length > 0) {
       if (!settings.types.includes(activity.type)) {
         this.log.warn(
           `Ignoring automation ${automation.id} - Activity ${activity.id} type '${
             activity.type
           }' does not match automation setting types: [${settings.types.join(', ')}]`,
         )
-        process = false
+        shouldProcess = false
       }
     }
 
     // check whether activity platform matches
-    if (process && settings.platforms && settings.platforms.length > 0) {
+    if (shouldProcess && settings.platforms && settings.platforms.length > 0) {
       if (!settings.platforms.includes(activity.platform)) {
         this.log.warn(
           `Ignoring automation ${automation.id} - Activity ${activity.id} platform '${
             activity.platform
           }' does not match automation setting platforms: [${settings.platforms.join(', ')}]`,
         )
-        process = false
+        shouldProcess = false
       }
     }
 
     // check whether activity content contains any of the keywords
-    if (process && settings.keywords && settings.keywords.length > 0) {
+    if (shouldProcess && settings.keywords && settings.keywords.length > 0) {
       const body = (activity.body as string).toLowerCase()
       if (!settings.keywords.some((keyword) => body.includes(keyword.trim().toLowerCase()))) {
         this.log.warn(
           `Ignoring automation ${automation.id} - Activity ${
             activity.id
           } content does not match automation setting keywords: [${settings.keywords.join(', ')}]`,
         )
-        process = false
+        shouldProcess = false
       }
     }
 
     if (
-      process &&
+      shouldProcess &&
       !settings.teamMemberActivities &&
       activity.member.attributes.isTeamMember &&
       activity.member.attributes.isTeamMember.default
     ) {
       this.log.warn(
         `Ignoring automation ${automation.id} - Activity ${activity.id} belongs to a team member!`,
       )
-      process = false
+      shouldProcess = false
     }
 
     if (activity?.member?.attributes?.isBot && activity?.member?.attributes?.isBot.default) {
       this.log.warn(
         `Ignoring automation ${automation.id} - Activity ${activity.id} belongs to a bot, cannot be processed automaticaly!`,
       )
-      process = false
+      shouldProcess = false
     }
 
-    if (process) {
+    if (shouldProcess) {
       const hasAlreadyBeenTriggered = await this.automationRepo.hasAlreadyBeenTriggered(
         automation.id,
         activity.id,
@@ -149,11 +165,11 @@ export class AutomationService {
         this.log.warn(
           `Ignoring automation ${automation.id} - Activity ${activity.id} was already processed!`,
         )
-        process = false
+        shouldProcess = false
       }
     }
 
-    return process
+    return shouldProcess
   }
 
   /**