fix: convert to kysely queries

packages/lib/server-only/user/get-monthly-completed-document.ts

@@ -1,28 +1,19 @@
-import { sql } from 'kysely';
 import { DateTime } from 'luxon';
 
-import { kyselyPrisma } from '@documenso/prisma';
+import { kyselyPrisma, sql } from '@documenso/prisma';
 import { DocumentStatus } from '@documenso/prisma/client';
 
-export type GetCompletedDocumentsMonthlyResult = Array<{
-  month: string;
-  count: number;
-  cume_count: number;
-}>;
-
 export const getCompletedDocumentsMonthly = async () => {
   const qb = kyselyPrisma.$kysely
     .selectFrom('Document')
-    .select(({ fn, ref }) => [
+    .select(({ fn }) => [
-      fn<Date>('DATE_TRUNC', [sql.lit('MONTH'), ref('Document.updatedAt')]).as('month'),
+      fn<Date>('DATE_TRUNC', [sql.lit('MONTH'), 'Document.updatedAt']).as('month'),
       fn.count('id').as('count'),
       fn
         .sum(fn.count('id'))
         // Feels like a bug in the Kysely extension but I just can not do this orderBy in a type-safe manner
         // eslint-disable-next-line @typescript-eslint/consistent-type-assertions, @typescript-eslint/no-explicit-any
-        .over((ob) =>
+        .over((ob) => ob.orderBy(fn('DATE_TRUNC', [sql.lit('MONTH'), 'Document.updatedAt']) as any))
-          ob.orderBy(fn('DATE_TRUNC', [sql.lit('MONTH'), ref('Document.updatedAt')]) as any),
-        )
         .as('cume_count'),
     ])
     .where(() => sql`"Document"."status" = ${DocumentStatus.COMPLETED}::"DocumentStatus"`)

packages/lib/server-only/user/get-user-monthly-growth.ts

@@ -1,30 +1,25 @@
 import { DateTime } from 'luxon';
 
-import { prisma } from '@documenso/prisma';
+import { kyselyPrisma, sql } from '@documenso/prisma';
-
-export type GetUserMonthlyGrowthResult = Array<{
-  month: string;
-  count: number;
-  cume_count: number;
-}>;
-
-type GetUserMonthlyGrowthQueryResult = Array<{
-  month: Date;
-  count: bigint;
-  cume_count: bigint;
-}>;
 
 export const getUserMonthlyGrowth = async () => {
-  const result = await prisma.$queryRaw<GetUserMonthlyGrowthQueryResult>`
+  const qb = kyselyPrisma.$kysely
-    SELECT
+    .selectFrom('User')
-      DATE_TRUNC('month', "createdAt") AS "month",
+    .select(({ fn }) => [
-      COUNT("id") as "count",
+      fn<Date>('DATE_TRUNC', [sql.lit('MONTH'), 'User.createdAt']).as('month'),
-      SUM(COUNT("id")) OVER (ORDER BY DATE_TRUNC('month', "createdAt")) as "cume_count"
+      fn.count('id').as('count'),
-    FROM "User"
+      fn
-    GROUP BY "month"
+        .sum(fn.count('id'))
-    ORDER BY "month" DESC
+        // Feels like a bug in the Kysely extension but I just can not do this orderBy in a type-safe manner
-    LIMIT 12
+        // eslint-disable-next-line @typescript-eslint/consistent-type-assertions, @typescript-eslint/no-explicit-any
-  `;
+        .over((ob) => ob.orderBy(fn('DATE_TRUNC', [sql.lit('MONTH'), 'User.createdAt']) as any))
+        .as('cume_count'),
+    ])
+    .groupBy('month')
+    .orderBy('month', 'desc')
+    .limit(12);
+
+  const result = await qb.execute();
 
   return result.map((row) => ({
     month: DateTime.fromJSDate(row.month).toFormat('yyyy-MM'),

packages/prisma/index.ts

@@ -29,3 +29,5 @@ export const kyselyPrisma = remember('kyselyPrisma', () =>
     }),
   ),
 );
+
+export { sql } from 'kysely';