fix(schema-compiler): Fix not working timeshift in views (cube-js#9504)

* fix(schema-compiler): Fix not working timeshift in views

* add tests

Author: KSDaemon

packages/cubejs-schema-compiler/src/compiler/CubeSymbols.ts

@@ -541,22 +541,28 @@ export class CubeSymbols {
           title: resolvedMember.title,
           description: resolvedMember.description,
           format: resolvedMember.format,
+          ...(resolvedMember.multiStage && { multiStage: resolvedMember.multiStage }),
+          ...(resolvedMember.timeShift && { timeShift: resolvedMember.timeShift }),
+          ...(resolvedMember.orderBy && { orderBy: resolvedMember.orderBy }),
         };
       } else if (type === 'dimensions') {
         memberDefinition = {
-          ...(resolvedMember.granularities ? { granularities: resolvedMember.granularities } : {}),
           sql,
           type: resolvedMember.type,
           meta: resolvedMember.meta,
           title: resolvedMember.title,
           description: resolvedMember.description,
           format: resolvedMember.format,
+          ...(resolvedMember.granularities ? { granularities: resolvedMember.granularities } : {}),
+          ...(resolvedMember.multiStage && { multiStage: resolvedMember.multiStage }),
         };
       } else if (type === 'segments') {
         memberDefinition = {
           sql,
           meta: resolvedMember.meta,
+          title: resolvedMember.title,
           description: resolvedMember.description,
+          aliases: resolvedMember.aliases,
         };
       } else if (type === 'hierarchies') {
         memberDefinition = {

packages/cubejs-schema-compiler/test/unit/__snapshots__/schema.test.ts.snap

@@ -1347,3 +1347,64 @@ Array [
   },
 ]
 `;
+
+exports[`Schema Testing Views extends custom granularities and timeshifts 1`] = `
+Object {
+  "aliasMember": "orders.createdAt",
+  "description": undefined,
+  "format": undefined,
+  "granularities": Object {
+    "half_year": Object {
+      "interval": "6 months",
+      "title": "6 month intervals",
+    },
+    "half_year_by_1st_april": Object {
+      "interval": "6 months",
+      "offset": "3 months",
+      "title": "Half year from Apr to Oct",
+    },
+    "half_year_by_1st_june": Object {
+      "interval": "6 months",
+      "origin": "2020-06-01 10:00:00",
+    },
+    "half_year_by_1st_march": Object {
+      "interval": "6 months",
+      "origin": "2020-03-01",
+    },
+  },
+  "meta": undefined,
+  "ownedByCube": false,
+  "sql": [Function],
+  "title": undefined,
+  "type": "time",
+}
+`;
+
+exports[`Schema Testing Views extends custom granularities and timeshifts 2`] = `
+Object {
+  "aggType": "count",
+  "aliasMember": "orders.count_shifted_year",
+  "description": undefined,
+  "format": undefined,
+  "meta": undefined,
+  "multiStage": true,
+  "ownedByCube": false,
+  "sql": [Function],
+  "timeShift": Array [
+    Object {
+      "interval": "1 year",
+      "timeDimension": [Function],
+      "type": "prior",
+    },
+  ],
+  "timeShiftReferences": Array [
+    Object {
+      "interval": "1 year",
+      "timeDimension": "createdAt",
+      "type": "prior",
+    },
+  ],
+  "title": undefined,
+  "type": "number",
+}
+`;

packages/cubejs-schema-compiler/test/unit/base-query.test.ts

@@ -3,7 +3,7 @@ import { BaseQuery, PostgresQuery, MssqlQuery, UserError, CubeStoreQuery } from
 import { prepareJsCompiler, prepareYamlCompiler } from './PrepareCompiler';
 import {
   createCubeSchema,
-  createCubeSchemaWithCustomGranularities,
+  createCubeSchemaWithCustomGranularitiesAndTimeShift,
   createCubeSchemaYaml,
   createECommerceSchema,
   createJoinedCubesSchema,
@@ -421,7 +421,7 @@ describe('SQL Generation', () => {
 
   describe('Custom granularities', () => {
     const compilers = /** @type Compilers */ prepareJsCompiler(
-      createCubeSchemaWithCustomGranularities('orders')
+      createCubeSchemaWithCustomGranularitiesAndTimeShift('orders')
     );
 
     const granularityQueries = [

packages/cubejs-schema-compiler/test/unit/schema.test.ts

@@ -1,7 +1,7 @@
 import fs from 'fs';
 import path from 'path';
 import { prepareCompiler, prepareJsCompiler } from './PrepareCompiler';
-import { createCubeSchema, createCubeSchemaWithCustomGranularities, createCubeSchemaWithAccessPolicy } from './utils';
+import { createCubeSchema, createCubeSchemaWithCustomGranularitiesAndTimeShift, createCubeSchemaWithAccessPolicy } from './utils';
 
 const CUBE_COMPONENTS = ['dimensions', 'measures', 'segments', 'hierarchies', 'preAggregations', 'accessPolicy'];
 
@@ -382,7 +382,7 @@ describe('Schema Testing', () => {
 
   it('custom granularities in meta', async () => {
     const { compiler, metaTransformer } = prepareJsCompiler([
-      createCubeSchemaWithCustomGranularities('orders')
+      createCubeSchemaWithCustomGranularitiesAndTimeShift('orders')
     ]);
     await compiler.compile();
 
@@ -521,6 +521,17 @@ describe('Schema Testing', () => {
   });
 
   describe('Views', () => {
+    it('extends custom granularities and timeshifts', async () => {
+      const { compiler, metaTransformer } = prepareJsCompiler([
+        createCubeSchemaWithCustomGranularitiesAndTimeShift('orders')
+      ]);
+      await compiler.compile();
+
+      const { measures, dimensions } = metaTransformer.cubeEvaluator.evaluatedCubes.orders_view;
+      expect(dimensions.createdAt).toMatchSnapshot();
+      expect(measures.count_shifted_year).toMatchSnapshot();
+    });
+
     it('throws errors for incorrect referenced includes members', async () => {
       const orders = fs.readFileSync(
         path.join(process.cwd(), '/test/unit/fixtures/orders.js'),

packages/cubejs-schema-compiler/test/unit/utils.ts

@@ -224,7 +224,7 @@ export function createCubeSchemaWithAccessPolicy(name: string, extraPolicies: st
   `;
 }
 
-export function createCubeSchemaWithCustomGranularities(name: string): string {
+export function createCubeSchemaWithCustomGranularitiesAndTimeShift(name: string): string {
   return `cube('${name}', {
         sql: 'select * from orders',
         public: true,
@@ -293,6 +293,15 @@ export function createCubeSchemaWithCustomGranularities(name: string): string {
           count: {
             type: 'count'
           },
+          count_shifted_year: {
+            type: 'count',
+            multiStage: true,
+            timeShift: [{
+              timeDimension: \`createdAt\`,
+              interval: '1 year',
+              type: 'prior'
+            }]
+          },
           rollingCountByTrailing2Day: {
             type: 'count',
             rollingWindow: {