reaction logging refactored

generators/sendgrid_analytics.js

@@ -10,10 +10,30 @@ var bodyParser = require('body-parser')
 // =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 var default_bcc = "open-growth-activity";
 
+// Returns a string of the link name that was clicked in an email
+var getUrlLabel = function ( url ) {
+    var delimiter;
+
+    if ( url.indexOf("&link=") > -1 ) {
+        delimiter = "&";
+    }
+    else if ( url.indexOf("?link=") > -1 ) {
+        delimiter = "?";
+    }
+    else {
+        return "unlabeled";
+    }
+
+    var parameters = url.split(delimiter+"link=")[1];
+    var kv = parameters.split(/&|=/);
+    var link = kv[0];
+    return link;
+}
+
 // =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 // SendGrid
 // =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
-module.exports = function (app) {
+module.exports = function ( app ) {
     // Tell express to use the body-parser middleware
     app.use(bodyParser.json());
 
@@ -28,12 +48,17 @@ module.exports = function (app) {
                 continue;
             }
 
-            actions.push({
+            var formattedAction = {
                 "email"    : action.email,
                 "category" : action.category,
-                "event"    : action.event,
-                "url"      : action.url
-            });
+                "event"    : action.event
+            };
+
+            if ( action.url ) {
+                formattedAction["url"] = getUrlLabel(action.url);
+            }
+
+            actions.push(formattedAction);
         }
 
         if ( actions.length === 0 ) {

handlers/delights.js

@@ -50,7 +50,7 @@ export default request => {
     // such as running ./signals/import.js then
     // we don't need to lookup a customer record
     if (!email) {
-        opengrowth.track.signal( `no-email.${signal}`, message );
+        //opengrowth.track.signal( `no-email.${signal}`, message );
         return opengrowth.signals[signal]( request )
         .then(() => {
             return opengrowth.modules.librato(opengrowth.libratoUpdates);

helpers/tracking.js

@@ -36,6 +36,7 @@ opengrowth.track.delight = ( delight, signal, data ) => {
 // =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 // Track Reactions
 // =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
-opengrowth.track.reaction = (what_goes_here) => {
-    return track(`reactions`);
+opengrowth.track.reaction = ( reaction, data ) => {
+    opengrowth.log(reaction, "reaction", data);
+    return track(`reactions.${reaction}`);
 };

signals/block1day.js

@@ -13,8 +13,7 @@ opengrowth.signals.block1day = ( request, customer ) => {
         blocks_name_array.push(`${block.block_name}`);
         blocks_url_array.push(`https://admin.pubnub.com/#/user/` +
           `${block.user_id}/account/${block.account_id}/app/${block.app_id}` +
-          `/key/${block.app_key_id}/block/${block.block_id}/event_handlers` +
-          `?link=block`);
+          `/key/${block.app_key_id}/block/${block.block_id}/event_handlers`);
     }
 
     let firstName    = opengrowth.customer.getFirstName(customer);

signals/block3day.js

@@ -13,8 +13,7 @@ opengrowth.signals.block3day = ( request, customer ) => {
         blocks_name_array.push(`${block.block_name}`);
         blocks_url_array.push(`https://admin.pubnub.com/#/user/` +
           `${block.user_id}/account/${block.account_id}/app/${block.app_id}` +
-          `/key/${block.app_key_id}/block/${block.block_id}/event_handlers` +
-          `?link=block`);
+          `/key/${block.app_key_id}/block/${block.block_id}/event_handlers`);
     }
 
     let firstName    = opengrowth.customer.getFirstName(customer);

signals/blockexpired.js

@@ -13,8 +13,7 @@ opengrowth.signals.blockexpired = ( request, customer ) => {
         blocks_name_array.push(`${block.block_name}`);
         blocks_url_array.push(`https://admin.pubnub.com/#/user/` +
           `${block.user_id}/account/${block.account_id}/app/${block.app_id}` +
-          `/key/${block.app_key_id}/block/${block.block_id}/event_handlers` +
-          `?link=block`);
+          `/key/${block.app_key_id}/block/${block.block_id}/event_handlers`);
     }
 
     let firstName    = opengrowth.customer.getFirstName(customer);

signals/sendgrid_analytics.js

@@ -1,34 +1,31 @@
 opengrowth.signals.sendgrid_analytics = ( request ) => {
     // Tracks status of an email sent to a customer through SendGrid
     const categoryEvent = ( action ) => {
-        opengrowth.track.signal(`sendgrid_analytics.${action.category}.${action.event}`);
+        opengrowth.track.reaction(`sendgrid_analytics.${action.category}.${action.event}`, "swu-event-webhook");
+        let message = getLogMessage(action);
+        opengrowth.log("sendwithus.email", "reaction", message);
     }
 
     // Tracks a clicked link event in a SendGrid email
     const signalLink = ( action ) => {
-        let link = getUrlParams(action.url);
-        opengrowth.track.signal(`sendgrid_analytics.${action.category}.link.${link}`);
+        opengrowth.track.reaction(`sendgrid_analytics.${action.category}.click.${action.url}`, "swu-event-webhook");
+        let message = getLogMessage(action);
+        opengrowth.log("sendwithus.email", "reaction", message);
     }
 
-    // Returns a string of the link name that was clicked in an email
-    const getUrlParams = ( url ) => {
-        var delimiter;
+    // Parses Reaction data for logs
+    let getLogMessage = ( action ) => {
+        let log = {
+            "contact" : action.email
+        ,   "delight" : "sendwithus.email"
+        ,   "signal"  : action.category
+        ,   "type"    : action.event
+        };
 
-        if ( url.indexOf("&link=") > -1 ) {
-            delimiter = "&";
-        }
-        else if ( url.indexOf("?link=") > -1 ) {
-            delimiter = "?";
-        }
-        else {
-            return "unlabeled";
-        }
+        if ( action.url ) log["message"] = action.url;
 
-        let parameters = url.split(delimiter+"link=")[1];
-        let kv = parameters.split(/&|=/);
-        let link = kv[0];
-        return link;
-    }
+        return log;
+    };
 
     var handlers = {
           "click"             : signalLink

signals/signup.js

@@ -18,7 +18,7 @@ opengrowth.signals.signup = ( request, customer ) => {
                       `?utm_source=EmailBlasts%20&utm_medium=` +
                       `Open-Growth&utm_campaign=` +
                       `EB-CY16-Q4-Open-Growth-01&utm_term=link2` +
-                      `&utm_content=api-keys&signal=signup&link=keys`;
+                      `&utm_content=api-keys`;
 
     var template_data = {
         "customer_first_name" : firstName