Merge pull request #7171 from Countly/ar2rsawseen/master2

Add app dp breakdown

Author: ar2rsawseen

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

@@ -184,8 +184,16 @@ class StatsJob extends job.Job {
                     utcMoment.subtract(1, 'days');
                 }
 
+                // always create a dedicated array for last 30 days
+                const last30Dates = [];
+                const last30Moment = moment.utc();
+                for (let i = 0; i < 30; i++) {
+                    last30Dates.push(last30Moment.format('YYYY:M:D'));
+                    last30Moment.subtract(1, 'days');
+                }
+
                 const options = {
-                    dailyDates: specificDates,
+                    dailyDates: last30Dates,
                     monthlyBreakdown: true,
                     license_hosting: license?.license_hosting,
                 };
@@ -205,6 +213,47 @@ class StatsJob extends job.Job {
                             user.add_event({key: "DP", count: allData.daily[key], timestamp: timestamp, segmentation: allData.dailybreakdown ? allData.dailybreakdown[key] : {}});
                         }
                     }
+                    // Get all apps
+                    const apps = await db.collection('apps').find({}, {projection: {_id: 1}}).toArray();
+
+                    // For each app, sum DP for last 30 days using allData.dailybreakdown and last30Dates
+                    const appDPs = {};
+                    for (const app of apps) {
+                        appDPs[app._id] = 0;
+                        if (allData.apps && allData.apps[app._id]) {
+                            appDPs[app._id] = allData.apps[app._id];
+                        }
+                    }
+
+                    // Count apps in each DP range
+                    dataMonthly.appsLT10KDP = 0;
+                    dataMonthly.apps10Kto100KDP = 0;
+                    dataMonthly.apps100Kto1MDP = 0;
+                    dataMonthly.apps1Mto10MDP = 0;
+                    dataMonthly.apps10Mto100MDP = 0;
+                    dataMonthly.appsGT100MDP = 0;
+                    for (const appId in appDPs) {
+                        const dp = appDPs[appId];
+                        if (dp < 10000) {
+                            dataMonthly.appsLT10KDP++;
+                        }
+                        else if (dp < 100000) {
+                            dataMonthly.apps10Kto100KDP++;
+                        }
+                        else if (dp < 1000000) {
+                            dataMonthly.apps100Kto1MDP++;
+                        }
+                        else if (dp < 10000000) {
+                            dataMonthly.apps1Mto10MDP++;
+                        }
+                        else if (dp < 100000000) {
+                            dataMonthly.apps10Mto100MDP++;
+                        }
+                        else {
+                            dataMonthly.appsGT100MDP++;
+                        }
+                    }
+
                     user.user_details({'custom': dataMonthly});
                     server.start(function() {
                         server.stop();

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

@@ -253,9 +253,14 @@ function fetchDatapoints(db, filter, options, callback) {
         }
 
         if (options.monthlyBreakdown) {
+            var apps = {};
             const dataPoints = result
                 .reduce((acc, current) => {
                     let dp = (current.e || 0) + (current.s || 0);
+                    var appId = current.a;
+                    if (appId && typeof appId !== "undefined" && appId !== "[CLY]_consolidated" && !apps[appId]) {
+                        apps[appId] = 0;
+                    }
 
                     if (/^\[CLY\]_consolidated/.test(current._id)) {
                         // do not count consolidated dp for countly hosted clients
@@ -309,14 +314,17 @@ function fetchDatapoints(db, filter, options, callback) {
                                             acc.daily[date] = (acc.daily[date] || 0) + (current.d[day][hour].e || 0) + (current.d[day][hour].s || 0);
                                         }
                                     }
+                                    if (typeof apps[appId] !== "undefined") {
+                                        apps[appId] += acc.daily[date];
+                                    }
                                 }
                             }
                         });
                     }
 
                     return acc;
                 }, {});
-
+            dataPoints.apps = apps;
             return callback(dataPoints);
         }