Merge pull request #5289 from Cookiezaurs/master

[bugfix] [core] Correctly validate if we have to increase unique user count for sessions in aggregated data

Author: Cookiezaurs

api/parts/data/usage.js

@@ -553,7 +553,7 @@ function processUserSession(dbAppUser, params, done) {
             uniqueLevelsMonth.push(params.time.day);
         }
 
-        if (userLastSeenDate.year() === params.time.yearly &&
+        if ((userLastSeenDate.year() + "") === (params.time.yearly + "") &&
                 Math.ceil(userLastSeenDate.format("DDD") / 7) < params.time.weekly) {
             uniqueLevels[uniqueLevels.length] = params.time.yearly + ".w" + params.time.weekly;
             uniqueLevelsZero.push("w" + params.time.weekly);

plugins/views/api/api.js

@@ -2192,7 +2192,7 @@ const escapedViewSegments = { "name": true, "segment": true, "height": true, "wi
                     if (lastViewTimestamp < (params.time.timestamp - secInHour)) {
                         tmpTimeObjMonth['d.' + params.time.day + '.' + escapedMetricVal + common.dbMap.unique] = 1;
                     }
-                    if (lastViewDate.year() === params.time.yearly && lastMoment.isoWeek() < params.time.weeklyISO) {
+                    if ((lastViewDate.year() + "") === (params.time.yearly + "") && lastMoment.isoWeek() < params.time.weeklyISO) {
                         tmpTimeObjZero["d.w" + params.time.weeklyISO + '.' + escapedMetricVal + common.dbMap.unique] = 1;
                     }