Merge branch 'next' into sdk_sc_changes

Author: ar2rsawseen

CHANGELOG.md

@@ -7,6 +7,14 @@ Features:
 Enterprise Features:
 - [journey_engine] Editing/Deleting/Duplication of blocks and version management
 
+## Version 25.03.X
+Enterprise fixes:
+- [ab-testing] Fixed bug with variant user filtering
+- [license] Fixed issue with handling invalid date periods
+
+Fixes:
+- [script] Refined delete_custom_events.js to clean up faulty/dead events completely.
+
 ## Version 25.03
 Features:
 - [audit-logs] Exported audit logs from UI now would have "BEFORE" and "AFTER" fields

bin/countly.install_rhel.sh

@@ -50,7 +50,7 @@ cp "$DIR/config/supervisord.example.conf" "$DIR/config/supervisord.conf"
 if [[ "$CENTOS_MAJOR" = "9" ]]; then
     sudo rpm -ivh https://pkgs.sysadmins.ws/el8/base/x86_64/ipa-gothic-fonts-003.03-15.el8.noarch.rpm
 else
-    sudo yum install https://pkgs.sysadmins.ws/el8/base/x86_64/raven-release-1.0-3.el8.noarch.rpm
+    sudo yum install -y https://pkgs.sysadmins.ws/el8/base/x86_64/raven-release-1.0-3.el8.noarch.rpm
     sudo yum install -y ipa-gothic-fonts
 fi
 

bin/scripts/expire-data/delete_custom_events.js

@@ -5,49 +5,75 @@
  *  Command: node delete_custom_events.js
  */
 
-
 const { ObjectId } = require('mongodb');
 const pluginManager = require('../../../plugins/pluginManager.js');
 const common = require('../../../api/utils/common.js');
 const drillCommon = require('../../../plugins/drill/api/common.js');
 
+const DRY_RUN = true;
 const APP_ID = "";
-const EVENTS = []; //If empty, no events will be deleted
+const EVENTS = []; // If empty, no events will be deleted . The format has to be "event1","event2"
 
 Promise.all([pluginManager.dbConnection("countly"), pluginManager.dbConnection("countly_drill")]).then(async function([countlyDb, drillDb]) {
     console.log("Connected to databases...");
 
     //SET COMMON DB AND DRILL DB
     common.db = countlyDb;
     common.drillDb = drillDb;
-
     //GET APP
     try {
         const app = await countlyDb.collection("apps").findOne({_id: ObjectId(APP_ID)}, {_id: 1, name: 1});
         console.log("App:", app.name);
         //GET EVENTS
-        var events = EVENTS;
+        let events = EVENTS;
         if (!events.length) {
-            close("No events to delete");
+            console.log("Fetching events from drill_meta...");
+            const metaEvents = await drillDb.collection("drill_meta").aggregate([
+                {
+                    $match: {
+                        'app_id': app._id + "",
+                        "type": "e",
+                        "e": { $nin: events }
+                    }
+                },
+                {
+                    $group: {
+                        _id: "$e"
+                    }
+                },
+                {
+                    $project: {
+                        _id: 0,
+                        e: "$_id"
+                    }
+                }
+            ]).toArray();
+            events = metaEvents.map(e => e.e);
         }
-        else {
+        console.log("Events to delete:", events);
+        if (DRY_RUN) {
+            console.log("DRY_RUN enabled. No changes will be made.");
+            return close();
+        }
+        if (!events.length) {
+            return close("No events to delete");
+        }
+        try {
             //DELETE EVENTS
-            try {
-                console.log(1 + ") Deleting drill events:");
-                await deleteDrillEvents(app._id, events);
-                console.log(2 + ") Deleting countly events:");
-                await deleteCountlyEvents(app._id, events);
-                console.log(3 + ") Deleting event times:");
-                await deleteEventTimes(app._id, events);
-                console.log(4 + ") Deleting event groups:");
-                await deleteEventGroups(app._id, events);
-                console.log(5 + ") Deleting event keys:");
-                await deleteEventKeys(app._id, events);
-                close();
-            }
-            catch (err) {
-                close(err);
-            }
+            console.log(1 + ") Deleting drill events:");
+            await deleteDrillEvents(app._id, events);
+            console.log(2 + ") Deleting countly events:");
+            await deleteCountlyEvents(app._id, events);
+            console.log(3 + ") Deleting event times:");
+            await deleteEventTimes(app._id, events);
+            console.log(4 + ") Deleting event groups:");
+            await deleteEventGroups(app._id, events);
+            console.log(5 + ") Deleting event keys:");
+            await deleteEventKeys(app._id, events);
+            close();
+        }
+        catch (err) {
+            close(err);
         }
     }
     catch (err) {
@@ -115,4 +141,4 @@ Promise.all([pluginManager.dbConnection("countly"), pluginManager.dbConnection("
         countlyDb.close();
         drillDb.close();
     }
-});
+});

bin/upgrade/24.12/scripts/merge_events_collections.js renamed to bin/upgrade/25.03/scripts/merge_events_collections.js

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VER="24.12"
+VER="25.03"
 
 CONTINUE="$(countly check before upgrade db "$VER")"
 

bin/upgrade/24.12/upgrade.mongo.70.sh renamed to bin/upgrade/25.03/upgrade.mongo.70.sh

@@ -2,7 +2,7 @@
 
 echo "Running filesystem modifications"
 
-VER="24.12"
+VER="25.03"
 
 CONTINUE="$(countly check before upgrade fs "$VER")"