From 78d0357e83cb1fb190e01af78971e03885da9064 Mon Sep 17 00:00:00 2001 From: Cookiezaurs Date: Wed, 29 May 2024 13:00:24 +0300 Subject: [PATCH 1/2] [bugfix] [core] Correctly validate if we have to increase unique user count for sessions in aggregated data --- api/parts/data/usage.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api/parts/data/usage.js b/api/parts/data/usage.js index 957f9f39fb9..02fd6961f2b 100644 --- a/api/parts/data/usage.js +++ b/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); From 14ecc97e9d8d1599806c7138b335e9b8565368c1 Mon Sep 17 00:00:00 2001 From: Cookiezaurs Date: Wed, 29 May 2024 13:29:42 +0300 Subject: [PATCH 2/2] [views] Correctly record unique weekly values in agggregated data --- plugins/views/api/api.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/views/api/api.js b/plugins/views/api/api.js index e502f625c50..34bdd582b29 100644 --- a/plugins/views/api/api.js +++ b/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; }