Skip to content

fix(client-core): Fix time series generation #9978

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 18, 2025
Merged

fix(client-core): Fix time series generation #9978

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion packages/cubejs-client-core/src/ResultSet.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -549,7 +549,8 @@ export default class ResultSet<T extends Record<string, any> = any> {
const series = this.loadResponses.map(
(loadResponse) => this.timeSeries(
loadResponse.query.timeDimensions![0],
resultIndex, loadResponse.annotation.timeDimensions
resultIndex,
loadResponse.annotation.timeDimensions
)
);

Expand Down
2 changes: 1 addition & 1 deletion packages/cubejs-client-core/src/time.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ export const dayRange = (from: any, to: any): DayRange => ({
let start = internalDayjs(from);
const end = internalDayjs(to);

while (start.isBefore(end) || start.isSame(end)) {
while (start.startOf(value).isBefore(end) || start.isSame(end)) {
results.push(start);
start = start.add(1, value);
}
Expand Down
280 changes: 280 additions & 0 deletions packages/cubejs-client-core/test/granularity.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,5 +219,285 @@ describe('ResultSet Granularity', () => {
},
]);
});

test('hour granularity (end minutes > start minutes)', () => {
const result = new ResultSet({
queryType: 'regularQuery',
results: [
{
query: {
measures: ['LineItems.count'],
timeDimensions: [
{
dimension: 'LineItems.createdAt',
granularity: 'hour',
dateRange: ['2019-01-08T01:45:25.342', '2019-01-08T07:45:58.399'],
},
],
filters: [],
timezone: 'UTC',
order: [],
dimensions: [],
},
data: [
{
'LineItems.createdAt.hour': '2019-01-08T01:00:00.000',
'LineItems.createdAt': '2019-01-08T01:00:00.000',
'LineItems.count': '2',
},
{
'LineItems.createdAt.hour': '2019-01-08T02:00:00.000',
'LineItems.createdAt': '2019-01-08T02:00:00.000',
'LineItems.count': '3',
},
{
'LineItems.createdAt.hour': '2019-01-08T03:00:00.000',
'LineItems.createdAt': '2019-01-08T03:00:00.000',
'LineItems.count': '4',
},
{
'LineItems.createdAt.hour': '2019-01-08T04:00:00.000',
'LineItems.createdAt': '2019-01-08T04:00:00.000',
'LineItems.count': '5',
},
{
'LineItems.createdAt.hour': '2019-01-08T05:00:00.000',
'LineItems.createdAt': '2019-01-08T05:00:00.000',
'LineItems.count': '6',
},
{
'LineItems.createdAt.hour': '2019-01-08T06:00:00.000',
'LineItems.createdAt': '2019-01-08T06:00:00.000',
'LineItems.count': '7',
},
],
lastRefreshTime: '2021-07-07T14:31:30.458Z',
annotation: {
measures: {
'LineItems.count': {
title: 'Line Items Count',
shortTitle: 'Count',
type: 'number',
drillMembers: ['LineItems.id', 'LineItems.createdAt'],
drillMembersGrouped: {
measures: [],
dimensions: ['LineItems.id', 'LineItems.createdAt'],
},
},
},
dimensions: {},
segments: {},
timeDimensions: {
'LineItems.createdAt.week': {
title: 'Line Items Created at',
shortTitle: 'Created at',
type: 'time',
},
'LineItems.createdAt': {
title: 'Line Items Created at',
shortTitle: 'Created at',
type: 'time',
},
},
},
slowQuery: false,
},
],
pivotQuery: {
measures: ['LineItems.count'],
timeDimensions: [
{
dimension: 'LineItems.createdAt',
granularity: 'hour',
dateRange: ['2019-01-08T01:45:25.342', '2019-01-08T07:45:58.399'],
},
],
filters: [],
timezone: 'UTC',
order: [],
dimensions: [],
queryType: 'regularQuery',
},
slowQuery: false,
} as any);

expect(result.chartPivot()).toStrictEqual([
{
x: '2019-01-08T01:00:00.000',
xValues: ['2019-01-08T01:00:00.000'],
'LineItems.count': 2,
},
{
x: '2019-01-08T02:00:00.000',
xValues: ['2019-01-08T02:00:00.000'],
'LineItems.count': 3,
},
{
x: '2019-01-08T03:00:00.000',
xValues: ['2019-01-08T03:00:00.000'],
'LineItems.count': 4,
},
{
x: '2019-01-08T04:00:00.000',
xValues: ['2019-01-08T04:00:00.000'],
'LineItems.count': 5,
},
{
x: '2019-01-08T05:00:00.000',
xValues: ['2019-01-08T05:00:00.000'],
'LineItems.count': 6,
},
{
x: '2019-01-08T06:00:00.000',
xValues: ['2019-01-08T06:00:00.000'],
'LineItems.count': 7,
},
{
x: '2019-01-08T07:00:00.000',
xValues: ['2019-01-08T07:00:00.000'],
'LineItems.count': 0,
},
]);
});

test('hour granularity (end minutes < start minutes)', () => {
const result = new ResultSet({
queryType: 'regularQuery',
results: [
{
query: {
measures: ['LineItems.count'],
timeDimensions: [
{
dimension: 'LineItems.createdAt',
granularity: 'hour',
dateRange: ['2019-01-08T01:45:25.342', '2019-01-08T07:35:58.399'],
},
],
filters: [],
timezone: 'UTC',
order: [],
dimensions: [],
},
data: [
{
'LineItems.createdAt.hour': '2019-01-08T01:00:00.000',
'LineItems.createdAt': '2019-01-08T01:00:00.000',
'LineItems.count': '2',
},
{
'LineItems.createdAt.hour': '2019-01-08T02:00:00.000',
'LineItems.createdAt': '2019-01-08T02:00:00.000',
'LineItems.count': '3',
},
{
'LineItems.createdAt.hour': '2019-01-08T03:00:00.000',
'LineItems.createdAt': '2019-01-08T03:00:00.000',
'LineItems.count': '4',
},
{
'LineItems.createdAt.hour': '2019-01-08T04:00:00.000',
'LineItems.createdAt': '2019-01-08T04:00:00.000',
'LineItems.count': '5',
},
{
'LineItems.createdAt.hour': '2019-01-08T05:00:00.000',
'LineItems.createdAt': '2019-01-08T05:00:00.000',
'LineItems.count': '6',
},
{
'LineItems.createdAt.hour': '2019-01-08T06:00:00.000',
'LineItems.createdAt': '2019-01-08T06:00:00.000',
'LineItems.count': '7',
},
],
lastRefreshTime: '2021-07-07T14:31:30.458Z',
annotation: {
measures: {
'LineItems.count': {
title: 'Line Items Count',
shortTitle: 'Count',
type: 'number',
drillMembers: ['LineItems.id', 'LineItems.createdAt'],
drillMembersGrouped: {
measures: [],
dimensions: ['LineItems.id', 'LineItems.createdAt'],
},
},
},
dimensions: {},
segments: {},
timeDimensions: {
'LineItems.createdAt.week': {
title: 'Line Items Created at',
shortTitle: 'Created at',
type: 'time',
},
'LineItems.createdAt': {
title: 'Line Items Created at',
shortTitle: 'Created at',
type: 'time',
},
},
},
slowQuery: false,
},
],
pivotQuery: {
measures: ['LineItems.count'],
timeDimensions: [
{
dimension: 'LineItems.createdAt',
granularity: 'hour',
dateRange: ['2019-01-08T01:45:25.342', '2019-01-08T07:35:58.399'],
},
],
filters: [],
timezone: 'UTC',
order: [],
dimensions: [],
queryType: 'regularQuery',
},
slowQuery: false,
} as any);

expect(result.chartPivot()).toStrictEqual([
{
x: '2019-01-08T01:00:00.000',
xValues: ['2019-01-08T01:00:00.000'],
'LineItems.count': 2,
},
{
x: '2019-01-08T02:00:00.000',
xValues: ['2019-01-08T02:00:00.000'],
'LineItems.count': 3,
},
{
x: '2019-01-08T03:00:00.000',
xValues: ['2019-01-08T03:00:00.000'],
'LineItems.count': 4,
},
{
x: '2019-01-08T04:00:00.000',
xValues: ['2019-01-08T04:00:00.000'],
'LineItems.count': 5,
},
{
x: '2019-01-08T05:00:00.000',
xValues: ['2019-01-08T05:00:00.000'],
'LineItems.count': 6,
},
{
x: '2019-01-08T06:00:00.000',
xValues: ['2019-01-08T06:00:00.000'],
'LineItems.count': 7,
},
{
x: '2019-01-08T07:00:00.000',
xValues: ['2019-01-08T07:00:00.000'],
'LineItems.count': 0,
},
]);
});
});
});
Loading