Merge branch 'master' into SER-1645-clean-up-old-fcm-api-related-code

ArtursKadikis · web-flow · commit 4f631850a0fe · 2024-09-19T14:22:03.000+03:00
diff --git 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) {
diff --git a/package-lock.json b/package-lock.json
diff --git 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"
   },

Original file line number	Diff line number	Diff line change
`@@ -209,7 +209,7 @@ function processDrillCollection(collection, seconds, callback) {`
`209`	`209`
`210`	`210`	`function generateIterationList(z) {`
`211`	`211`	`z = (start === 0 && z) ? z : start;`
`212`		`- if (timeSpan === 0 && start === 0) {`
	`212`	`+ if (timeSpan === 0 && z === 0) {`
`213`	`213`	`listed.push({"collection": collection.collection, "db": collection.db, "start": 0, "end": end, "query": {"ts": {"$lt": end}}});`
`214`	`214`	`}`
`215`	`215`	`else if (timeSpan === 0) {`