Merge branch 'oauth' of github.com:yeganathan18/crowd.dev into oauth

CrowdDotDev · Jul 10, 2023 · 4ad459b · 4ad459b
2 parents 195e3bb + b3ca528
commit 4ad459b
Show file tree

Hide file tree

Showing 3 changed files with 71 additions and 10 deletions.
diff --git a/backend/src/cubejs/schema/Members.js b/backend/src/cubejs/schema/Members.js
@@ -28,6 +28,7 @@ cube(`Members`, {
         Members.isBot,
         Members.isOrganization,
         Segments.id,
+        Activities.platform,
       ],
       timeDimension: Members.joinedAt,
       granularity: `day`,
@@ -36,17 +37,54 @@ cube(`Members`, {
       },
     },
 
-    ActiveMembers: {
+    MembersByJoinedAtPure: {
       measures: [Members.count],
       dimensions: [
         Members.score,
         Members.location,
         Members.tenantId,
+        Members.isTeamMember,
+        Members.isBot,
+        Members.isOrganization,
+        Segments.id,
+      ],
+      timeDimension: Members.joinedAt,
+      granularity: `day`,
+      refreshKey: {
+        every: `10 minute`,
+      },
+    },
+
+    MembersByJoinedAtTags: {
+      measures: [Members.count],
+      dimensions: [
+        Members.score,
+        Members.location,
+        Members.tenantId,
+        Members.isTeamMember,
+        Members.isBot,
+        Members.isOrganization,
+        Segments.id,
         Tags.name,
+      ],
+      timeDimension: Members.joinedAt,
+      granularity: `day`,
+      refreshKey: {
+        every: `10 minute`,
+      },
+    },
+
+    MembersByJoinedAtPlatform: {
+      measures: [Members.count],
+      dimensions: [
+        Members.score,
+        Members.location,
+        Members.tenantId,
         Members.isTeamMember,
         Members.isBot,
         Members.isOrganization,
         Segments.id,
+        Activities.platform,
       ],
       timeDimension: Members.joinedAt,
       granularity: `day`,
@@ -55,9 +93,11 @@ cube(`Members`, {
       },
     },
 
-    MembersActivities: {
+    MembersByActivityPure: {
       measures: [Members.count],
       dimensions: [
+        Members.score,
+        Members.location,
         Members.tenantId,
         Members.isTeamMember,
         Members.isBot,
@@ -71,16 +111,17 @@ cube(`Members`, {
       },
     },
 
-    MActivitiesDupDimensions: {
+    MembersByActivityPlatform: {
       measures: [Members.count],
       dimensions: [
+        Members.score,
+        Members.location,
         Members.tenantId,
-        Activities.platform,
-        Activities.type,
         Members.isTeamMember,
         Members.isBot,
         Members.isOrganization,
         Segments.id,
+        Activities.platform,
       ],
       timeDimension: Activities.date,
       granularity: `day`,
@@ -89,17 +130,19 @@ cube(`Members`, {
       },
     },
 
-    MembersTags: {
+    MembersByActivityActivityType: {
       measures: [Members.count],
       dimensions: [
+        Members.score,
+        Members.location,
         Members.tenantId,
-        Tags.name,
         Members.isTeamMember,
         Members.isBot,
         Members.isOrganization,
         Segments.id,
+        Activities.type,
       ],
-      timeDimension: Members.joinedAt,
+      timeDimension: Activities.date,
       granularity: `day`,
       refreshKey: {
         every: `10 minute`,

diff --git a/backend/src/cubejs/schema/Organizations.js b/backend/src/cubejs/schema/Organizations.js
@@ -5,13 +5,25 @@ cube(`Organizations`, {
   preAggregations: {
     newOrganizations: {
       measures: [Organizations.count],
-      dimensions: [Organizations.tenantId, Members.isTeamMember, Members.isBot, Segments.id],
+      dimensions: [
+        Organizations.tenantId,
+        Members.isTeamMember,
+        Members.isBot,
+        Segments.id,
+        Activities.platform,
+      ],
       timeDimension: Organizations.joinedAt,
       granularity: `day`,
     },
     activeOrganizations: {
       measures: [Organizations.count],
-      dimensions: [Organizations.tenantId, Members.isTeamMember, Members.isBot, Segments.id],
+      dimensions: [
+        Organizations.tenantId,
+        Members.isTeamMember,
+        Members.isBot,
+        Segments.id,
+        Activities.platform,
+      ],
       timeDimension: Activities.date,
       granularity: `day`,
     },

diff --git a/backend/src/services/premium/enrichment/memberEnrichmentService.ts b/backend/src/services/premium/enrichment/memberEnrichmentService.ts
@@ -300,6 +300,12 @@ export default class MemberEnrichmentService extends LoggerBase {
           organization.location = organizationsByWorkExperience[0].location
           organization.linkedin = organizationsByWorkExperience[0].companyLinkedInUrl
           organization.url = organizationsByWorkExperience[0].companyUrl
+
+          // fetch jobTitle from most recent work experience
+          member.attributes.jobTitle = {
+            custom: organizationsByWorkExperience[0].title,
+            default: organizationsByWorkExperience[0].title,
+          }
         }
       }