Papermark is the open-source DocSend alternative and secure data rooms with built-in analytics and custom domains.
feat: update domains cron with sent emails tracker
Marc Seitz5eab9a043a82
diff --git a/app/api/cron/domains/route.ts b/app/api/cron/domains/route.tsindex f71ba18b..e0e76819 100644--- a/app/api/cron/domains/route.ts+++ b/app/api/cron/domains/route.ts@@ -42,6 +42,7 @@ export async function POST(req: Request) {verified: true,createdAt: true,userId: true,+ teamId: true,_count: {select: {links: true,@@ -107,11 +108,14 @@ export async function POST(req: Request) {updates,prismaResponse,};- })+ }),);return NextResponse.json(results);} catch (error) {- await log(`Domains cron failed. Error: " + ${(error as Error).message}`, true);+ await log(+ `Domains cron failed. Error: " + ${(error as Error).message}`,+ true,+ );return NextResponse.json({ error: (error as Error).message });}}diff --git a/app/api/cron/domains/utils.ts b/app/api/cron/domains/utils.tsindex bba2c564..8387a8dd 100644--- a/app/api/cron/domains/utils.ts+++ b/app/api/cron/domains/utils.ts@@ -25,13 +25,13 @@ export const handleDomainUpdates = async ({if (verified) return;const invalidDays = Math.floor(- (new Date().getTime() - new Date(createdAt).getTime()) / (1000 * 3600 * 24)+ (new Date().getTime() - new Date(createdAt).getTime()) / (1000 * 3600 * 24),);// do nothing if domain is invalid for less than 14 daysif (invalidDays != 1 && invalidDays < 14) return;- const user = await prisma.user.findFirst({+ const team = await prisma.team.findFirst({where: {domains: {some: {@@ -42,17 +42,32 @@ export const handleDomainUpdates = async ({select: {id: true,name: true,- email: true,+ sentEmails: {+ select: {+ type: true,+ },+ },+ users: {+ where: { role: "ADMIN" },+ select: {+ user: {+ select: { email: true },+ },+ },+ },},});- if (!user) {+ if (!team) {await log(`Domain *${domain}* is invalid but not associated with any user, skipping.`,- true+ true,);return;}+ const sentEmails = team.sentEmails.map((email) => email.type);+ const userEmail = team.users[0].user.email!;+// if domain is invalid for more than 30 days, check if we can delete itif (invalidDays >= 30) {// if there are still links associated with the domain,@@ -74,12 +89,12 @@ export const handleDomainUpdates = async ({const totalLinksViews = linksViews.reduce((acc, link) => acc + link._count.views,- 0+ 0,);if (totalLinksViews > 0) {return await log(- `Domain *${domain}* has been invalid for > 30 days and has links with clicks, skipping.`+ `Domain *${domain}* has been invalid for > 30 days and has links with clicks, skipping.`,);}}@@ -89,40 +104,82 @@ export const handleDomainUpdates = async ({log(`Domain *${domain}* has been invalid for > 30 days and ${linksCount > 0 ? "has links but no link clicks" : "has no links"- }, deleting.`+ }, deleting.`,),- limiter.schedule(() => sendDeletedDomainEmail(user.email!, domain)),+ limiter.schedule(() => sendDeletedDomainEmail(userEmail, domain)),]);}// if domain is invalid for more than 28 days, send email- if (invalidDays == 28) {- return await Promise.allSettled([- log(`Domain *${domain}* is invalid for ${invalidDays} days, email sent.`),- limiter.schedule(() =>- sendInvalidDomainEmail(user.email!, domain, invalidDays)- ),- ]);+ if (invalidDays >= 28) {+ const sentSecondDomainInvalidEmail = sentEmails.includes(+ "SECOND_DOMAIN_INVALID_EMAIL",+ );+ if (!sentSecondDomainInvalidEmail) {+ return await Promise.allSettled([+ log(+ `Domain *${domain}* is invalid for ${invalidDays} days, email sent.`,+ ),+ limiter.schedule(() =>+ sendInvalidDomainEmail(userEmail, domain, invalidDays),+ ),+ prisma.sentEmail.create({+ data: {+ type: "SECOND_DOMAIN_INVALID_EMAIL",+ teamId: team.id,+ recipient: userEmail,+ },+ }),+ ]);+ }}// if domain is invalid for more than 14 days, send email- if (invalidDays == 14) {- return await Promise.allSettled([- log(`Domain *${domain}* is invalid for ${invalidDays} days, email sent.`),- limiter.schedule(() =>- sendInvalidDomainEmail(user.email!, domain, invalidDays)- ),- ]);+ if (invalidDays >= 14) {+ const sentFirstDomainInvalidEmail = sentEmails.includes(+ "FIRST_DOMAIN_INVALID_EMAIL",+ );+ if (!sentFirstDomainInvalidEmail) {+ return await Promise.allSettled([+ log(+ `Domain *${domain}* is invalid for ${invalidDays} days, email sent.`,+ ),+ limiter.schedule(() =>+ sendInvalidDomainEmail(userEmail, domain, invalidDays),+ ),+ prisma.sentEmail.create({+ data: {+ type: "FIRST_DOMAIN_INVALID_EMAIL",+ teamId: team.id,+ recipient: userEmail,+ },+ }),+ ]);+ }}// if domain is invalid after the first day, send emailif (invalidDays == 1) {- return await Promise.allSettled([- log(`Domain *${domain}* is invalid for ${invalidDays} days, email sent.`),- limiter.schedule(() =>- sendInvalidDomainEmail(user.email!, domain, invalidDays)- ),- ]);+ const sentFirstDayDomainReminderEmail = sentEmails.includes(+ "FIRST_DAY_DOMAIN_REMINDER_EMAIL",+ );+ if (!sentFirstDayDomainReminderEmail) {+ return await Promise.allSettled([+ log(+ `Domain *${domain}* is invalid for ${invalidDays} days, email sent.`,+ ),+ limiter.schedule(() =>+ sendInvalidDomainEmail(userEmail, domain, invalidDays),+ ),+ prisma.sentEmail.create({+ data: {+ type: "FIRST_DAY_DOMAIN_REMINDER_EMAIL",+ teamId: team.id,+ recipient: userEmail,+ },+ }),+ ]);+ }}return;diff --git a/prisma/schema.prisma b/prisma/schema.prismaindex 12e48e4d..88df237a 100644--- a/prisma/schema.prisma+++ b/prisma/schema.prisma@@ -62,6 +62,7 @@ model Team {documents Document[]domains Domain[]invitations Invitation[]+ sentEmails SentEmail[]plan String @default("free")stripeId String? @unique // Stripe subscription / customer IDsubscriptionId String? @unique // Stripe subscription ID@@ -200,3 +201,22 @@ model Invitation {@@unique([email])}++enum EmailType {+ FIRST_DAY_DOMAIN_REMINDER_EMAIL+ FIRST_DOMAIN_INVALID_EMAIL+ SECOND_DOMAIN_INVALID_EMAIL+ FIRST_TRIAL_END_REMINDER_EMAIL+ FINAL_TRIAL_END_REMINDER_EMAIL+}+model SentEmail {+ id String @id @default(cuid())+ type EmailType+ recipient String // Email address of the recipient+ marketing Boolean @default(false)+ createdAt DateTime @default(now())+ team Team @relation(fields: [teamId], references: [id], onDelete: Cascade)+ teamId String++ @@index([teamId])+}\ No newline at end of file