diff --git a/packages/cli/src/modules/insights/__tests__/insights-compaction.service.test.ts b/packages/cli/src/modules/insights/__tests__/insights-compaction.service.test.ts index 2d7c73338e..64853615f2 100644 --- a/packages/cli/src/modules/insights/__tests__/insights-compaction.service.test.ts +++ b/packages/cli/src/modules/insights/__tests__/insights-compaction.service.test.ts @@ -436,7 +436,7 @@ describe('compaction', () => { // 2000-01-03 is a Monday DateTime.utc(2000, 1, 3, 0, 0), DateTime.utc(2000, 1, 5, 23, 59), - DateTime.utc(2000, 1, 11, 1, 0), + DateTime.utc(2000, 1, 10, 1, 0), ], batches: [2, 1], }, @@ -446,9 +446,9 @@ describe('compaction', () => { // 2000-01-03 is a Monday DateTime.utc(2000, 1, 3, 0, 0), DateTime.utc(2000, 1, 4, 23, 59), - DateTime.utc(2000, 1, 11, 0, 0), - DateTime.utc(2000, 1, 12, 23, 59), - DateTime.utc(2000, 1, 18, 23, 59), + DateTime.utc(2000, 1, 10, 0, 0), + DateTime.utc(2000, 1, 11, 23, 59), + DateTime.utc(2000, 1, 17, 23, 59), ], batches: [2, 2, 1], }, @@ -482,7 +482,7 @@ describe('compaction', () => { const allCompacted = await insightsByPeriodRepository.find({ order: { periodStart: 1 } }); expect(allCompacted).toHaveLength(batches.length); for (const [index, compacted] of allCompacted.entries()) { - expect(compacted.periodStart.getDay()).toBe(1); + expect(compacted.periodStart.getUTCDay()).toBe(1); expect(compacted.value).toBe(batches[index]); } }); diff --git a/packages/cli/src/modules/insights/database/repositories/insights-by-period.repository.ts b/packages/cli/src/modules/insights/database/repositories/insights-by-period.repository.ts index edb6294640..b5890ce0c0 100644 --- a/packages/cli/src/modules/insights/database/repositories/insights-by-period.repository.ts +++ b/packages/cli/src/modules/insights/database/repositories/insights-by-period.repository.ts @@ -90,7 +90,7 @@ export class InsightsByPeriodRepository extends Repository { // SQLite by default let periodStartExpr = periodUnitToCompactInto === 'week' - ? "strftime('%Y-%m-%d 00:00:00.000', date(periodStart, 'weekday 0', '-6 days'))" + ? "strftime('%Y-%m-%d 00:00:00.000', date(periodStart, '-6 days', 'weekday 1'))" : `strftime('%Y-%m-%d ${periodUnitToCompactInto === 'hour' ? '%H' : '00'}:00:00.000', periodStart)`; if (dbType === 'mysqldb' || dbType === 'mariadb') { periodStartExpr =