fix(schema-compiler): use query timezone for time granularity origin

Author: KSDaemon

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

@@ -2780,7 +2780,7 @@ export class BaseQuery {
    * intervals relative to origin timestamp point
    * @param {string} interval (a value expression of type interval)
    * @param {string} source (a value expression of type timestamp/date)
-   * @param {string} origin (a value expression of type timestamp/date)
+   * @param {string} origin (a value expression of type timestamp/date without timezone)
    * @returns {string}
    */
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
@@ -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

@@ -25,7 +25,7 @@ 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.origin = moment.tz(query.timezone).startOf('year'); // Defaults to current year start
 
     if (this.predefinedGranularity) {
       this.granularityInterval = `1 ${this.granularity}`;
@@ -43,7 +43,7 @@ export class Granularity {
       this.granularityInterval = customGranularity.interval;
 
       if (customGranularity.origin) {
-        this.origin = moment.tz(customGranularity.origin, 'UTC');
+        this.origin = moment.tz(customGranularity.origin, query.timezone);
       } else if (customGranularity.offset) {
         this.granularityOffset = customGranularity.offset;
         this.origin = addInterval(this.origin, parseSqlInterval(customGranularity.offset));
@@ -55,10 +55,20 @@ export class Granularity {
     return this.predefinedGranularity;
   }
 
-  public originFormatted(): string {
+  /**
+   * @returns origin date string in Query timezone
+   */
+  public originLocalFormatted(): string {
     return this.origin.format('YYYY-MM-DDTHH:mm:ss.SSS');
   }
 
+  /**
+   * @returns origin date string in UTC timezone
+   */
+  public originUtcFormatted(): string {
+    return this.origin.clone().utc().format('YYYY-MM-DDTHH:mm:ss.SSSZ');
+  }
+
   public minGranularity(): string {
     if (this.predefinedGranularity) {
       return this.granularity;
@@ -86,7 +96,10 @@ export class Granularity {
       return timeSeries(this.granularity, dateRange, options);
     }
 
-    return timeSeriesFromCustomInterval(this.granularityInterval, dateRange, this.origin, options);
+    // Interval range doesn't take timezone into account and operate in kinda local timezone,
+    // but origin is treated as a timestamp in query timezone, so we pass it as the naive timestamp
+    // to be in sync with date range during calculation.
+    return timeSeriesFromCustomInterval(this.granularityInterval, dateRange, moment(this.origin.format('YYYY-MM-DDTHH:mm:ss')), options);
   }
 
   public resolvedGranularity(): string {