Papermark is the open-source DocSend alternative and secure data rooms with built-in analytics and custom domains.
feat: add domainSlug to sentEmails model
Marc Seitz39b163b6bd4a
diff --git a/app/api/cron/domains/utils.ts b/app/api/cron/domains/utils.tsindex 8387a8dd..9ce0d1a1 100644--- a/app/api/cron/domains/utils.ts+++ b/app/api/cron/domains/utils.ts@@ -45,6 +45,7 @@ export const handleDomainUpdates = async ({sentEmails: {select: {type: true,+ domainSlug: true,},},users: {@@ -65,7 +66,11 @@ export const handleDomainUpdates = async ({return;}- const sentEmails = team.sentEmails.map((email) => email.type);+ // create an array of tuples with email type and domain slug+ const sentEmails = team.sentEmails.map((email) => [+ email.type,+ email.domainSlug,+ ]);const userEmail = team.users[0].user.email!;// if domain is invalid for more than 30 days, check if we can delete it@@ -112,8 +117,9 @@ export const handleDomainUpdates = async ({// if domain is invalid for more than 28 days, send emailif (invalidDays >= 28) {- const sentSecondDomainInvalidEmail = sentEmails.includes(- "SECOND_DOMAIN_INVALID_EMAIL",+ const sentSecondDomainInvalidEmail = sentEmails.some(+ ([type, domainSlug]) =>+ type === "SECOND_DOMAIN_INVALID_EMAIL" && domainSlug === domain,);if (!sentSecondDomainInvalidEmail) {return await Promise.allSettled([@@ -128,6 +134,7 @@ export const handleDomainUpdates = async ({type: "SECOND_DOMAIN_INVALID_EMAIL",teamId: team.id,recipient: userEmail,+ domainSlug: domain,},}),]);@@ -136,8 +143,9 @@ export const handleDomainUpdates = async ({// if domain is invalid for more than 14 days, send emailif (invalidDays >= 14) {- const sentFirstDomainInvalidEmail = sentEmails.includes(- "FIRST_DOMAIN_INVALID_EMAIL",+ const sentFirstDomainInvalidEmail = sentEmails.some(+ ([type, domainSlug]) =>+ type === "FIRST_DOMAIN_INVALID_EMAIL" && domainSlug === domain,);if (!sentFirstDomainInvalidEmail) {return await Promise.allSettled([@@ -152,6 +160,7 @@ export const handleDomainUpdates = async ({type: "FIRST_DOMAIN_INVALID_EMAIL",teamId: team.id,recipient: userEmail,+ domainSlug: domain,},}),]);@@ -160,8 +169,9 @@ export const handleDomainUpdates = async ({// if domain is invalid after the first day, send emailif (invalidDays == 1) {- const sentFirstDayDomainReminderEmail = sentEmails.includes(- "FIRST_DAY_DOMAIN_REMINDER_EMAIL",+ const sentFirstDayDomainReminderEmail = sentEmails.some(+ ([type, domainSlug]) =>+ type === "FIRST_DAY_DOMAIN_REMINDER_EMAIL" && domainSlug === domain,);if (!sentFirstDayDomainReminderEmail) {return await Promise.allSettled([@@ -176,6 +186,7 @@ export const handleDomainUpdates = async ({type: "FIRST_DAY_DOMAIN_REMINDER_EMAIL",teamId: team.id,recipient: userEmail,+ domainSlug: domain,},}),]);diff --git a/prisma/migrations/20231114054509_add_domain_to_sent_emails/migration.sql b/prisma/migrations/20231114054509_add_domain_to_sent_emails/migration.sqlnew file mode 100644index 00000000..35ddd854--- /dev/null+++ b/prisma/migrations/20231114054509_add_domain_to_sent_emails/migration.sql@@ -0,0 +1,2 @@+-- AlterTable+ALTER TABLE "SentEmail" ADD COLUMN "domainSlug" TEXT;diff --git a/prisma/schema.prisma b/prisma/schema.prismaindex e45d22ed..23d889af 100644--- a/prisma/schema.prisma+++ b/prisma/schema.prisma@@ -218,6 +218,7 @@ model SentEmail {createdAt DateTime @default(now())team Team @relation(fields: [teamId], references: [id], onDelete: Cascade)teamId String+ domainSlug String? // Domain that triggered the email. This can be nullable, representing emails not triggered by domains@@index([teamId])}\ No newline at end of file