Fixes event type rule constraints registering as user constraints (#168)

* Fixes event type rule constraints registering as user constraints * Proactively abort if already sent
parcelvoy · May 21, 2023 · 4cdf8c1 · 4cdf8c1
1 parent 8400ea3
commit 4cdf8c1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/apps/platform/src/providers/MessageTriggerService.ts b/apps/platform/src/providers/MessageTriggerService.ts
@@ -32,8 +32,9 @@ export async function loadSendJob<T extends TemplateType>({ campaign_id, user_id
     // If user or project is deleted, abort and discard job
     if (!user || !project) return
 
-    // If there is a send and it's in an aborted state, abort
-    if (send && send.state === 'aborted') return
+    // If there is a send and it's in an aborted state or has already
+    // sent, abort this job to prevent duplicate sends
+    if (send && (send.state === 'aborted' || send.state === 'sent')) return
 
     // Fetch campaign and templates
     const campaign = await Campaign.find(campaign_id)

diff --git a/apps/ui/src/views/users/RuleBuilder.tsx b/apps/ui/src/views/users/RuleBuilder.tsx
@@ -41,7 +41,7 @@ const RuleSet = ({ group, onChange, onDelete }: RuleSetParams) => {
             children: [...group.children ?? [], {
                 path: '',
                 type: 'string',
-                group: 'user',
+                group: group.group,
                 value: null,
                 operator: '=',
             }],