appmixer-fe ISS-3925: support for flowId parameter to trigger app eve…

…nts in a specific flow
clientIO · Mar 11, 2024 · 57e2fd8 · 57e2fd8
1 parent 4cd8234
commit 57e2fd8
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/src/appmixer/utils/appevents/OnAppEvent/OnAppEvent.js b/src/appmixer/utils/appevents/OnAppEvent/OnAppEvent.js
@@ -45,7 +45,7 @@ module.exports = {
             const eventDataExampleJson = JSON.parse(eventDataExample);
             schema = GenerateSchema.json('App Event Data', eventDataExampleJson);
         } catch (err) {
-            context.log({ step: 'Generate output variables from Event Data Example.', err: err.message, eventDataExample });
+            // noop
         }
 
         const output = [

diff --git a/src/appmixer/utils/appevents/plugin.js b/src/appmixer/utils/appevents/plugin.js
@@ -8,7 +8,7 @@ module.exports = async context => {
     const lock = await context.lock('app-events-init');
 
     try {
-        await require('./AppEventTriggerModel')(context).createIndex({ userId: 1, event: 1 });
+        await require('./AppEventTriggerModel')(context).createIndex({ userId: 1, event: 1, flowId: 1 });
     } finally {
         lock.unlock();
     }

diff --git a/src/appmixer/utils/appevents/routes.js b/src/appmixer/utils/appevents/routes.js
@@ -22,15 +22,19 @@ module.exports = (context, options) => {
 
                 const event = req.params.event;
                 const data = req.payload;
+                const query = req.query || {};
                 const user = await context.http.auth.getUser(req);
                 const userId = user.getId();
 
-                const triggers = await AppEventTrigger.find({ event, userId });
+                const triggersQuery = { event, userId };
+                if (query.flowId) {
+                    triggersQuery.flowId = query.flowId;
+                }
+                const triggers = await AppEventTrigger.find(triggersQuery);
                 if (!triggers || !triggers.length) {
                     return { triggers: [] };
                 }
 
-                const query = req.query || {};
                 // Use enqueueOnly=true in query to enqueue message to Appmixer ASAP without waiting
                 // for the entire receive() to finish.
                 query.enqueueOnly = true;