Merge branch 'master' into content-builder-improvement-and-fixes

Author: can-angun

CHANGELOG.md

@@ -1,16 +1,20 @@
-## Version 25.03.XX
+## Version 25.03.24
+Fixes:
+- [jobs] Fix condition for scheduling alert job
+
 Enterprise Fixes:
 - [compliance-hub] Fixed query patterns
-- [data-manager] Fixed segment data deletion
 - [data-manager] Fixed bug preventing transformation of events ending in a dot
+- [data-manager] Fixed segment data deletion
+- [license] Stop sending metric after license expired
 - [users] Fix add/remove user to profile group
 - [users] Remove link to profile group page after removing user from group
 
 Dependencies
-- Bump lint-staged from 16.2.3 to 16.2.4
 - Bump @faker-js/faker from 10.0.0 to 10.1.0 in /ui-tests
-- Bump puppeteer from 24.23.0 to 24.24.1
 - Bump countly-sdk-nodejs from 24.10.2 to 24.10.3
+- Bump lint-staged from 16.2.3 to 16.2.4
+- Bump puppeteer from 24.23.0 to 24.24.1
 
 ## Version 25.03.23
 Fixes:

api/parts/jobs/job.js

@@ -254,32 +254,33 @@ class Job extends EventEmitter {
 
             this._json.next = next.getTime();
         }
-        if (this.name !== "alerts:monitor") {
-            //check if any job already scheduled or running
-            let query = {
-                status: {"$in": [STATUS.SCHEDULED, STATUS.RUNNING]},
-                name: this.name,
-            };
-            if (this._id) {
-                query._id = {$ne: this._id};
-            }
-            var self = this;
-            return new Promise((resolve, reject) => {
-                Job.findMany(this.db(), query).then(existing => {
-                    if (existing && existing.length) {
-                        log.d('Job already scheduled or running: %j', existing);
-                        this._json.status = STATUS.CANCELLED; //set this as cancelled now as we have other scheduled
-                    }
-                    else {
-                        self._save().then(resolve, reject);
-                    }
 
-                });
-            });
+        //check if any job already scheduled or running
+        let query = {
+            status: {"$in": [STATUS.SCHEDULED, STATUS.RUNNING]},
+            name: this.name,
+        };
+
+        if (this.name === 'alerts:monitor' && this.data && Object.keys(this.data).length) {
+            query.data = this.data;
         }
-        else {
-            return this._save();
+
+        if (this._id) {
+            query._id = {$ne: this._id};
         }
+
+        var self = this;
+        return new Promise((resolve, reject) => {
+            Job.findMany(this.db(), query).then(existing => {
+                if (existing && existing.length) {
+                    log.d('Job already scheduled or running: %j', existing);
+                    this._json.status = STATUS.CANCELLED; //set this as cancelled now as we have other scheduled
+                }
+                else {
+                    self._save().then(resolve, reject);
+                }
+            });
+        });
     }
 
     /**
@@ -1142,4 +1143,4 @@ module.exports = {
     STATUS: STATUS,
     STATUS_MAP: STATUS_MAP,
     debounce: debounce
-};
+};