[compare] add event groups

Author: ar2rsawseen

frontend/express/public/javascripts/countly/countly.event.js

@@ -866,6 +866,9 @@
         if (eventMap[mapKey] && eventMap[mapKey].name) {
             return eventMap[mapKey].name;
         }
+        else if (_eventGroups[mapKey] && _eventGroups[mapKey].label) {
+            return _eventGroups[mapKey].label;
+        }
         else {
             return eventKey;
         }

plugins/compare/api/api.js

@@ -37,7 +37,7 @@ var exported = {},
 
             for (var i = 0; i < eventKeysArr.length; i++) {
                 collectionNames.push(
-                    "events" + crypto.createHash('sha1').update(eventKeysArr[i] + params.app_id).digest('hex')
+                    (eventKeysArr[i].startsWith('[CLY]_group_')) ? eventKeysArr[i] : "events" + crypto.createHash('sha1').update(eventKeysArr[i] + params.app_id).digest('hex')
                 );
             }
 
@@ -58,9 +58,16 @@ var exported = {},
         * @param {function} callback - callback method
         **/
         function getEventData(collectionName, callback) {
-            fetch.getTimeObjForEvents(collectionName, params, function(output) {
-                callback(null, output || {});
-            });
+            if (collectionName.startsWith('[CLY]_group_')) {
+                fetch.getMergedEventGroups(params, collectionName, {}, function(output) {
+                    callback(null, output || {});
+                });
+            }
+            else {
+                fetch.getTimeObjForEvents(collectionName, params, function(output) {
+                    callback(null, output || {});
+                });
+            }
         }
 
         return true;