fix: bugs

novuhq · scopsy · Dec 4, 2024 · Dec 4, 2024 · Dec 4, 2024 · Dec 4, 2024
commit 29457498aceff4f1e550b915185c0b0a62d85340
diff --git a/apps/api/mixpanel-inbox-cache.json b/apps/api/mixpanel-inbox-cache.json
diff --git a/apps/api/mixpanel-insights-cache.json b/apps/api/mixpanel-insights-cache.json
diff --git a/apps/api/src/app/insights/services/metrics-calculator.service.ts b/apps/api/src/app/insights/services/metrics-calculator.service.ts
@@ -9,6 +9,7 @@ import {
   IMixpanelResponse,
   IMetricStats,
   MixpanelSeriesNameEnum,
+  IChannelData,
 } from '../types/usage-insights.types';
 
 @Injectable()
@@ -59,65 +60,74 @@ export class MetricsCalculatorService {
     Logger.debug(`Calculating inbox metrics for organization: ${orgId}`);
     const getMetricStats = (
       currentSeriesData: ISeriesData | undefined,
-      previousSeriesData: ISeriesData | undefined,
-      orgKey: string
+      previousSeriesData: ISeriesData | undefined
     ): IMetricStats => {
       if (!currentSeriesData || !previousSeriesData) {
-        Logger.debug(`No series data available for ${orgKey}`);
+        Logger.debug(`No series data available for ${orgId}`);
+
+        return { current: 0, previous: 0, change: 0 };
+      }
+
+      const currentOrgData = currentSeriesData[orgId];
+      const previousOrgData = previousSeriesData[orgId];
+
+      if (!currentOrgData || !previousOrgData) {
+        Logger.debug(`No series data available for ${orgId}`);
 
         return { current: 0, previous: 0, change: 0 };
       }
 
-      const currentData = currentSeriesData[orgKey];
-      const previousData = previousSeriesData[orgKey];
+      const currentData = currentOrgData[this.roundToStartOfDay(dateRange.to_date)];
+      const previousData = previousOrgData[this.roundToStartOfDay(dateRange.from_date)];
+
+      console.log(currentOrgData, 'HIII', this.roundToStartOfDay(dateRange.to_date));
+      console.log(previousOrgData, 'HIII', this.roundToStartOfDay(dateRange.from_date));
+
       if (!currentData || !previousData) {
-        Logger.debug(`No data available for ${orgKey}`);
+        Logger.debug(`No data available for ${orgId}`);
 
         return { current: 0, previous: 0, change: 0 };
       }
 
-      const current = Number(Object.values(currentData)[0] || 0);
-      const previous = Number(Object.values(previousData)[0] || 0);
+      const current = Number(currentData || 0);
+      const previous = Number(previousData || 0);
       const change = this.calculateChange(current, previous);
 
-      Logger.debug(`Metric stats for ${orgKey}: current=${current}, previous=${previous}, change=${change}%`);
+      Logger.debug(`Metric stats for ${orgId}: current=${current}, previous=${previous}, change=${change}%`);
 
       return { current, previous, change };
     };
 
     return {
       sessionInitialized: getMetricStats(
         inboxSeries[MixpanelSeriesNameEnum.INBOX_SESSION_INITIALIZED],
-        inboxTimeComparison[MixpanelSeriesNameEnum.INBOX_SESSION_INITIALIZED],
-        orgId
+        inboxTimeComparison[MixpanelSeriesNameEnum.INBOX_SESSION_INITIALIZED]
       ),
       updatePreferences: getMetricStats(
         inboxSeries[MixpanelSeriesNameEnum.INBOX_UPDATE_PREFERENCES],
-        inboxTimeComparison[MixpanelSeriesNameEnum.INBOX_UPDATE_PREFERENCES],
-        orgId
+        inboxTimeComparison[MixpanelSeriesNameEnum.INBOX_UPDATE_PREFERENCES]
       ),
       markNotification: getMetricStats(
         inboxSeries[MixpanelSeriesNameEnum.INBOX_MARK_NOTIFICATION],
-        inboxTimeComparison[MixpanelSeriesNameEnum.INBOX_MARK_NOTIFICATION],
-        orgId
+        inboxTimeComparison[MixpanelSeriesNameEnum.INBOX_MARK_NOTIFICATION]
       ),
       updateAction: getMetricStats(
         inboxSeries[MixpanelSeriesNameEnum.INBOX_UPDATE_ACTION],
-        inboxTimeComparison[MixpanelSeriesNameEnum.INBOX_UPDATE_ACTION],
-        orgId
+        inboxTimeComparison[MixpanelSeriesNameEnum.INBOX_UPDATE_ACTION]
       ),
     };
   }
 
   calculateOverallInboxMetrics(
+    orgId: string,
     inboxSeries: IInboxResponse['series'],
     inboxTimeComparison: IInboxResponse['time_comparison']['series']
   ): IInboxMetrics {
     Logger.debug('Calculating overall inbox metrics');
 
     const getMetricStats = (
-      currentSeriesData: ISeriesData | undefined,
-      previousSeriesData: ISeriesData | undefined
+      currentSeriesData: IChannelData | undefined,
+      previousSeriesData: IChannelData | undefined
     ): IMetricStats => {
       if (!currentSeriesData?.$overall || !previousSeriesData?.$overall) {
         return { current: 0, previous: 0, change: 0 };
@@ -132,20 +142,20 @@ export class MetricsCalculatorService {
 
     return {
       sessionInitialized: getMetricStats(
-        inboxSeries[MixpanelSeriesNameEnum.INBOX_SESSION_INITIALIZED],
-        inboxTimeComparison[MixpanelSeriesNameEnum.INBOX_SESSION_INITIALIZED]
+        inboxSeries[MixpanelSeriesNameEnum.INBOX_SESSION_INITIALIZED][orgId],
+        inboxTimeComparison[MixpanelSeriesNameEnum.INBOX_SESSION_INITIALIZED][orgId]
       ),
       updatePreferences: getMetricStats(
-        inboxSeries[MixpanelSeriesNameEnum.INBOX_UPDATE_PREFERENCES],
-        inboxTimeComparison[MixpanelSeriesNameEnum.INBOX_UPDATE_PREFERENCES]
+        inboxSeries[MixpanelSeriesNameEnum.INBOX_UPDATE_PREFERENCES][orgId],
+        inboxTimeComparison[MixpanelSeriesNameEnum.INBOX_UPDATE_PREFERENCES][orgId]
       ),
       markNotification: getMetricStats(
-        inboxSeries[MixpanelSeriesNameEnum.INBOX_MARK_NOTIFICATION],
-        inboxTimeComparison[MixpanelSeriesNameEnum.INBOX_MARK_NOTIFICATION]
+        inboxSeries[MixpanelSeriesNameEnum.INBOX_MARK_NOTIFICATION][orgId],
+        inboxTimeComparison[MixpanelSeriesNameEnum.INBOX_MARK_NOTIFICATION][orgId]
       ),
       updateAction: getMetricStats(
-        inboxSeries[MixpanelSeriesNameEnum.INBOX_UPDATE_ACTION],
-        inboxTimeComparison[MixpanelSeriesNameEnum.INBOX_UPDATE_ACTION]
+        inboxSeries[MixpanelSeriesNameEnum.INBOX_UPDATE_ACTION][orgId],
+        inboxTimeComparison[MixpanelSeriesNameEnum.INBOX_UPDATE_ACTION][orgId]
       ),
     };
   }
@@ -197,23 +207,17 @@ export class MetricsCalculatorService {
   }
 
   calculateWorkflowStats(
+    orgId: string,
     subscriberSeries: ISeriesData,
     subscriberTimeComparison: ISeriesData
   ): IMixpanelResponse['workflowStats'] {
     Logger.debug('Calculating workflow statistics');
     const workflowStats: IMixpanelResponse['workflowStats'] = { workflows: {} };
 
-    const firstOrgId = Object.keys(subscriberSeries).find((key) => key !== '$overall');
-    if (!firstOrgId) {
-      Logger.debug('No organization data found for workflow stats');
-
-      return workflowStats;
-    }
-
-    const orgData = subscriberSeries[firstOrgId]?.undefined;
-    const orgPreviousData = subscriberTimeComparison[firstOrgId]?.undefined;
+    const orgData = subscriberSeries[orgId]?.undefined;
+    const orgPreviousData = subscriberTimeComparison[orgId]?.undefined;
     if (!orgData || !orgPreviousData) {
-      Logger.debug(`No workflow data found for organization: ${firstOrgId}`);
+      Logger.debug(`No workflow data found for organization: ${orgId}`);
 
       return workflowStats;
     }

diff --git a/apps/api/src/app/insights/services/mixpanel.service.ts b/apps/api/src/app/insights/services/mixpanel.service.ts
@@ -101,6 +101,7 @@ export class MixpanelService {
 
     try {
       Logger.debug('Making Mixpanel API request for inbox insights');
+
       const response = await axios.get<IInboxResponse>('https://mixpanel.com/api/2.0/insights', {
         params: {
           project_id: '2667883',

diff --git a/apps/api/src/app/insights/services/organization-notification.service.ts b/apps/api/src/app/insights/services/organization-notification.service.ts
@@ -54,6 +54,7 @@ export class OrganizationNotificationService {
           email: `dima+testing-${organization._id}@novu.co`,
         },
         payload: {
+          organizationName: organization.name,
           period: {
             current: dateRange.to_date,
             previous: dateRange.from_date,
@@ -63,6 +64,8 @@ export class OrganizationNotificationService {
             email: metrics.channelBreakdown.email || { current: 0, previous: 0, change: 0 },
             sms: metrics.channelBreakdown.sms || { current: 0, previous: 0, change: 0 },
             push: metrics.channelBreakdown.push || { current: 0, previous: 0, change: 0 },
+            inApp: metrics.channelBreakdown.in_app || { current: 0, previous: 0, change: 0 },
+            chat: metrics.channelBreakdown.chat || { current: 0, previous: 0, change: 0 },
           },
           inboxMetrics: {
             sessionInitialized: metrics.inboxMetrics?.sessionInitialized,

diff --git a/apps/api/src/app/insights/usecases/usage-insights/usage-insights.usecase.ts b/apps/api/src/app/insights/usecases/usage-insights/usage-insights.usecase.ts
@@ -46,33 +46,25 @@ export class UsageInsights {
       return null;
     }
 
-    const seriesDateRange = {
-      from_date: mixpanelData.time_comparison.date_range.from_date,
-      to_date: mixpanelData.date_range.to_date,
-    };
-
-    const workflowStats = this.metricsCalculator.calculateWorkflowStats(subscriberSeries, subscriberTimeComparison);
-    mixpanelData.workflowStats = workflowStats;
-
-    const defaultInboxMetrics: IInboxMetrics = {
-      sessionInitialized: { current: 0, previous: 0, change: 0 },
-      updatePreferences: { current: 0, previous: 0, change: 0 },
-      markNotification: { current: 0, previous: 0, change: 0 },
-      updateAction: { current: 0, previous: 0, change: 0 },
-    };
-
-    Logger.debug('Initializing inbox stats');
-    const inboxStats: IUsageInsightsResponse['inboxStats'] = {
-      byOrganization: {},
-      overall: inboxData?.series
-        ? this.metricsCalculator.calculateOverallInboxMetrics(inboxData.series, inboxData.time_comparison.series)
-        : defaultInboxMetrics,
-    };
-
     Logger.debug('Processing organization data');
     for (const [orgId, orgData] of Object.entries(workflowSeries)) {
       if (orgId === '$overall') continue;
 
+      const workflowStats = this.metricsCalculator.calculateWorkflowStats(
+        orgId,
+        subscriberSeries,
+        subscriberTimeComparison
+      );
+      mixpanelData.workflowStats = workflowStats;
+
+      const defaultInboxMetrics: IInboxMetrics = {
+        sessionInitialized: { current: 0, previous: 0, change: 0 },
+        updatePreferences: { current: 0, previous: 0, change: 0 },
+        markNotification: { current: 0, previous: 0, change: 0 },
+        updateAction: { current: 0, previous: 0, change: 0 },
+      };
+
+      Logger.debug('Initializing inbox stats');
       Logger.debug(`Processing metrics for organization: ${orgId}`);
       const metrics = this.metricsCalculator.createOrganizationMetrics(
         orgId,
@@ -103,25 +95,23 @@ export class UsageInsights {
           inboxData.series,
           inboxData.time_comparison.series,
           orgId,
-          seriesDateRange
+          {
+            from_date: inboxData.time_comparison.date_range.from_date,
+            to_date: inboxData.date_range.from_date,
+          }
         );
         metrics.inboxMetrics = inboxMetrics;
-        inboxStats.byOrganization[orgId] = inboxMetrics;
       } else {
         Logger.debug(`Using default inbox metrics for organization: ${orgId}`);
         metrics.inboxMetrics = defaultInboxMetrics;
-        inboxStats.byOrganization[orgId] = defaultInboxMetrics;
       }
 
-      await this.organizationNotification.sendOrganizationNotification(metrics, workflowStats, seriesDateRange);
+      await this.organizationNotification.sendOrganizationNotification(metrics, workflowStats, {
+        from_date: mixpanelData.time_comparison.date_range.from_date,
+        to_date: mixpanelData.date_range.to_date,
+      });
     }
 
     Logger.debug('UsageInsights execution completed successfully');
-
-    return {
-      series: mixpanelData.series,
-      workflowStats: mixpanelData.workflowStats,
-      inboxStats,
-    };
   }
 }
diff --git a/libs/notifications/src/workflows/usage-insights/email.tsx b/libs/notifications/src/workflows/usage-insights/email.tsx
@@ -94,10 +94,10 @@ function ChannelBreakdown({ channels }: { channels: IUsageEmailData['channelBrea
         </Column>
         <Column className="p-2">
           <MetricCard
-            title="SMS"
-            current={channels.sms.current}
-            previous={channels.sms.previous}
-            change={channels.sms.change}
+            title="Inbox"
+            current={channels.inApp.current}
+            previous={channels.inApp.previous}
+            change={channels.inApp.change}
           />
         </Column>
         <Column className="p-2 pr-0">
@@ -114,6 +114,17 @@ function ChannelBreakdown({ channels }: { channels: IUsageEmailData['channelBrea
 }
 
 function InboxMetrics({ metrics }: { metrics: IUsageEmailData['inboxMetrics'] }) {
+  if (
+    !metrics.markNotification.current &&
+    !metrics.markNotification.previous &&
+    !metrics.sessionInitialized.current &&
+    !metrics.sessionInitialized.previous &&
+    !metrics.updatePreferences.previous &&
+    !metrics.updatePreferences.current
+  ) {
+    return null;
+  }
+
   return (
     <Section className="mt-6">
       <SectionHeader title="Inbox Activity" />

diff --git a/libs/notifications/src/workflows/usage-insights/usage-insights.workflow.ts b/libs/notifications/src/workflows/usage-insights/usage-insights.workflow.ts
@@ -3,7 +3,6 @@ import { workflow } from '@novu/framework';
 import { z } from 'zod';
 import UsageInsightsEmail from './email';
 import { IUsageEmailData } from './types';
-import { sampleUsageData } from './sample-data';
 
 const marketingLinkSchema = z
   .object({
@@ -75,30 +74,32 @@ export const usageInsightsWorkflow = workflow(
     name: 'Usage Insights',
     payloadSchema: z
       .object({
-        organizationName: z.string().default(sampleUsageData.organizationName),
+        organizationName: z.string(),
         period: z
           .object({
-            current: z.string().default(sampleUsageData.period.current),
-            previous: z.string().default(sampleUsageData.period.previous),
+            current: z.string(),
+            previous: z.string(),
           })
           .required(),
-        subscriberNotifications: channelMetricsSchema.default(sampleUsageData.subscriberNotifications),
+        subscriberNotifications: channelMetricsSchema,
         channelBreakdown: z
           .object({
-            email: channelMetricsSchema.default(sampleUsageData.channelBreakdown.email),
-            sms: channelMetricsSchema.default(sampleUsageData.channelBreakdown.sms),
-            push: channelMetricsSchema.default(sampleUsageData.channelBreakdown.push),
+            email: channelMetricsSchema,
+            sms: channelMetricsSchema,
+            push: channelMetricsSchema,
+            inApp: channelMetricsSchema,
+            chat: channelMetricsSchema,
           })
           .required(),
         inboxMetrics: z
           .object({
-            sessionInitialized: channelMetricsSchema.default(sampleUsageData.inboxMetrics.sessionInitialized),
-            updatePreferences: channelMetricsSchema.default(sampleUsageData.inboxMetrics.updatePreferences),
-            markNotification: channelMetricsSchema.default(sampleUsageData.inboxMetrics.markNotification),
-            updateAction: channelMetricsSchema.default(sampleUsageData.inboxMetrics.updateAction),
+            sessionInitialized: channelMetricsSchema,
+            updatePreferences: channelMetricsSchema,
+            markNotification: channelMetricsSchema,
+            updateAction: channelMetricsSchema,
           })
           .required(),
-        workflowStats: z.record(z.string(), channelMetricsSchema).default(sampleUsageData.workflowStats),
+        workflowStats: z.record(z.string(), channelMetricsSchema),
       })
       .required(),
   }