From a8752098f654c866adbed6f1f6a1da6c32afbf6a Mon Sep 17 00:00:00 2001
From: Ephraim Atta-Duncan <ephraimduncan68@gmail.com>
Date: Thu, 21 Mar 2024 00:48:49 +0000
Subject: [PATCH] fix: invalid datetime on graph

---
 ...rt copy.tsx => monthly-completed-documents-chart.tsx} | 2 +-
 apps/marketing/src/app/(marketing)/open/page.tsx         | 9 +++++----
 .../server-only/user/get-monthly-completed-document.ts   | 4 ++--
 3 files changed, 8 insertions(+), 7 deletions(-)
 rename apps/marketing/src/app/(marketing)/open/{monthly-completed-documents-chart copy.tsx => monthly-completed-documents-chart.tsx} (97%)

diff --git a/apps/marketing/src/app/(marketing)/open/monthly-completed-documents-chart copy.tsx b/apps/marketing/src/app/(marketing)/open/monthly-completed-documents-chart.tsx
similarity index 97%
rename from apps/marketing/src/app/(marketing)/open/monthly-completed-documents-chart copy.tsx
rename to apps/marketing/src/app/(marketing)/open/monthly-completed-documents-chart.tsx
index ce438145b..4efd31e76 100644
--- a/apps/marketing/src/app/(marketing)/open/monthly-completed-documents-chart copy.tsx	
+++ b/apps/marketing/src/app/(marketing)/open/monthly-completed-documents-chart.tsx
@@ -47,7 +47,7 @@ export const MonthlyCompletedDocumentsChart = ({
               fill="hsl(var(--primary))"
               radius={[4, 4, 0, 0]}
               maxBarSize={60}
-              label="Total Users"
+              label="Monthly Completed Documents"
             />
           </BarChart>
         </ResponsiveContainer>
diff --git a/apps/marketing/src/app/(marketing)/open/page.tsx b/apps/marketing/src/app/(marketing)/open/page.tsx
index 4f2b0d857..02cf9302f 100644
--- a/apps/marketing/src/app/(marketing)/open/page.tsx
+++ b/apps/marketing/src/app/(marketing)/open/page.tsx
@@ -13,7 +13,7 @@ import { CallToAction } from '~/components/(marketing)/call-to-action';
 import { BarMetric } from './bar-metrics';
 import { CapTable } from './cap-table';
 import { FundingRaised } from './funding-raised';
-import { MonthlyCompletedDocumentsChart } from './monthly-completed-documents-chart copy';
+import { MonthlyCompletedDocumentsChart } from './monthly-completed-documents-chart';
 import { MonthlyNewUsersChart } from './monthly-new-users-chart';
 import { MonthlyTotalUsersChart } from './monthly-total-users-chart';
 import { TeamMembers } from './team-members';
@@ -133,17 +133,18 @@ export default async function OpenPage() {
     { total_count: mergedPullRequests },
     STARGAZERS_DATA,
     EARLY_ADOPTERS_DATA,
+    MONTHLY_USERS,
+    MONTHLY_COMPLETED_DOCUMENTS,
   ] = await Promise.all([
     fetchGithubStats(),
     fetchOpenIssues(),
     fetchMergedPullRequests(),
     fetchStargazers(),
     fetchEarlyAdopters(),
+    getUserMonthlyGrowth(),
+    getCompletedDocumentsMonthly(),
   ]);
 
-  const MONTHLY_USERS = await getUserMonthlyGrowth();
-  const MONTHLY_COMPLETED_DOCUMENTS = await getCompletedDocumentsMonthly();
-
   return (
     <div>
       <div className="mx-auto mt-6 max-w-screen-lg sm:mt-12">
diff --git a/packages/lib/server-only/user/get-monthly-completed-document.ts b/packages/lib/server-only/user/get-monthly-completed-document.ts
index ef1bcd4b9..644643bb3 100644
--- a/packages/lib/server-only/user/get-monthly-completed-document.ts
+++ b/packages/lib/server-only/user/get-monthly-completed-document.ts
@@ -17,9 +17,9 @@ type GetCompletedDocumentsMonthlyQueryResult = Array<{
 export const getCompletedDocumentsMonthly = async () => {
   const result = await prisma.$queryRaw<GetCompletedDocumentsMonthlyQueryResult>`
     SELECT
-      DATE_TRUNC('month', "completedAt") AS "month",
+      DATE_TRUNC('month', "updatedAt") AS "month",
       COUNT("id") as "count",
-      SUM(COUNT("id")) OVER (ORDER BY DATE_TRUNC('month', "completedAt")) as "cume_count"
+      SUM(COUNT("id")) OVER (ORDER BY DATE_TRUNC('month', "updatedAt")) as "cume_count"
     FROM "Document"
     WHERE "status" = 'COMPLETED'
     GROUP BY "month"