Cubejs preaggregations dimension updates (#386)

Author: epipav

backend/src/cubejs/schema/Activities.js

@@ -10,6 +10,8 @@ cube(`Activities`, {
         Members.score,
         Members.location,
         Members.tenantId,
+        Members.isTeamMember,
+        Members.isBot,
         Activities.tenantId,
       ],
       timeDimension: Activities.date,

backend/src/cubejs/schema/Members.js

@@ -15,7 +15,14 @@ cube(`Members`, {
   preAggregations: {
     ActiveMembers: {
       measures: [Members.count],
-      dimensions: [Members.score, Members.location, Members.tenantId, Tags.name],
+      dimensions: [
+        Members.score,
+        Members.location,
+        Members.tenantId,
+        Tags.name,
+        Members.isTeamMember,
+        Members.isBot,
+      ],
       timeDimension: Members.joinedAt,
       granularity: `day`,
       refreshKey: {
@@ -25,7 +32,13 @@ cube(`Members`, {
 
     MembersActivities: {
       measures: [Members.count],
-      dimensions: [Members.tenantId, Activities.platform, Activities.type],
+      dimensions: [
+        Members.tenantId,
+        Activities.platform,
+        Activities.type,
+        Members.isTeamMember,
+        Members.isBot,
+      ],
       timeDimension: Members.joinedAt,
       granularity: `day`,
       refreshKey: {
@@ -35,7 +48,7 @@ cube(`Members`, {
 
     MembersTags: {
       measures: [Members.count],
-      dimensions: [Members.tenantId, Tags.name],
+      dimensions: [Members.tenantId, Tags.name, Members.isTeamMember, Members.isBot],
       timeDimension: Members.joinedAt,
       granularity: `day`,
       refreshKey: {

backend/src/cubejs/schema/Organizations.js

@@ -4,13 +4,13 @@ cube(`Organizations`, {
   preAggregations: {
     activeOrganizations: {
       measures: [Organizations.count],
-      dimensions: [Organizations.tenantId],
+      dimensions: [Organizations.tenantId, Members.isTeamMember, Members.isBot],
       timeDimension: Activities.date,
       granularity: `day`,
     },
     newOrganizations: {
       measures: [Organizations.count],
-      dimensions: [Organizations.tenantId],
+      dimensions: [Organizations.tenantId, Members.isTeamMember, Members.isBot],
       timeDimension: Organizations.joinedAt,
       granularity: `day`,
     },

backend/src/services/__tests__/tenantService.test.ts

@@ -146,16 +146,15 @@ describe('TenantService tests', () => {
 
       tenantCreatedPlain.createdAt = tenantCreatedPlain.createdAt.toISOString().split('T')[0]
       tenantCreatedPlain.updatedAt = tenantCreatedPlain.updatedAt.toISOString().split('T')[0]
+      tenantCreatedPlain.trialEndsAt = tenantCreatedPlain.trialEndsAt.toISOString().split('T')[0]
 
       const tenantExpected = {
         id: tenantCreatedPlain.id,
         name: 'testName',
         url: 'testUrl',
         plan: Plans.values.growth,
         isTrialPlan: true,
-        trialEndsAt: moment().add(14, 'days').isAfter('2023-01-15')
-          ? moment().add(14, 'days').toISOString()
-          : new Date('2023-01-15T00:00:00.000Z'),
+        trialEndsAt: moment().add(14, 'days').toISOString().split('T')[0],
         planStatus: 'active',
         planStripeCustomerId: null,
         planUserId: null,