use dayRange instead of new func

Author: paco-valdez

packages/cubejs-client-core/src/ResultSet.ts

@@ -8,7 +8,6 @@ import { aliasSeries } from './utils';
 import {
   DateRegex,
   dayRange,
-  getGranularityDateRange,
   internalDayjs,
   isPredefinedGranularity,
   LocalDateRegex,
@@ -241,13 +240,8 @@ export default class ResultSet<T extends Record<string, any> = any> {
         const [cubeName, dimension, granularity] = member.split('.');
 
         if (granularity !== undefined) {
-          // Use the new helper function that handles both predefined and custom granularities
-          const range = getGranularityDateRange(
-            value,
-            granularity,
-            timeDimensionsAnnotation?.[member],
-            timeDimensionsAnnotation
-          );
+          // dayRange.snapTo now handles both predefined and custom granularities
+          const range = dayRange(value, value, timeDimensionsAnnotation).snapTo(granularity);
 
           const originalTimeDimension = query.timeDimensions?.find((td) => td.dimension);
 

packages/cubejs-client-core/src/time.ts

@@ -109,10 +109,11 @@ export const dayRange = (from: any, to: any, annotations?: Record<string, { gran
       }
 
       if (customGranularity && customGranularity.interval) {
-        // For custom granularities, calculate the range based on interval
+        // For custom granularities, calculate the range for the bucket
         const intervalParsed = parseSqlInterval(customGranularity.interval);
         const intervalStart = internalDayjs(from);
-        const intervalEnd = addInterval(internalDayjs(to), intervalParsed);
+        // End is start + interval - 1 millisecond (to stay within the bucket)
+        const intervalEnd = addInterval(intervalStart, intervalParsed).subtract(1, 'millisecond');
 
         return dayRange(intervalStart, intervalEnd, annotations);
       }