A platform for community discussion. Free, open, simple.
DEV: Use UTC for admin report chart incomplete period detection (#38450)
Isaac Janzenaebbac828400
diff --git a/frontend/discourse/admin/components/admin-report-chart.gjs b/frontend/discourse/admin/components/admin-report-chart.gjsindex ad9fba817d4..480e381a09c 100644--- a/frontend/discourse/admin/components/admin-report-chart.gjs+++ b/frontend/discourse/admin/components/admin-report-chart.gjs@@ -14,8 +14,9 @@ function getCSSColor(varName) {}export function isInCurrentPeriod(timestamp, grouping) {- const date = moment(timestamp);- const now = moment();+ // Report data uses UTC dates, so compare in UTC+ const date = moment.utc(timestamp);+ const now = moment.utc();switch (grouping) {case "weekly":diff --git a/frontend/discourse/tests/integration/components/admin-report-chart-test.gjs b/frontend/discourse/tests/integration/components/admin-report-chart-test.gjsindex b3b61cca6d1..d5af160271b 100644--- a/frontend/discourse/tests/integration/components/admin-report-chart-test.gjs+++ b/frontend/discourse/tests/integration/components/admin-report-chart-test.gjs@@ -7,8 +7,8 @@ module("Integration | Component | admin-report-chart", function (hooks) {module("hasIncompleteData", function () {module("daily grouping", function () {- test("returns true when last data point is today", function (assert) {- const today = moment().format("YYYY-MM-DD");+ test("returns true when last data point is today in UTC", function (assert) {+ const today = moment.utc().format("YYYY-MM-DD");assert.true(hasIncompleteData({ x: today, y: 5 }, "daily"),@@ -16,8 +16,8 @@ module("Integration | Component | admin-report-chart", function (hooks) {);});- test("returns false when last data point is yesterday", function (assert) {- const yesterday = moment().subtract(1, "day").format("YYYY-MM-DD");+ test("returns false when last data point is yesterday in UTC", function (assert) {+ const yesterday = moment.utc().subtract(1, "day").format("YYYY-MM-DD");assert.false(hasIncompleteData({ x: yesterday, y: 5 }, "daily"),@@ -27,8 +27,8 @@ module("Integration | Component | admin-report-chart", function (hooks) {});module("weekly grouping", function () {- test("returns true when last data point is this week", function (assert) {- const today = moment().format("YYYY-MM-DD");+ test("returns true when last data point is this week in UTC", function (assert) {+ const today = moment.utc().format("YYYY-MM-DD");assert.true(hasIncompleteData({ x: today, y: 5 }, "weekly"),@@ -36,8 +36,8 @@ module("Integration | Component | admin-report-chart", function (hooks) {);});- test("returns false when last data point is last week", function (assert) {- const lastWeek = moment().subtract(1, "week").format("YYYY-MM-DD");+ test("returns false when last data point is last week in UTC", function (assert) {+ const lastWeek = moment.utc().subtract(1, "week").format("YYYY-MM-DD");assert.false(hasIncompleteData({ x: lastWeek, y: 5 }, "weekly"),@@ -47,8 +47,8 @@ module("Integration | Component | admin-report-chart", function (hooks) {});module("monthly grouping", function () {- test("returns true when last data point is this month", function (assert) {- const today = moment().format("YYYY-MM-DD");+ test("returns true when last data point is this month in UTC", function (assert) {+ const today = moment.utc().format("YYYY-MM-DD");assert.true(hasIncompleteData({ x: today, y: 5 }, "monthly"),@@ -56,8 +56,11 @@ module("Integration | Component | admin-report-chart", function (hooks) {);});- test("returns false when last data point is last month", function (assert) {- const lastMonth = moment().subtract(1, "month").format("YYYY-MM-DD");+ test("returns false when last data point is last month in UTC", function (assert) {+ const lastMonth = moment+ .utc()+ .subtract(1, "month")+ .format("YYYY-MM-DD");assert.false(hasIncompleteData({ x: lastMonth, y: 5 }, "monthly"),