Merge pull request #6744 from Countly/master-to-next

Master to next

Author: ArtursKadikis

CHANGELOG.md

@@ -2,6 +2,18 @@
 Dependencies:
 - Remove SQLite
 
+## Version 25.03.X
+Fixes:
+- [alerts] Fix: Migrate alerts to the new events model
+- [oidc] Fix for session state storage
+- [applications] Persist newly created app after page reload
+
+Enterprise Fixes:
+- [users] Update user custom field number formatting
+- [users] Fix condition for custom property update
+- [drill] [survey] Fix duplicate question id
+- [drill] [survey] Display survey answer value instead of id in drill result
+
 ## Version 25.03.21
 Fixes:
 - [feedback] Prevent showing the application when switching between the NPS and Survey pages

frontend/express/public/core/app-management/javascripts/countly.views.js

@@ -394,6 +394,7 @@
                                 });
                                 self.$store.dispatch("countlyCommon/addToAllApps", data);
                                 self.$store.dispatch("countlyCommon/updateActiveApp", data._id + "");
+                                countlyCommon.setActiveApp(data._id);
                                 if (self.firstApp) {
                                     countlyCommon.ACTIVE_APP_ID = data._id + "";
                                     app.onAppManagementSwitch(data._id + "", data && data.type || "mobile");
@@ -892,4 +893,4 @@
             return countlyGlobal.timezones;
         }
     };
-})();
+})();

plugins/alerts/api/alertModules/events.js

@@ -2,7 +2,6 @@
  * @typedef {import('../parts/common-lib.js').App} App
  */
 
-const crypto = require('crypto');
 const log = require('../../../../api/utils/log.js')('alert:events');
 const moment = require('moment-timezone');
 const common = require('../../../../api/utils/common.js');
@@ -101,14 +100,10 @@ async function getEventMetricByDate(app, event, metric, date, period, segments)
     if (segments) {
         segmentKeys = Object.keys(segments);
     }
-
-    const collectionName = "events" + crypto
-        .createHash('sha1')
-        .update(event + app._id.toString())
-        .digest('hex');
-
-    const records = await common.db.collection(collectionName)
+    const records = await common.db.collection("events_data")
         .find({
+            a: app._id.toString(),
+            e: event,
             m: monthFilter,
             s: { $in: segmentKeys },
         })
@@ -162,11 +157,13 @@ async function getEventMetricByDate(app, event, metric, date, period, segments)
 }
 /*
 (async function() {
+    if (!require("cluster").isPrimary) {
+        return;
+    }
     await new Promise(res => setTimeout(res, 2000));
-    const app = { _id: "65c1f875a12e98a328d5eb9e", timezone: "Europe/Istanbul" };
-    const date = new Date("2024-01-02T12:47:19.247Z");
-    const date2 = new Date("2024-01-03T13:47:19.247Z");
-    const event = "Checkout";
+    const app = { _id: "67fff00d901abe2f8cc57646", timezone: "Europe/Istanbul" };
+    const date = new Date("2025-02-02T12:47:19.247Z");
+    const event = "Product Viewed";
     const prop = "c";
 
     const hourly = await getEventMetricByDate(app, event, prop, date, "hourly");

plugins/alerts/api/alertModules/rating.js

@@ -2,7 +2,6 @@
  * @typedef {import('../parts/common-lib.js').App} App
  */
 
-const crypto = require('crypto');
 const log = require('../../../../api/utils/log.js')('alert:rating');
 const moment = require('moment-timezone');
 const common = require('../../../../api/utils/common.js');
@@ -111,14 +110,13 @@ module.exports.check = async function({ alertConfigs: alert, done, scheduledTo:
 async function getRatingResponsesByDate(app, widgetId, date, period, ratings) {
     const { years } = commonLib.getDateComponents(date, app.timezone);
     const eventName = "[CLY]_star_rating";
-    const collectionName = "events" + crypto
-        .createHash('sha1')
-        .update(eventName + app._id.toString())
-        .digest('hex');
-
     // find all segment values:
-    const records = await common.db.collection(collectionName)
-        .find({ m: String(years) + ":0" })
+    const records = await common.db.collection("events_data")
+        .find({
+            a: app._id.toString(),
+            e: eventName,
+            m: String(years) + ":0",
+        })
         .toArray();
     const segmentValueSet = new Set;
     for (const record of records) {
@@ -154,10 +152,13 @@ async function getRatingResponsesByDate(app, widgetId, date, period, ratings) {
 
 /*
 (async function() {
+    if (!require("cluster").isPrimary) {
+        return;
+    }
     await new Promise(res => setTimeout(res, 2000));
-    const app = { _id: ObjectId("65c1f875a12e98a328d5eb9e"), timezone: "Europe/Istanbul" };
-    const date = new Date("2024-02-07T12:00:00.000Z");
-    const widgetId = "65c383fbb46a4d172d7c58e1";
+    const app = { _id: new ObjectId("68ca8d133bded4a5d888bb45"), timezone: "Europe/Istanbul" };
+    const date = new Date("2025-09-29T12:47:19.247Z");
+    const widgetId = "68ca8d133bded4a5d888bb4a";
     let monthlyData = await getRatingResponsesByDate(app, widgetId, date, "monthly", [1, 2, 3, 4, 5]);
     let dailyData = await getRatingResponsesByDate(app, widgetId, date, "daily");
     console.log(monthlyData, dailyData);