wingbot 3.46.0-alpha.6 → 3.46.0-alpha.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wingbot",
-  "version": "3.46.0-alpha.6",
+  "version": "3.46.0-alpha.8",
   "description": "Enterprise Messaging Bot Conversation Engine",
   "main": "index.js",
   "scripts": {

package/src/analytics/onInteractionHandler.js

@@ -97,6 +97,10 @@ const {
  * @prop {string} [action]
  * @prop {string} [snapshot]
  * @prop {string} [botId]
+ * @prop {boolean} [didHandover]
+ * @prop {number|null} [feedback]
+ * @prop {string} [timeZone]
+ * @prop {number} [sessionStart]
  */
 
 /**
@@ -107,7 +111,6 @@ const {
  * @param {SessionMetadata} [metadata]
  * @param {number} [ts]
  * @param {boolean} [nonInteractive]
- * @param {string} [timeZone]
  * @returns {Promise}
  */
 
@@ -121,7 +124,7 @@ const {
  * @param {number} [ts]
  * @param {boolean} [nonInteractive]
  * @param {boolean} [sessionStarted]
- * @param {string} [timeZone]
+ * @param {SessionMetadata} [metadata]
  * @returns {Promise}
  */
 
@@ -260,26 +263,52 @@ function onInteractionHandler (
                 lang
             } = req.state;
 
+            const trackEvents = [];
+
             const [action = noneAction, ...otherActions] = actions;
 
+            const feedbackEvent = events.find((e) => e.type === TrackingType.REPORT
+                && e.category === TrackingCategory.REPORT_FEEDBACK);
+            const feedback = feedbackEvent
+                ? feedbackEvent.value
+                : noneValue;
+            let didHandover = flag === ResponseFlag.HANDOVER;
+            const hasHandoverEvent = events
+                .some((e) => e.category === TrackingCategory.HANDOVER_OCCURRED);
+
+            if (didHandover && !hasHandoverEvent) {
+                trackEvents.push({
+                    type: TrackingType.REPORT,
+                    category: asCategory(TrackingCategory.HANDOVER_OCCURRED),
+                    action: null,
+                    label: null,
+                    value: noneValue
+                });
+            } else if (hasHandoverEvent) {
+                didHandover = true;
+            }
+
+            const metadata = {
+                sessionCount,
+                lang,
+                action,
+                snapshot,
+                botId,
+                didHandover,
+                feedback,
+                timeZone,
+                sessionStart
+            };
+
             let sessionPromise;
             if (createSession) {
-                const metadata = {
-                    sessionCount,
-                    lang,
-                    action,
-                    snapshot,
-                    botId
-                };
-
                 sessionPromise = analyticsStorage.createUserSession(
                     pageId,
                     senderId,
                     sessionId,
                     metadata,
                     timestamp,
-                    nonInteractive,
-                    timeZone
+                    nonInteractive
                 );
 
                 if (!parallelSessionInsert) {
@@ -318,31 +347,7 @@ function onInteractionHandler (
                 winnerTaken = action === winnerAction;
             }
 
-            const trackEvents = [];
-
             const expected = req.expected() ? req.expected().action : '';
-
-            const feedbackEvent = events.find((e) => e.type === TrackingType.REPORT
-                && e.category === TrackingCategory.REPORT_FEEDBACK);
-            const feedback = feedbackEvent
-                ? feedbackEvent.value
-                : noneValue;
-            let didHandover = flag === ResponseFlag.HANDOVER;
-            const hasHandoverEvent = events
-                .some((e) => e.category === TrackingCategory.HANDOVER_OCCURRED);
-
-            if (didHandover && !hasHandoverEvent) {
-                trackEvents.push({
-                    type: TrackingType.REPORT,
-                    category: asCategory(TrackingCategory.HANDOVER_OCCURRED),
-                    action: null,
-                    label: null,
-                    value: noneValue
-                });
-            } else if (hasHandoverEvent) {
-                didHandover = true;
-            }
-
             const user = userExtractor(req.state);
 
             const isContextUpdate = req.isSetContext();
@@ -409,11 +414,8 @@ function onInteractionHandler (
                 prevAction: lastAction,
                 skill: useSkill,
                 isGoto: false,
-                sessionStart,
                 sessionDuration: timestamp - sessionStart,
                 withUser,
-                snapshot,
-                botId,
                 ...langsExtension,
                 ...(hasExtendedEvents ? {} : actionMeta)
             });
@@ -433,10 +435,7 @@ function onInteractionHandler (
                         prevAction,
                         skill: useSkill,
                         isGoto: true,
-                        sessionStart,
                         sessionDuration: timestamp - sessionStart,
-                        snapshot,
-                        botId,
                         ...langsExtension
                     };
 
@@ -455,7 +454,6 @@ function onInteractionHandler (
                     action: eventAction,
                     label,
                     value: eVal,
-                    sessionStart,
                     ...langsExtension
                 }))
             );
@@ -472,7 +470,6 @@ function onInteractionHandler (
                         action,
                         label: text,
                         value: score >= ai.confidence ? 0 : 1,
-                        sessionStart,
                         ...langsExtension
                     });
                 }
@@ -520,7 +517,6 @@ function onInteractionHandler (
                     action,
                     label,
                     value,
-                    sessionStart,
                     ...langsExtension
                 });
             }
@@ -536,7 +532,7 @@ function onInteractionHandler (
                     timestamp,
                     nonInteractive,
                     createSession,
-                    timeZone
+                    metadata
                 ),
                 sessionPromise
             ]);