diff --git a/apps/web/pages/api/documents/[id]/send.ts b/apps/web/pages/api/documents/[id]/send.ts
index d5a7b7783..65be8d786 100644
--- a/apps/web/pages/api/documents/[id]/send.ts
+++ b/apps/web/pages/api/documents/[id]/send.ts
@@ -39,18 +39,14 @@ async function postHandler(req: NextApiRequest, res: NextApiResponse) {
// todo handle sending to single recipient even though more exist
const recipients = prisma.recipient.findMany({
- where: { documentId: +documentId },
+ where: {
+ documentId: +documentId,
+ sendStatus: SendStatus.NOT_SENT,
+ },
});
(await recipients).forEach(async (recipient) => {
await sendSigningRequestMail(recipient, document);
- await prisma.recipient.updateMany({
- where: {
- id: recipient.id,
- sendStatus: SendStatus.NOT_SENT,
- },
- data: { sendStatus: SendStatus.SENT },
- });
});
return res.status(200).end();
diff --git a/apps/web/pages/api/documents/[id]/sign.ts b/apps/web/pages/api/documents/[id]/sign.ts
index 2e5234d96..f0f59cac4 100644
--- a/apps/web/pages/api/documents/[id]/sign.ts
+++ b/apps/web/pages/api/documents/[id]/sign.ts
@@ -5,7 +5,7 @@ import {
} from "@documenso/lib/server";
import prisma from "@documenso/prisma";
import { NextApiRequest, NextApiResponse } from "next";
-import { SigningStatus } from "@prisma/client";
+import { SigningStatus, DocumentStatus } from "@prisma/client";
async function postHandler(req: NextApiRequest, res: NextApiResponse) {
const existingUser = await getUserFromToken(req, res);
@@ -33,7 +33,24 @@ async function postHandler(req: NextApiRequest, res: NextApiResponse) {
if (!document) res.status(404).end(`No document found.`);
- // todo sign ui
+ // todo sign stuff
+
+ const unsignedRecipients = await prisma.recipient.findMany({
+ where: {
+ signingStatus: SigningStatus.NOT_SIGNED,
+ },
+ });
+
+ if (unsignedRecipients.length === 0) {
+ await prisma.document.update({
+ where: {
+ id: recipient.documentId,
+ },
+ data: {
+ status: DocumentStatus.COMPLETED,
+ },
+ });
+ }
await prisma.recipient.update({
where: {
diff --git a/apps/web/pages/api/documents/index.ts b/apps/web/pages/api/documents/index.ts
index a5b0a2b3d..294d6330e 100644
--- a/apps/web/pages/api/documents/index.ts
+++ b/apps/web/pages/api/documents/index.ts
@@ -57,6 +57,7 @@ async function getHandler(req: NextApiRequest, res: NextApiResponse) {
select: {
id: true,
title: true,
+ status: true,
Recipient: true,
},
})
diff --git a/apps/web/pages/dashboard.tsx b/apps/web/pages/dashboard.tsx
index 1af901976..094d93d9f 100644
--- a/apps/web/pages/dashboard.tsx
+++ b/apps/web/pages/dashboard.tsx
@@ -18,12 +18,20 @@ import Router from "next/router";
import { NEXT_PUBLIC_WEBAPP_URL } from "@documenso/lib";
import toast from "react-hot-toast";
import { uploadDocument } from "@documenso/features";
+import prisma from "@documenso/prisma";
+import {
+ ReadStatus,
+ SendStatus,
+ SigningStatus,
+ DocumentStatus,
+} from "@prisma/client";
+import { getUserFromToken } from "@documenso/lib/server";
type FormValues = {
document: File;
};
-const DashboardPage: NextPageWithLayout = () => {
+const DashboardPage: NextPageWithLayout = (props: any) => {
const stats = [
{
name: "Draft",
@@ -86,7 +94,7 @@ const DashboardPage: NextPageWithLayout = () => {
{item.name}
- {item.stat}
+ {getStat(item.name, props)}
@@ -136,4 +144,56 @@ DashboardPage.getLayout = function getLayout(page: ReactElement) {
return {page};
};
+function getStat(name: string, props: any) {
+ if (name === "Draft") return props.dashboard.drafts;
+ if (name === "Sent") return props.dashboard.sent;
+ if (name === "Viewed") return props.dashboard.viewed;
+ if (name === "Signed") return props.dashboard.signed;
+ return 0;
+}
+
+export async function getServerSideProps(context: any) {
+ const user = await getUserFromToken(context.req, context.res);
+ if (!user) return;
+
+ const drafts = await prisma.document.findMany({
+ where: {
+ userId: user.id,
+ status: DocumentStatus.DRAFT,
+ },
+ });
+
+ const sent = await prisma.recipient.groupBy({
+ by: ["documentId"],
+ where: {
+ sendStatus: SendStatus.SENT,
+ },
+ });
+
+ const opened = await prisma.recipient.groupBy({
+ by: ["documentId"],
+ where: {
+ readStatus: ReadStatus.OPENED,
+ },
+ });
+
+ const completed = await prisma.document.findMany({
+ where: {
+ userId: user.id,
+ status: DocumentStatus.COMPLETED,
+ },
+ });
+
+ return {
+ props: {
+ dashboard: {
+ drafts: drafts.length,
+ sent: sent.length,
+ viewed: opened.length,
+ signed: completed.length,
+ },
+ },
+ };
+}
+
export default DashboardPage;
diff --git a/apps/web/pages/documents/[id]/sign.tsx b/apps/web/pages/documents/[id]/sign.tsx
index 5095a7831..44ca1db03 100644
--- a/apps/web/pages/documents/[id]/sign.tsx
+++ b/apps/web/pages/documents/[id]/sign.tsx
@@ -34,6 +34,8 @@ export async function getServerSideProps(context: any) {
},
});
+ // todo sign ui
+
return {
props: {},
};
diff --git a/packages/lib/mail/index.ts b/packages/lib/mail/index.ts
index 17887b36f..95c131174 100644
--- a/packages/lib/mail/index.ts
+++ b/packages/lib/mail/index.ts
@@ -1,2 +1,2 @@
-export { sendSigningRequestMail } from "./sendSigningRequestMail";
+export { sendSigningRequest as sendSigningRequestMail } from "./sendSigningRequestMail";
export { sendSignedMail } from "./sendSignedMail";
diff --git a/packages/lib/mail/sendSigningRequestMail.ts b/packages/lib/mail/sendSigningRequestMail.ts
index c9544ec3e..e910bf8be 100644
--- a/packages/lib/mail/sendSigningRequestMail.ts
+++ b/packages/lib/mail/sendSigningRequestMail.ts
@@ -1,8 +1,26 @@
+import prisma from "@documenso/prisma";
import { sendMail } from "./sendMail";
-export const sendSigningRequestMail = async (recipient: any, document: any) => {
+import { SendStatus, DocumentStatus } from "@prisma/client";
+
+export const sendSigningRequest = async (recipient: any, document: any) => {
+ // todo errror handling
await sendMail(
recipient.email,
`Please sign ${document.title}`,
`${document.User.name} has sent you a document to sign. Click SIGN DOCUMENT to sign it now.`
);
+
+ await prisma.recipient.update({
+ where: {
+ id: recipient.id,
+ },
+ data: { sendStatus: SendStatus.SENT },
+ });
+
+ await prisma.document.update({
+ where: {
+ id: document.id,
+ },
+ data: { status: DocumentStatus.PENDING },
+ });
};
diff --git a/packages/prisma/schema.prisma b/packages/prisma/schema.prisma
index a4ddc8dc1..19936e176 100644
--- a/packages/prisma/schema.prisma
+++ b/packages/prisma/schema.prisma
@@ -8,10 +8,11 @@ datasource db {
}
model Document {
- id Int @id @default(autoincrement())
+ id Int @id @default(autoincrement())
userId Int
- User User @relation(fields: [userId], references: [id], onDelete: Cascade)
+ User User @relation(fields: [userId], references: [id], onDelete: Cascade)
title String
+ status DocumentStatus @default(DRAFT)
document String
Recipient Recipient[]
}
@@ -85,3 +86,9 @@ enum SigningStatus {
NOT_SIGNED
SIGNED
}
+
+enum DocumentStatus {
+ DRAFT
+ PENDING
+ COMPLETED
+}