Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Remove programEnrollment dependency on notify-partner/program #3099

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
steven-tey merged 2 commits into from
Nov 13, 2025
Merged

Remove programEnrollment dependency on notify-partner/program #3099

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a46d56a
Remove programEnrollment dependency on notify-partner/program
steven-tey Nov 13, 2025
4dfeb98
remove dependency
steven-tey Nov 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
76 changes: 36 additions & 40 deletions apps/web/app/(ee)/api/cron/messages/notify-partner/route.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,52 +33,50 @@ export async function POST(req: Request) {
JSON.parse(rawBody),
);

const programEnrollment = await prisma.programEnrollment.findUniqueOrThrow({
where: {
partnerId_programId: {
partnerId,
programId,
const [partner, program] = await Promise.all([
prisma.partner.findUniqueOrThrow({
where: {
id: partnerId,
},
status: "approved",
},
include: {
program: true,
partner: {
include: {
messages: {
where: {
programId,
createdAt: {
gt: subDays(new Date(), 3), // sent in the last 3 days
},
senderPartnerId: null, // not sent by the partner
readInApp: null, // unread messages only
readInEmail: null, // unread messages only
},
orderBy: {
createdAt: "desc",
},
include: {
senderUser: true,
include: {
messages: {
where: {
programId,
createdAt: {
gt: subDays(new Date(), 3), // sent in the last 3 days
},
senderPartnerId: null, // not sent by the partner
readInApp: null, // unread messages only
readInEmail: null, // unread messages only
},
users: {
include: {
user: true,
},
where: {
notificationPreferences: {
newMessageFromProgram: true,
},
orderBy: {
createdAt: "desc",
},
include: {
senderUser: true,
},
},
users: {
include: {
user: true,
},
where: {
notificationPreferences: {
newMessageFromProgram: true,
},
},
},
},
},
});
}),
prisma.program.findUniqueOrThrow({
where: {
id: programId,
},
}),
]);

// unread messages are already sorted by latest message first
const unreadMessages = programEnrollment.partner.messages;
const unreadMessages = partner.messages;

if (unreadMessages.length === 0)
return logAndRespond(
Expand All @@ -91,7 +89,7 @@ export async function POST(req: Request) {
`There is a more recent unread message than ${lastMessageId}. Skipping...`,
);

const partnerUsersToNotify = programEnrollment.partner.users
const partnerUsersToNotify = partner.users
.map(({ user }) => user)
.filter(Boolean) as { email: string; id: string }[];

Expand All @@ -100,8 +98,6 @@ export async function POST(req: Request) {
`No partner emails to notify for partner ${partnerId}. Skipping...`,
);

const program = programEnrollment.program;

const { data, error } = await sendBatchEmail(
partnerUsersToNotify.map(({ email }) => ({
subject: `${program.name} sent ${unreadMessages.length === 1 ? "a message" : `${unreadMessages.length} messages`}`,
Expand Down
85 changes: 39 additions & 46 deletions apps/web/app/(ee)/api/cron/messages/notify-program/route.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,60 +33,55 @@ export async function POST(req: Request) {
JSON.parse(rawBody),
);

const programEnrollment = await prisma.programEnrollment.findUniqueOrThrow({
where: {
partnerId_programId: {
partnerId,
programId,
const [program, partner] = await Promise.all([
prisma.program.findUniqueOrThrow({
where: {
id: programId,
},
status: "approved",
},
include: {
program: {
include: {
workspace: {
include: {
users: {
include: {
user: true,
},
where: {
notificationPreference: {
newMessageFromPartner: true,
},
},
},
include: {
messages: {
where: {
partnerId,
senderPartnerId: {
not: null, // Sent by the partner
},
createdAt: {
gt: subDays(new Date(), 3), // Sent in the last 3 days
},
readInApp: null, // Unread
readInEmail: null, // Unread
},
orderBy: {
createdAt: "desc",
},
include: {
senderPartner: true,
},
},
},
partner: {
include: {
messages: {
where: {
programId,
senderPartnerId: {
not: null, // Sent by the partner
workspace: {
include: {
users: {
include: {
user: true,
},
createdAt: {
gt: subDays(new Date(), 3), // Sent in the last 3 days
where: {
notificationPreference: {
newMessageFromPartner: true,
},
},
readInApp: null, // Unread
readInEmail: null, // Unread
},
orderBy: {
createdAt: "desc",
},
include: {
senderPartner: true,
},
},
},
},
},
});
}),
prisma.partner.findUniqueOrThrow({
where: {
id: partnerId,
},
}),
]);

const unreadMessages = programEnrollment.partner.messages;
const unreadMessages = program.messages;

// unread messages are already sorted by latest message first
if (unreadMessages.length === 0)
Expand All @@ -100,7 +95,7 @@ export async function POST(req: Request) {
`There is a more recent unread message than ${lastMessageId}. Skipping...`,
);

const usersToNotify = programEnrollment.program.workspace.users
const usersToNotify = program.workspace.users
.map(({ user }) => user)
.filter(Boolean) as { email: string; id: string }[];

Expand All @@ -109,8 +104,6 @@ export async function POST(req: Request) {
`No program user emails to notify from partner ${partnerId}. Skipping...`,
);

const { program, partner } = programEnrollment;

const { data, error } = await sendBatchEmail(
usersToNotify.map(({ email }) => ({
subject: `${unreadMessages.length === 1 ? "New message from" : `${unreadMessages.length} new messages from`} ${partner.name}`,
Expand Down