The Open Source DocuSign Alternative.
TypeScript digital-signaturedocument-signingdocusign-alternativee-signatureesignesignaturenext-authnextjsopen-sourcepades-standardpdfpdf-signpdf-signaturepostgresqlprismaself-hostedsigningtypescript
fix: query envelope table for openpage stats (#2086)
Ephraim Duncan49b792503f1c
diff --git a/packages/lib/server-only/user/get-monthly-completed-document.ts b/packages/lib/server-only/user/get-monthly-completed-document.tsindex d999f88c9..0a9ef81ba 100644--- a/packages/lib/server-only/user/get-monthly-completed-document.ts+++ b/packages/lib/server-only/user/get-monthly-completed-document.ts@@ -1,22 +1,23 @@-import { DocumentStatus } from '@prisma/client';+import { DocumentStatus, EnvelopeType } from '@prisma/client';import { DateTime } from 'luxon';import { kyselyPrisma, sql } from '@documenso/prisma';export const getCompletedDocumentsMonthly = async () => {const qb = kyselyPrisma.$kysely- .selectFrom('Document')+ .selectFrom('Envelope').select(({ fn }) => [- fn<Date>('DATE_TRUNC', [sql.lit('MONTH'), 'Document.updatedAt']).as('month'),+ fn<Date>('DATE_TRUNC', [sql.lit('MONTH'), 'Envelope.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'), 'Document.updatedAt']) as any))+ .over((ob) => ob.orderBy(fn('DATE_TRUNC', [sql.lit('MONTH'), 'Envelope.updatedAt']) as any)).as('cume_count'),])- .where(() => sql`"Document"."status" = ${DocumentStatus.COMPLETED}::"DocumentStatus"`)+ .where(() => sql`"Envelope"."status" = ${DocumentStatus.COMPLETED}::"DocumentStatus"`)+ .where(() => sql`"Envelope"."type" = ${EnvelopeType.DOCUMENT}::"EnvelopeType"`).groupBy('month').orderBy('month', 'desc').limit(12);