From 9881cf70b904381cd43bac0512659d3ed860d9d5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 14 Sep 2024 17:17:47 +0000
Subject: [PATCH 1/2] Bump uglify-js from 3.18.0 to 3.19.3

Bumps [uglify-js](https://github.com/mishoo/UglifyJS) from 3.18.0 to 3.19.3.
- [Release notes](https://github.com/mishoo/UglifyJS/releases)
- [Commits](https://github.com/mishoo/UglifyJS/compare/v3.18.0...v3.19.3)

---
updated-dependencies:
- dependency-name: uglify-js
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 9 ++++-----
 package.json      | 2 +-
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 0d01f3c6554..2bd18fd7d1a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -62,7 +62,7 @@
         "puppeteer": "17.1.3",
         "sass": "1.78.0",
         "tslib": "^2.6.3",
-        "uglify-js": "3.18.0",
+        "uglify-js": "3.19.3",
         "underscore": "1.13.7",
         "xlsx-write-stream": "^1.0.0"
       },
@@ -11881,10 +11881,9 @@
       "license": "MIT"
     },
     "node_modules/uglify-js": {
-      "version": "3.18.0",
-      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.18.0.tgz",
-      "integrity": "sha512-SyVVbcNBCk0dzr9XL/R/ySrmYf0s372K6/hFklzgcp2lBFyXtw4I7BOdDjlLhE1aVqaI/SHWXWmYdlZxuyF38A==",
-      "license": "BSD-2-Clause",
+      "version": "3.19.3",
+      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.19.3.tgz",
+      "integrity": "sha512-v3Xu+yuwBXisp6QYTcH4UbH+xYJXqnq2m/LtQVWKWzYc1iehYnLixoQDN9FH6/j9/oybfd6W9Ghwkl8+UMKTKQ==",
       "bin": {
         "uglifyjs": "bin/uglifyjs"
       },
diff --git a/package.json b/package.json
index 6e18f3430a0..120a1fe37ce 100644
--- a/package.json
+++ b/package.json
@@ -85,7 +85,7 @@
     "puppeteer": "17.1.3",
     "sass": "1.78.0",
     "tslib": "^2.6.3",
-    "uglify-js": "3.18.0",
+    "uglify-js": "3.19.3",
     "underscore": "1.13.7",
     "xlsx-write-stream": "^1.0.0"
   },

From 10b7a920dfa6dfaa72a7d4a9be3b8d914c5a736e Mon Sep 17 00:00:00 2001
From: ayasayadi1 <aya.sayadi@count.ly>
Date: Wed, 18 Sep 2024 11:20:56 +0000
Subject: [PATCH 2/2] small fix

---
 bin/scripts/expire-data/countly_single_app_expireDataBatches.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/scripts/expire-data/countly_single_app_expireDataBatches.js b/bin/scripts/expire-data/countly_single_app_expireDataBatches.js
index 9bf40e83f1a..7c5305340f5 100644
--- a/bin/scripts/expire-data/countly_single_app_expireDataBatches.js
+++ b/bin/scripts/expire-data/countly_single_app_expireDataBatches.js
@@ -209,7 +209,7 @@ function processDrillCollection(collection, seconds, callback) {
 
     function generateIterationList(z) {
         z = (start === 0 && z) ? z : start;
-        if (timeSpan === 0 && start === 0) {
+        if (timeSpan === 0 && z === 0) {
             listed.push({"collection": collection.collection, "db": collection.db, "start": 0, "end": end, "query": {"ts": {"$lt": end}}});
         }
         else if (timeSpan === 0) {