Merge branch 'master' into next

Author: ar2rsawseen

CHANGELOG.md

@@ -1,3 +1,7 @@
+## Version 25.03.X
+Fixes:
+- [core] Fix period calculation
+
 ## Version 25.03.33
 Fixes:
 - [compliance-hub] Correctly merge user history on user merge

api/lib/countly.common.js

@@ -107,7 +107,9 @@ function getUniqArray(weeksArray_pd, weekCounts_pd, monthsArray_pd, monthCounts_
 
         if (weekCounts[key] < 7) {
             for (i = 0; i < weeksArray.length; i++) {
-                weeksArray[i] = weeksArray[i].replace(key, 0);
+                if (weeksArray[i] === key) {
+                    weeksArray[i] = '0';
+                }
             }
         }
     }
@@ -126,7 +128,9 @@ function getUniqArray(weeksArray_pd, weekCounts_pd, monthsArray_pd, monthCounts_
 
         if (monthCounts[key] < tmpDaysInMonth) {
             for (i = 0; i < monthsArray.length; i++) {
-                monthsArray[i] = monthsArray[i].replace(key, 0);
+                if (monthsArray[i] === key) {
+                    monthsArray[i] = '0';
+                }
             }
         }
     }
@@ -226,7 +230,9 @@ function getUniqCheckArray(weeksArray_pd, weekCounts_pd, monthsArray_pd, monthCo
 
         if (weekCounts[key] < 1) {
             for (i = 0; i < weeksArray.length; i++) {
-                weeksArray[i] = weeksArray[i].replace(key, 0);
+                if (weeksArray[i] === key) {
+                    weeksArray[i] = '0';
+                }
             }
         }
     }
@@ -245,7 +251,9 @@ function getUniqCheckArray(weeksArray_pd, weekCounts_pd, monthsArray_pd, monthCo
 
         if (monthCounts[key] < (tmpDaysInMonth * 0.5)) {
             for (i = 0; i < monthsArray.length; i++) {
-                monthsArray[i] = monthsArray[i].replace(key, 0);
+                if (monthsArray[i] === key) {
+                    monthsArray[i] = '0';
+                }
             }
         }
     }

bin/scripts/sharding/sharding.js

@@ -58,9 +58,9 @@ check.forEach(function(c) {
     var exceptional = true;
     var db = clyCollections.indexOf(c) === -1 ? drill : cly,
         dbName = clyCollections.indexOf(c) === -1 ? COUNTLY_DRILL : COUNTLY,
-        count = db[c].count(),
-        capped = db[c].stats()['capped'];
-
+        //count = db[c].count(), -- This is deprecated in mongo version >6
+        count = db[c].countDocuments({});
+    var capped = db[c].stats()['capped'];
     COUNTLY_TO_SHARD.some((e) => {
         if (c.indexOf(e) == 0) {
             exceptional = false;