Merge branch 'master' into dependabot/npm_and_yarn/countly-sdk-nodejs-24.10.1

Author: ar2rsawseen

CHANGELOG.md

@@ -1,3 +1,8 @@
+## Version xx.xx.xx
+
+Dependencies:
+- Bump sass from 1.81.0 to 1.83.1
+
 ## Version 24.05.20
 Fixes:
 - [push] Fixed bug where IOS credentials get mixed up while sending messages from different apps at the same time

api/utils/common.js

@@ -693,7 +693,13 @@ common.getDate = function(timestamp, timezone) {
 * @returns {number} current day of the year
 */
 common.getDOY = function(timestamp, timezone) {
-    var endDate = (timestamp) ? moment.unix(timestamp * 1000) : moment();
+    var endDate;
+    if (timestamp && timestamp.toString().length === 13) {
+        endDate = (timestamp) ? moment.unix(timestamp / 1000) : moment();
+    }
+    else {
+        endDate = (timestamp) ? moment.unix(timestamp) : moment();
+    }
 
     if (timezone) {
         endDate.tz(timezone);

package-lock.json

@@ -81,7 +81,7 @@
     "offline-geocoder": "git+https://github.com/Countly/offline-geocoder.git",
     "properties-parser": "0.6.0",
     "puppeteer": "^23.8.0",
-    "sass": "1.81.0",
+    "sass": "1.83.1",
     "tslib": "^2.6.3",
     "uglify-js": "3.19.3",
     "underscore": "1.13.7",

package.json

@@ -471,13 +471,23 @@ async function stopProfiler(processName) {
     const errors = [];
 
     // clear old files
-    await new Promise(
-        (res, rej) => countlyFs.gridfs.deleteAll(
-            PROFILER_DIR,
-            null,
-            err => err ? rej(err) : res()
-        )
-    );
+    try {
+        await new Promise(
+            (res, rej) => countlyFs.gridfs.deleteAll(
+                PROFILER_DIR,
+                null,
+                err => err ? rej(err) : res()
+            )
+        );
+    }
+    catch (err) {
+        if (err.code === 26) { // NamespaceNotFound: thrown when there's no collection initially
+            // do nothing...
+        }
+        else {
+            throw err;
+        }
+    }
 
     // coverage
     try {

plugins/system-utility/api/system.utility.js

@@ -29,6 +29,7 @@ tableResponse["30days"] = {"iTotalRecords": 0, "iTotalDisplayRecords": 0, "aaDat
 tableResponse["7days"] = {"iTotalRecords": 0, "iTotalDisplayRecords": 0, "aaData": [{"u": 0, "t": 0, "s": 0, "b": 0, "e": 0, "d-calc": 0, "d": 0, "n": 0, "scr-calc": 0, "scr": 0, "uvalue": 0}]};
 tableResponse.month = {"iTotalRecords": 0, "iTotalDisplayRecords": 0, "aaData": [{"u": 0, "t": 0, "s": 0, "b": 0, "e": 0, "d-calc": 0, "d": 0, "n": 0, "scr-calc": 0, "scr": 0, "uvalue": 0}]}; //this year
 
+var userHistory = {};
 
 graphResponse.hour = {};
 graphResponse.yesterday = {};
@@ -277,11 +278,14 @@ describe('Testing views plugin', function() {
             tableResponse["30days"].iTotalRecords += 1;
             tableResponse["30days"].iTotalDisplayRecords += 1;
             pushValues("30days", 0, {"u": 1, "t": 1, "s": 1, "uvalue": 1, "n": 1, "view": "testview0"});
+            userHistory["user1"] = {};
+            userHistory["user1"]["30days"] = true;
 
             if (days_this_year > 25) {
                 tableResponse.month.iTotalRecords += 1;
                 tableResponse.month.iTotalDisplayRecords += 1;
                 pushValues("month", 0, {"t": 1, "s": 1, "uvalue": 1, "u": 1, "n": 1, "view": "testview0"});
+                userHistory["user1"]["month"] = true;
             }
             /* else {
                 tableResponse.month.iTotalRecords = 0;
@@ -321,7 +325,13 @@ describe('Testing views plugin', function() {
             if (days_this_year > 1) {
                 tableResponse.month.iTotalRecords = 1;
                 tableResponse.month.iTotalDisplayRecords = 1;
-                pushValues("month", 0, {"t": 1, "s": 1});
+                if (userHistory["user1"]["month"]) {
+                    pushValues("month", 0, {"t": 1, "s": 1});
+                }
+                else {
+                    pushValues("month", 0, {"u": 1, "uvalue": 1, "t": 1, "s": 1, "view": "testview0"});
+                    userHistory["user1"]["month"] = true;
+                }
                 //tableResponse["month"]['aaData'][0]['n']=1;
                 tableResponse.month.aaData[0].uvalue = 1;
             }