fix(api): empty metrics digest

sweetr-dev · Jan 30, 2025 · 2bd655d · 2bd655d
1 parent ad084c2
commit 2bd655d
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 14 deletions.
diff --git a/apps/api/src/app/digests/services/digest-team-metrics.service.ts b/apps/api/src/app/digests/services/digest-team-metrics.service.ts
@@ -66,6 +66,7 @@ const getTeamMetrics = async (digest: DigestWithRelations) => {
   const { latest, previous } = getChartFilters(digest);
 
   const latestResults: Record<DigestMetricType, number> = await all({
+    prCount: averageMetricsService.getPullRequestCount(latest),
     cycleTime: averageMetricsService.getAverageCycleTime(latest),
     timeForFirstReview:
       averageMetricsService.getAverageTimeForFirstReview(latest),
@@ -75,6 +76,7 @@ const getTeamMetrics = async (digest: DigestWithRelations) => {
   });
 
   const previousResults: Record<DigestMetricType, number> = await all({
+    prCount: averageMetricsService.getPullRequestCount(previous),
     cycleTime: averageMetricsService.getAverageCycleTime(previous),
     timeForFirstReview:
       averageMetricsService.getAverageTimeForFirstReview(previous),
@@ -114,6 +116,7 @@ const getTeamMetrics = async (digest: DigestWithRelations) => {
   };
 
   return {
+    ...buildMetric("prCount"),
     ...buildMetric("cycleTime"),
     ...buildMetric("timeForFirstReview"),
     ...buildMetric("timeForApproval"),
@@ -153,7 +156,7 @@ const getDigestMessageBlocks = async (
           elements: [
             {
               type: "text",
-              text: `Avg of ${format(new UTCDate(latest.startDate), "MMM dd")}—${format(new UTCDate(latest.endDate), "MMM dd")} (vs ${format(new UTCDate(previous.startDate), "MMM dd")}—${format(new UTCDate(previous.endDate), "MMM dd")})`,
+              text: `Avg of ${format(new UTCDate(latest.startDate), "MMM dd")}—${format(new UTCDate(latest.endDate), "MMM dd")} (vs ${format(new UTCDate(previous.startDate), "MMM dd")}—${format(new UTCDate(previous.endDate), "MMM dd")}) • ${metrics.prCount.latest.value} PRs from current period analyzed`,
             },
           ],
         },
@@ -193,7 +196,7 @@ const getDigestMessageBlocks = async (
           type: "rich_text_section",
           elements: getMetricLineElements({
             label: "⏱️ PR Cycle Time",
-            value: `${formatMsDuration(Number(metrics.cycleTime.latest.value), dateFormatter)}`,
+            value: `${formatMsDuration(Number(metrics.cycleTime.latest.value), dateFormatter) || "N/A"}`,
             change: metrics.cycleTime.change,
           }),
         },
@@ -204,32 +207,38 @@ const getDigestMessageBlocks = async (
               type: "rich_text_section",
               elements: getMetricLineElements({
                 label: "Time to First Review",
-                value: `${formatMsDuration(
-                  Number(metrics.timeForFirstReview.latest.value),
-                  dateFormatter
-                )}`,
+                value: `${
+                  formatMsDuration(
+                    Number(metrics.timeForFirstReview.latest.value),
+                    dateFormatter
+                  ) || "N/A"
+                }`,
                 change: metrics.timeForFirstReview.change,
               }),
             },
             {
               type: "rich_text_section",
               elements: getMetricLineElements({
                 label: "Time to Approve",
-                value: `${formatMsDuration(
-                  Number(metrics.timeForApproval.latest.value),
-                  dateFormatter
-                )}`,
+                value: `${
+                  formatMsDuration(
+                    Number(metrics.timeForApproval.latest.value),
+                    dateFormatter
+                  ) || "N/A"
+                }`,
                 change: metrics.timeForApproval.change,
               }),
             },
             {
               type: "rich_text_section",
               elements: getMetricLineElements({
                 label: "Time to Merge",
-                value: `${formatMsDuration(
-                  Number(metrics.timeToMerge.latest.value),
-                  dateFormatter
-                )}`,
+                value: `${
+                  formatMsDuration(
+                    Number(metrics.timeToMerge.latest.value),
+                    dateFormatter
+                  ) || "N/A"
+                }`,
                 change: metrics.timeToMerge.change,
               }),
             },

diff --git a/apps/api/src/app/digests/services/digest-team-metrics.types.ts b/apps/api/src/app/digests/services/digest-team-metrics.types.ts
@@ -5,6 +5,7 @@ export interface MetricLineElements {
 }
 
 export type DigestMetricType =
+  | "prCount"
   | "timeToMerge"
   | "timeForFirstReview"
   | "timeForApproval"

diff --git a/apps/api/src/app/metrics/services/average-metrics.service.ts b/apps/api/src/app/metrics/services/average-metrics.service.ts
@@ -109,3 +109,22 @@ export const getAveragePullRequestSize = async (
 
   return results.at(0)?.value || 0;
 };
+
+export const getPullRequestCount = async (filters: AverageMetricFilters) => {
+  const query = Prisma.sql`
+      SELECT COUNT(*) AS value
+      FROM "PullRequestTracking" pt
+      ${innerJoinClause}
+      WHERE p."mergedAt" >= ${new Date(filters.startDate)}
+        AND p."mergedAt" <= ${new Date(filters.endDate)}
+        AND p."mergedAt" IS NOT NULL
+        AND tm."teamId" = ${filters.teamId}
+        AND wm."workspaceId" = ${filters.workspaceId}
+    `;
+
+  const results = await getPrisma(filters.workspaceId).$queryRaw<
+    { value: number }[]
+  >(query);
+
+  return results.at(0)?.value || 0;
+};