fix(schema-compiler): fix time dimension granularity origin formatting in local timezone (#9071)

* fix integration custom granularities tests

* fix postgres drivers tests related to custom granularities

* fix granularity origin formatting in local timezone

* fix spelling
# Conflicts:
#	packages/cubejs-schema-compiler/src/adapter/Granularity.ts

Author: KSDaemon

.github/pull_request_template.md

@@ -1,5 +1,5 @@
 **Check List**
-- [ ] Tests has been run in packages where changes made if available
+- [ ] Tests have been run in packages where changes made if available
 - [ ] Linter has been run for changed code
 - [ ] Tests for the changes have been added if not covered yet
 - [ ] Docs have been added / updated if required

packages/cubejs-schema-compiler/src/adapter/BaseQuery.js

@@ -2838,7 +2838,7 @@ export class BaseQuery {
       return this.timeGroupedColumn(granularity.granularityFromInterval(), dimension);
     }
 
-    return this.dateBin(granularity.granularityInterval, dimension, granularity.originFormatted());
+    return this.dateBin(granularity.granularityInterval, dimension, granularity.originLocalFormatted());
   }
 
   /**

packages/cubejs-schema-compiler/src/adapter/Granularity.ts

@@ -13,6 +13,8 @@ export class Granularity {
 
   public readonly granularityInterval: string;
 
+  public readonly queryTimezone: string;
+
   public readonly granularityOffset: string | undefined;
 
   public readonly origin: moment.Moment;
@@ -25,7 +27,8 @@ export class Granularity {
   ) {
     this.granularity = timeDimension.granularity;
     this.predefinedGranularity = isPredefinedGranularity(this.granularity);
-    this.origin = moment.tz('UTC').startOf('year'); // Defaults to current year start
+    this.queryTimezone = query.timezone;
+    this.origin = moment.tz(query.timezone).startOf('year'); // Defaults to current year start
 
     if (this.predefinedGranularity) {
       this.granularityInterval = `1 ${this.granularity}`;
@@ -55,8 +58,11 @@ export class Granularity {
     return this.predefinedGranularity;
   }
 
-  public originFormatted(): string {
-    return this.origin.format('YYYY-MM-DDTHH:mm:ss.SSS');
+  /**
+   * @returns origin date string in Query timezone
+   */
+  public originLocalFormatted(): string {
+    return this.origin.tz(this.queryTimezone).format('YYYY-MM-DDTHH:mm:ss.SSS');
   }
 
   public minGranularity(): string {

packages/cubejs-schema-compiler/test/integration/clickhouse/custom-granularities.test.ts

@@ -41,9 +41,11 @@ describe('Custom Granularities', () => {
           granularities:
             - name: half_year
               interval: 6 months
+              origin: '2024-01-01' # to keep tests stable across time (year change, etc)
             - name: half_year_by_1st_april
               interval: 6 months
-              offset: 3 months
+              #offset: 3 months
+              origin: '2024-04-01' # to keep tests stable across time (year change, etc)
             - name: two_weeks_by_friday
               interval: 2 weeks
               origin: '2024-08-23'

packages/cubejs-schema-compiler/test/integration/mssql/custom-granularities.test.ts

@@ -37,9 +37,11 @@ describe('Custom Granularities', () => {
           granularities:
             - name: half_year
               interval: 6 months
+              origin: '2024-01-01' # to keep tests stable across time (year change, etc)
             - name: half_year_by_1st_april
               interval: 6 months
-              offset: 3 months
+              #offset: 3 months
+              origin: '2024-04-01' # to keep tests stable across time (year change, etc)
             - name: two_weeks_by_friday
               interval: 2 weeks
               origin: '2024-08-23'

packages/cubejs-schema-compiler/test/integration/mysql/custom-granularities.test.ts

@@ -37,9 +37,11 @@ describe('Custom Granularities', () => {
           granularities:
             - name: half_year
               interval: 6 months
+              origin: '2024-01-01' # to keep tests stable across time (year change, etc)
             - name: half_year_by_1st_april
               interval: 6 months
-              offset: 3 months
+              #offset: 3 months
+              origin: '2024-04-01' # to keep tests stable across time (year change, etc)
             - name: two_weeks_by_friday
               interval: 2 weeks
               origin: '2024-08-23'

packages/cubejs-schema-compiler/test/integration/postgres/custom-granularities.test.ts

@@ -39,9 +39,11 @@ describe('Custom Granularities', () => {
           granularities:
             - name: half_year
               interval: 6 months
+              origin: '2024-01-01' # to keep tests stable across time (year change, etc)
             - name: half_year_by_1st_april
               interval: 6 months
-              offset: 3 months
+              #offset: 3 months
+              origin: '2024-04-01' # to keep tests stable across time (year change, etc)
             - name: two_weeks_by_friday
               interval: 2 weeks
               origin: '2024-08-23'

packages/cubejs-testing-drivers/fixtures/_schemas.json

@@ -92,12 +92,13 @@
           "granularities": [
             {
               "name": "half_year",
-              "interval": "6 months"
+              "interval": "6 months",
+              "origin": "2024-01-01"
             },
             {
               "name": "half_year_by_1st_april",
               "interval": "6 months",
-              "offset": "3 months"
+              "origin": "2024-04-01"
             },
             {
               "name": "two_mo_by_feb",
@@ -118,12 +119,13 @@
           "granularities": [
             {
               "name": "half_year",
-              "interval": "6 months"
+              "interval": "6 months",
+              "origin": "2024-01-01"
             },
             {
               "name": "half_year_by_1st_april",
               "interval": "6 months",
-              "offset": "3 months"
+              "origin": "2024-04-01"
             },
             {
               "name": "two_mo_by_feb",