Merge branch 'master' into SER-2545-Pausing-Journey-should-empty-the-content-queue-for-that-journey

Author: coskunaydinoglu

CHANGELOG.md

@@ -1,12 +1,16 @@
 ## Version 25.03.XX
+Fixes:
+- [server-stats] Fix breakdown event calculation
+
 Enterprise Fixes:
+- [journeys] Update skip threshold when journeys are paused
 - [journeys] fix for clearing content queue when journey is paused
 
 ## Version 25.03.17
 Enterprise Fixes:
 - [ldap] Recursive user search in ldap added
 - [license] Update metric endpoint permission
-  
+
 Dependencies:
 - Bump puppeteer from 24.16.2 to 24.17.0
 

plugins/server-stats/api/parts/stats.js

@@ -128,8 +128,8 @@ function increaseDataPoints(object, data) {
     object.ratings += (data.str || 0);
     object.apm += (data.apm || 0);
     object.custom += (data.ce || 0);
-    object.cs = (data.cs || 0);
-    object.ps = (data.ps || 0);
+    object.cs += (data.cs || 0);
+    object.ps += (data.ps || 0);
     if (data.dp) {
         object.dp += data.dp;
     }
@@ -241,7 +241,7 @@ function fetchDatapoints(db, filter, options, callback) {
     options.dateObjPrev = options.dateObjPrev || {};
     db.collection("server_stats_data_points").find(filter, {}).toArray(function(err, result) {
         var toReturn = {
-            "all-apps": {"events": 0, "sessions": 0, "push": 0, "dp": 0, "change": 0, "crash": 0, "views": 0, "actions": 0, "nps": 0, "surveys": 0, "ratings": 0, "apm": 0, "custom": 0},
+            "all-apps": {"events": 0, "sessions": 0, "push": 0, "dp": 0, "change": 0, "crash": 0, "views": 0, "actions": 0, "nps": 0, "surveys": 0, "ratings": 0, "apm": 0, "custom": 0, cs: 0, ps: 0},
         };
 
         if (err || !result) {
@@ -280,7 +280,7 @@ function fetchDatapoints(db, filter, options, callback) {
 
         for (let i = 0; i < result.length; i++) {
             if (!toReturn[result[i].a]) {
-                toReturn[result[i].a] = {"events": 0, "sessions": 0, "push": 0, "dp": 0, "change": 0, "crash": 0, "views": 0, "actions": 0, "nps": 0, "surveys": 0, "ratings": 0, "apm": 0, "custom": 0};
+                toReturn[result[i].a] = {"events": 0, "sessions": 0, "push": 0, "dp": 0, "change": 0, "crash": 0, "views": 0, "actions": 0, "nps": 0, "surveys": 0, "ratings": 0, "apm": 0, "custom": 0, cs: 0, ps: 0};
             }
             const dates = result[i].d;
             if (options.dateObj[result[i].m]) {