The Open Source DocuSign Alternative.
TypeScript digital-signaturedocument-signingdocusign-alternativee-signatureesignesignaturenext-authnextjsopen-sourcepades-standardpdfpdf-signpdf-signaturepostgresqlprismaself-hostedsigningtypescript
fix: convert to kysely queries
Mythieab949afbb6d1
diff --git a/packages/lib/server-only/user/get-monthly-completed-document.ts b/packages/lib/server-only/user/get-monthly-completed-document.tsindex fcc23622c..49b6d4786 100644--- a/packages/lib/server-only/user/get-monthly-completed-document.ts+++ b/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 }) => [- fn<Date>('DATE_TRUNC', [sql.lit('MONTH'), ref('Document.updatedAt')]).as('month'),+ .select(({ fn }) => [+ 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) =>- ob.orderBy(fn('DATE_TRUNC', [sql.lit('MONTH'), ref('Document.updatedAt')]) as any),- )+ .over((ob) => ob.orderBy(fn('DATE_TRUNC', [sql.lit('MONTH'), 'Document.updatedAt']) as any)).as('cume_count'),]).where(() => sql`"Document"."status" = ${DocumentStatus.COMPLETED}::"DocumentStatus"`)diff --git a/packages/lib/server-only/user/get-user-monthly-growth.ts b/packages/lib/server-only/user/get-user-monthly-growth.tsindex 6cbb511b7..216011ec3 100644--- a/packages/lib/server-only/user/get-user-monthly-growth.ts+++ b/packages/lib/server-only/user/get-user-monthly-growth.ts@@ -1,30 +1,25 @@import { DateTime } from 'luxon';-import { prisma } from '@documenso/prisma';--export type GetUserMonthlyGrowthResult = Array<{- month: string;- count: number;- cume_count: number;-}>;--type GetUserMonthlyGrowthQueryResult = Array<{- month: Date;- count: bigint;- cume_count: bigint;-}>;+import { kyselyPrisma, sql } from '@documenso/prisma';export const getUserMonthlyGrowth = async () => {- const result = await prisma.$queryRaw<GetUserMonthlyGrowthQueryResult>`- SELECT- DATE_TRUNC('month', "createdAt") AS "month",- COUNT("id") as "count",- SUM(COUNT("id")) OVER (ORDER BY DATE_TRUNC('month', "createdAt")) as "cume_count"- FROM "User"- GROUP BY "month"- ORDER BY "month" DESC- LIMIT 12- `;+ const qb = kyselyPrisma.$kysely+ .selectFrom('User')+ .select(({ fn }) => [+ fn<Date>('DATE_TRUNC', [sql.lit('MONTH'), 'User.createdAt']).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) => 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'),diff --git a/packages/prisma/index.ts b/packages/prisma/index.tsindex b245d1483..368f21233 100644--- a/packages/prisma/index.ts+++ b/packages/prisma/index.ts@@ -29,3 +29,5 @@ export const kyselyPrisma = remember('kyselyPrisma', () =>}),),);++export { sql } from 'kysely';