Skip to content

The Open Source DocuSign Alternative.

fix: admin metrics broken (#1845)

Ephraim Duncan484f6c8b8565
diff --git a/apps/remix/app/routes/_authenticated+/admin+/stats.tsx b/apps/remix/app/routes/_authenticated+/admin+/stats.tsx
index 6e54dbaec..2e53c3782 100644
--- a/apps/remix/app/routes/_authenticated+/admin+/stats.tsx
+++ b/apps/remix/app/routes/_authenticated+/admin+/stats.tsx
@@ -19,6 +19,7 @@ import { getDocumentStats } from '@documenso/lib/server-only/admin/get-documents
import { getRecipientsStats } from '@documenso/lib/server-only/admin/get-recipients-stats';
import {
getOrganisationsWithSubscriptionsCount,
+ getUserWithSignedDocumentMonthlyGrowth,
getUsersCount,
} from '@documenso/lib/server-only/admin/get-users-stats';
import { getSignerConversionMonthly } from '@documenso/lib/server-only/user/get-signer-conversion';
@@ -37,18 +38,14 @@ export async function loader() {
docStats,
recipientStats,
signerConversionMonthly,
- // userWithAtLeastOneDocumentPerMonth,
- // userWithAtLeastOneDocumentSignedPerMonth,
- // MONTHLY_USERS_SIGNED,
+ monthlyUsersWithDocuments,
] = await Promise.all([
getUsersCount(),
getOrganisationsWithSubscriptionsCount(),
getDocumentStats(),
getRecipientsStats(),
getSignerConversionMonthly(),
- // getUserWithAtLeastOneDocumentPerMonth(),
- // getUserWithAtLeastOneDocumentSignedPerMonth(),
- // getUserWithSignedDocumentMonthlyGrowth(),
+ getUserWithSignedDocumentMonthlyGrowth(),
]);
return {
@@ -57,7 +54,7 @@ export async function loader() {
docStats,
recipientStats,
signerConversionMonthly,
- // MONTHLY_USERS_SIGNED,
+ monthlyUsersWithDocuments,
};
}
@@ -70,7 +67,7 @@ export default function AdminStatsPage({ loaderData }: Route.ComponentProps) {
docStats,
recipientStats,
signerConversionMonthly,
- // MONTHLY_USERS_SIGNED,
+ monthlyUsersWithDocuments,
} = loaderData;
return (
@@ -148,14 +145,12 @@ export default function AdminStatsPage({ loaderData }: Route.ComponentProps) {
</h3>
<div className="mt-5 grid grid-cols-2 gap-8">
<AdminStatsUsersWithDocumentsChart
- data={[]}
- // data={MONTHLY_USERS_SIGNED}
+ data={monthlyUsersWithDocuments}
title={_(msg`MAU (created document)`)}
tooltip={_(msg`Monthly Active Users: Users that created at least one Document`)}
/>
<AdminStatsUsersWithDocumentsChart
- data={[]}
- // data={MONTHLY_USERS_SIGNED}
+ data={monthlyUsersWithDocuments}
completed
title={_(msg`MAU (had document completed)`)}
tooltip={_(
diff --git a/packages/lib/server-only/admin/get-users-stats.ts b/packages/lib/server-only/admin/get-users-stats.ts
index 229433803..ecde57fdb 100644
--- a/packages/lib/server-only/admin/get-users-stats.ts
+++ b/packages/lib/server-only/admin/get-users-stats.ts
@@ -1,4 +1,4 @@
-import { DocumentStatus, SubscriptionStatus } from '@prisma/client';
+import { SubscriptionStatus } from '@prisma/client';
import { DateTime } from 'luxon';
import { prisma } from '@documenso/prisma';
@@ -17,37 +17,6 @@ export const getOrganisationsWithSubscriptionsCount = async () => {
});
};
-export const getUserWithAtLeastOneDocumentPerMonth = async () => {
- return await prisma.user.count({
- where: {
- documents: {
- some: {
- createdAt: {
- gte: DateTime.now().minus({ months: 1 }).toJSDate(),
- },
- },
- },
- },
- });
-};
-
-export const getUserWithAtLeastOneDocumentSignedPerMonth = async () => {
- return await prisma.user.count({
- where: {
- documents: {
- some: {
- status: {
- equals: DocumentStatus.COMPLETED,
- },
- completedAt: {
- gte: DateTime.now().minus({ months: 1 }).toJSDate(),
- },
- },
- },
- },
- });
-};
-
export type GetUserWithDocumentMonthlyGrowth = Array<{
month: string;
count: number;
@@ -67,6 +36,8 @@ export const getUserWithSignedDocumentMonthlyGrowth = async () => {
COUNT(DISTINCT "Document"."userId") as "count",
COUNT(DISTINCT CASE WHEN "Document"."status" = 'COMPLETED' THEN "Document"."userId" END) as "signed_count"
FROM "Document"
+ INNER JOIN "Team" ON "Document"."teamId" = "Team"."id"
+ INNER JOIN "Organisation" ON "Team"."organisationId" = "Organisation"."id"
GROUP BY "month"
ORDER BY "month" DESC
LIMIT 12